diff --git a/container-compose-dev.yml b/container-compose-dev.yml
index c41b941f..26d0dc53 100644
--- a/container-compose-dev.yml
+++ b/container-compose-dev.yml
@@ -61,6 +61,8 @@ services:
       context: orbit
       dockerfile: Containerfile
       target: orbit
+      args:
+        - PRODUCTION: false
     security_opt:
       - label:disable
     volumes:
@@ -81,8 +83,6 @@ services:
         app_protocol: http
         mode: host
         name: "unencrypted http upstream server port"
-    environment:
-      - PRODUCTION=false
   smtp:
     build:
       context: smtp
diff --git a/container-compose-staging.yml b/container-compose-staging.yml
index 5b3b1b88..b457f6fd 100644
--- a/container-compose-staging.yml
+++ b/container-compose-staging.yml
@@ -49,6 +49,8 @@ services:
       context: orbit
       dockerfile: Containerfile
       target: orbit
+      args:
+        - PRODUCTION: false
     volumes:
       - type: bind
         source: ./.git
@@ -60,8 +62,6 @@ services:
         target: /orbit/docs
         read_only: true
         selinux: z
-    environment:
-      - PRODUCTION=false
     ports:
       - target: 9098
         published: 9098
diff --git a/container-compose.yml b/container-compose.yml
index aec2f5df..d0eeb0b1 100644
--- a/container-compose.yml
+++ b/container-compose.yml
@@ -49,6 +49,8 @@ services:
       context: orbit
       dockerfile: Containerfile
       target: orbit
+      args:
+        - PRODUCTION: true
     volumes:
       - type: bind
         source: ./.git
@@ -67,8 +69,6 @@ services:
         app_protocol: http
         mode: host
         name: "unencrypted http upstream server port"
-    environment:
-      - PRODUCTION=true
   smtp:
     build:
       context: smtp
diff --git a/orbit/Containerfile b/orbit/Containerfile
index 3c805a21..233fa288 100644
--- a/orbit/Containerfile
+++ b/orbit/Containerfile
@@ -33,4 +33,7 @@ COPY cgitrc /etc/cgitrc
 
 EXPOSE 9098
 
+ARG PRODUCTION
+ENV PRODUCTION=${PRODUCTION}
+
 CMD /bin/sh -c "source /radius-venv/bin/activate && uwsgi /orbit/radius.ini"