diff --git a/compose/mqtt-task.yml b/compose/mqtt-task.yml
index ab83109b..e8177b4b 100644
--- a/compose/mqtt-task.yml
+++ b/compose/mqtt-task.yml
@@ -4,21 +4,21 @@ services:
       file: mqtt-task-common.yml
       service: mqtt-task
     environment: 
-      MQTT_CLIENT_ID: smartcitizen-api-staging-main-1
+      MQTT_CLIENT_ID: smartcitizen-api-main-1
       MQTT_CLEAN_SESSION: false
   mqtt-task-main-2:
     extends:
       file: mqtt-task-common.yml
       service: mqtt-task
     environment: 
-      MQTT_CLIENT_ID: smartcitizen-api-staging-main-2
+      MQTT_CLIENT_ID: smartcitizen-api-main-2
       MQTT_CLEAN_SESSION: false
   mqtt-task-secondary:
     extends:
       file: mqtt-task-common.yml
       service: mqtt-task
     environment: 
-      MQTT_CLIENT_ID: "smartcitizen-api-staging-secondary"
+      MQTT_CLIENT_ID: "smartcitizen-api-secondary"
       MQTT_CLEAN_SESSION: true
     deploy:
       mode: replicated