diff --git a/Dockerfile b/Dockerfile
index 0cdf83c..d269e6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,34 +9,6 @@ ARG NGINX_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thespad"
 
-ENV ALLOW_RESTARTS=0 \
-    ALLOW_STOP=0 \
-    ALLOW_START=0 \
-    AUTH=0 \
-    BUILD=0 \
-    COMMIT=0 \
-    CONFIGS=0 \
-    CONTAINERS=0 \
-    DISTRIBUTION=0 \
-    EVENTS=1 \
-    EXEC=0 \
-    IMAGES=0 \
-    INFO=0 \
-    NETWORKS=0 \
-    NODES=0 \
-    PING=1 \
-    PLUGINS=0 \
-    POST=0 \
-    SECRETS=0 \
-    SERVICES=0 \
-    SESSION=0 \
-    SOCKET_PATH=/var/run/docker.sock \
-    SWARM=0 \
-    SYSTEM=0 \
-    TASKS=0 \
-    VERSION=1 \
-    VOLUMES=0
-
 # install packages
 RUN \
   echo "**** install build packages ****" && \
@@ -55,6 +27,34 @@ RUN \
   rm -f /etc/nginx/conf.d/stream.conf && \
   rm -f /etc/nginx/http.d/default.conf
 
+ENV ALLOW_RESTARTS=0 \
+  ALLOW_STOP=0 \
+  ALLOW_START=0 \
+  AUTH=0 \
+  BUILD=0 \
+  COMMIT=0 \
+  CONFIGS=0 \
+  CONTAINERS=0 \
+  DISTRIBUTION=0 \
+  EVENTS=1 \
+  EXEC=0 \
+  IMAGES=0 \
+  INFO=0 \
+  NETWORKS=0 \
+  NODES=0 \
+  PING=1 \
+  PLUGINS=0 \
+  POST=0 \
+  SECRETS=0 \
+  SERVICES=0 \
+  SESSION=0 \
+  SOCKET_PATH=/var/run/docker.sock \
+  SWARM=0 \
+  SYSTEM=0 \
+  TASKS=0 \
+  VERSION=1 \
+  VOLUMES=0
+
 # add local files
 COPY root/ /
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 0cdf83c..d269e6f 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -9,34 +9,6 @@ ARG NGINX_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thespad"
 
-ENV ALLOW_RESTARTS=0 \
-    ALLOW_STOP=0 \
-    ALLOW_START=0 \
-    AUTH=0 \
-    BUILD=0 \
-    COMMIT=0 \
-    CONFIGS=0 \
-    CONTAINERS=0 \
-    DISTRIBUTION=0 \
-    EVENTS=1 \
-    EXEC=0 \
-    IMAGES=0 \
-    INFO=0 \
-    NETWORKS=0 \
-    NODES=0 \
-    PING=1 \
-    PLUGINS=0 \
-    POST=0 \
-    SECRETS=0 \
-    SERVICES=0 \
-    SESSION=0 \
-    SOCKET_PATH=/var/run/docker.sock \
-    SWARM=0 \
-    SYSTEM=0 \
-    TASKS=0 \
-    VERSION=1 \
-    VOLUMES=0
-
 # install packages
 RUN \
   echo "**** install build packages ****" && \
@@ -55,6 +27,34 @@ RUN \
   rm -f /etc/nginx/conf.d/stream.conf && \
   rm -f /etc/nginx/http.d/default.conf
 
+ENV ALLOW_RESTARTS=0 \
+  ALLOW_STOP=0 \
+  ALLOW_START=0 \
+  AUTH=0 \
+  BUILD=0 \
+  COMMIT=0 \
+  CONFIGS=0 \
+  CONTAINERS=0 \
+  DISTRIBUTION=0 \
+  EVENTS=1 \
+  EXEC=0 \
+  IMAGES=0 \
+  INFO=0 \
+  NETWORKS=0 \
+  NODES=0 \
+  PING=1 \
+  PLUGINS=0 \
+  POST=0 \
+  SECRETS=0 \
+  SERVICES=0 \
+  SESSION=0 \
+  SOCKET_PATH=/var/run/docker.sock \
+  SWARM=0 \
+  SYSTEM=0 \
+  TASKS=0 \
+  VERSION=1 \
+  VOLUMES=0
+
 # add local files
 COPY root/ /