diff --git a/server/build/Dockerfile b/server/build/Dockerfile
index a53e9baf43..6a4a0af4db 100644
--- a/server/build/Dockerfile
+++ b/server/build/Dockerfile
@@ -1,14 +1,17 @@
 FROM ubuntu:jammy-20230308@sha256:7a57c69fe1e9d5b97c5fe649849e79f2cfc3bf11d10bbd5218b4eb61716aebe6
 
-
 # Setting bash as our shell, and enabling pipefail option
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Some ENV variables
 ENV PATH="/mattermost/bin:${PATH}"
+
+# Build Arguments
 ARG PUID=2000
 ARG PGID=2000
-ARG MM_PACKAGE="https://releases.mattermost.com/9.7.1/mattermost-9.7.1-linux-amd64.tar.gz?src=docker"
+# MM_PACKAGE build arguments controls which version of mattermost to install, defaults to latest stable enterprise
+# i.e. https://releases.mattermost.com/9.7.1/mattermost-9.7.1-linux-amd64.tar.gz
+ARG MM_PACKAGE="https://latest.mattermost.com/mattermost-enterprise-linux"
 
 # # Install needed packages and indirect dependencies
 RUN apt-get update \
@@ -27,18 +30,17 @@ RUN apt-get update \
 RUN mkdir -p /mattermost/data /mattermost/plugins /mattermost/client/plugins \
   && addgroup -gid ${PGID} mattermost \
   && adduser -q --disabled-password --uid ${PUID} --gid ${PGID} --gecos "" --home /mattermost mattermost \
-  && if [ -n "$MM_PACKAGE" ]; then curl $MM_PACKAGE | tar -xvz ; \
-  else echo "please set the MM_PACKAGE" ; exit 127 ; fi \
+  && curl -L $MM_PACKAGE | tar -xvz \
   && chown -R mattermost:mattermost /mattermost /mattermost/data /mattermost/plugins /mattermost/client/plugins
 
 # We should refrain from running as privileged user
 USER mattermost
 
-#Healthcheck to make sure container is ready
+# Healthcheck to make sure container is ready
 HEALTHCHECK --interval=30s --timeout=10s \
   CMD curl -f http://localhost:8065/api/v4/system/ping || exit 1
 
-# Configure entrypoint and command
+# Configure entrypoint and command with proper permissions
 COPY --chown=mattermost:mattermost --chmod=765 entrypoint.sh /
 ENTRYPOINT ["/entrypoint.sh"]
 WORKDIR /mattermost