diff --git a/Dockerfile b/Dockerfile
index d0ebd13..2579fc1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,23 +23,23 @@ ARG BUILD_VERSION="${DISTRO_VERSION}"
 ARG IMAGE_REPO="${IMAGE_REPO}"
 
 FROM casjaysdevdocker/alpine:${IMAGE_VERSION} AS build
-ARG USER
-ARG LICENSE
-ARG TIMEZONE
-ARG LANGUAGE
-ARG IMAGE_NAME
-ARG PHP_SERVER
-ARG BUILD_DATE
-ARG SERVICE_PORT
-ARG EXPOSE_PORTS
-ARG NODE_VERSION
-ARG NODE_MANAGER
-ARG BUILD_VERSION
-ARG DEFAULT_DATA_DIR
-ARG DEFAULT_CONF_DIR
-ARG DEFAULT_TEMPLATE_DIR
-ARG DISTRO_VERSION
-ARG PHP_VERSION
+ARG USER=${USER}
+ARG LICENSE=${LICENSE}
+ARG TIMEZONE=${TIMEZONE}
+ARG LANGUAGE=${LANGUAGE}
+ARG IMAGE_NAME=${IMAGE_NAME}
+ARG PHP_SERVER=${PHP_SERVER}
+ARG BUILD_DATE=${BUILD_DATE}
+ARG SERVICE_PORT=${SERVICE_PORT}
+ARG EXPOSE_PORTS=${EXPOSE_PORTS}
+ARG NODE_VERSION=${NODE_VERSION}
+ARG NODE_MANAGER=${NODE_MANAGER}
+ARG BUILD_VERSION=${BUILD_VERSION}
+ARG DEFAULT_DATA_DIR=${DEFAULT_DATA_DIR}
+ARG DEFAULT_CONF_DIR=${DEFAULT_CONF_DIR}
+ARG DEFAULT_TEMPLATE_DIR=${DEFAULT_TEMPLATE_DIR}
+ARG DISTRO_VERSION=${DISTRO_VERSION}
+ARG PHP_VERSION=${PHP_VERSION}
 
 ARG PACK_LIST="bash bash-completion iproute2 ssmtp openssl wget curl jq ca-certificates \
   tzdata mailcap git ncurses util-linux pciutils usbutils coreutils binutils findutils grep \