diff --git a/compose.override.local.yml b/compose.override.local.yml
index 269098cb..8d7d58d2 100644
--- a/compose.override.local.yml
+++ b/compose.override.local.yml
@@ -1,7 +1,5 @@
 services:
   app:
-    build:
-      args: !reset []
     restart: "no"
   sidekiq:
     restart: "no"
diff --git a/compose.override.production.yml b/compose.override.production.yml
new file mode 100644
index 00000000..85108bd6
--- /dev/null
+++ b/compose.override.production.yml
@@ -0,0 +1,12 @@
+version: '3.3'
+services:
+  app:
+    build:
+      args:
+        - BUNDLE_WITHOUT=test development
+  mqtt:
+    entrypoint: ["echo", "MQTT service disabled in production"]
+  cassandra-1:
+    entrypoint: ["echo", "Cassandra service disabled in production"]
+  kairos:
+    depends_on: !reset []
diff --git a/compose.override.staging.yml b/compose.override.staging.yml
new file mode 100644
index 00000000..2a56050e
--- /dev/null
+++ b/compose.override.staging.yml
@@ -0,0 +1,27 @@
+services:
+  db:
+    deploy:
+      resources:
+        limits:
+          memory: 2gb
+  app:
+    build:
+      args:
+        - BUNDLE_WITHOUT=test development
+  mqtt:
+    entrypoint: ["echo", "MQTT service disabled on staging"]
+  mqtt-task-main-1:
+    environment:
+      MQTT_CLIENT_ID: smartcitizen-staging-api-main-1
+  mqtt-task-main-2:
+    environment:
+      MQTT_CLIENT_ID: smartcitizen-staging-api-main-2
+  mqtt-task-secondary:
+    environment:
+      MQTT_CLIENT_ID: "smartcitizen-staging-api-secondary"
+
+
+# cassandra-1:
+#   entrypoint: ["echo", "Cassandra service disabled on staging"]
+#  kairos:
+#    depends_on: !reset []
diff --git a/compose/app.yml b/compose/app.yml
index d729e4d9..46322128 100644
--- a/compose/app.yml
+++ b/compose/app.yml
@@ -2,10 +2,6 @@ services:
   app:
     build:
       context: ../.
-      # Skip installing development & test gems in production, saves 20s build time.
-      # If developing with Docker, this line might need to be commented out.
-      args:
-        - BUNDLE_WITHOUT=test development
     env_file: ../.env
     ports:
       - "3000:3000"