diff --git a/container-compose-dev.yml b/container-compose-dev.yml
index 12d5ae09..1e292aaf 100644
--- a/container-compose-dev.yml
+++ b/container-compose-dev.yml
@@ -61,8 +61,6 @@ services:
       context: orbit
       dockerfile: Containerfile
       target: orbit
-      args:
-        - PRODUCTION: false
     security_opt:
       - label:disable
     volumes:
@@ -83,6 +81,8 @@ 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 dd37be06..72a2c7e4 100644
--- a/container-compose-staging.yml
+++ b/container-compose-staging.yml
@@ -53,8 +53,6 @@ services:
       context: orbit
       dockerfile: Containerfile
       target: orbit
-      args:
-        - PRODUCTION: false
     volumes:
       - type: bind
         source: ./.git
@@ -66,6 +64,8 @@ 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 7802ea9a..bb66866e 100644
--- a/container-compose.yml
+++ b/container-compose.yml
@@ -53,8 +53,6 @@ services:
       context: orbit
       dockerfile: Containerfile
       target: orbit
-      args:
-        - PRODUCTION: true
     volumes:
       - type: bind
         source: ./.git
@@ -73,6 +71,8 @@ services:
         app_protocol: http
         mode: host
         name: "unencrypted http upstream server port"
+    environment:
+      - PRODUCTION=true
   smtp:
     build:
       context: smtp
diff --git a/orbit/.dockerignore b/orbit/.dockerignore
new file mode 100644
index 00000000..1b30444a
--- /dev/null
+++ b/orbit/.dockerignore
@@ -0,0 +1 @@
+orbit.db
diff --git a/orbit/Containerfile b/orbit/Containerfile
index 233fa288..3c805a21 100644
--- a/orbit/Containerfile
+++ b/orbit/Containerfile
@@ -33,7 +33,4 @@ COPY cgitrc /etc/cgitrc
 
 EXPOSE 9098
 
-ARG PRODUCTION
-ENV PRODUCTION=${PRODUCTION}
-
 CMD /bin/sh -c "source /radius-venv/bin/activate && uwsgi /orbit/radius.ini"
diff --git a/pop/.dockerignore b/pop/.dockerignore
new file mode 100644
index 00000000..7fffa4d8
--- /dev/null
+++ b/pop/.dockerignore
@@ -0,0 +1 @@
+pop
diff --git a/smtp/.dockerignore b/smtp/.dockerignore
new file mode 100644
index 00000000..ec2fc0fc
--- /dev/null
+++ b/smtp/.dockerignore
@@ -0,0 +1 @@
+smtp
diff --git a/tcp_server/.dockerignore b/tcp_server/.dockerignore
new file mode 100644
index 00000000..bf2fc123
--- /dev/null
+++ b/tcp_server/.dockerignore
@@ -0,0 +1 @@
+tcp_server