diff --git a/.github/workflows/remote-controller.yaml b/.github/workflows/remote-controller.yaml
index 29638014..e5d7fcf2 100644
--- a/.github/workflows/remote-controller.yaml
+++ b/.github/workflows/remote-controller.yaml
@@ -111,5 +111,6 @@ jobs:
         export HARBOR_API="http://harbor.$(kubectl get nodes -o jsonpath='{.items[0].status.addresses[0].address}').nip.io:32080/api"
         export KIND_NODE_IP="$(kubectl get nodes -o jsonpath='{.items[0].status.addresses[0].address}')"
         export HARBOR_VERSION=${{matrix.harbor}}
+        export ENABLE_SINGLE_QUEUE=true
         # export GO111MODULE=on
         make controller-test
\ No newline at end of file
diff --git a/config/default/config.properties b/config/default/config.properties
index 8d18a393..959af732 100644
--- a/config/default/config.properties
+++ b/config/default/config.properties
@@ -1,3 +1,4 @@
 OVERRIDE_BUILD_DEPLOY_DIND_IMAGE
 HARBOR_URL
-HARBOR_API
\ No newline at end of file
+HARBOR_API
+ENABLE_SINGLE_QUEUE
\ No newline at end of file
diff --git a/config/default/envs.yaml b/config/default/envs.yaml
index da121b7e..719272a4 100644
--- a/config/default/envs.yaml
+++ b/config/default/envs.yaml
@@ -35,4 +35,9 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   name: overrides
-                  key: HARBOR_API
\ No newline at end of file
+                  key: HARBOR_API
+            - name: ENABLE_SINGLE_QUEUE
+              valueFrom:
+                configMapKeyRef:
+                  name: overrides
+                  key: ENABLE_SINGLE_QUEUE
\ No newline at end of file
diff --git a/main.go b/main.go
index 23406808..d6d1d03e 100644
--- a/main.go
+++ b/main.go
@@ -362,6 +362,7 @@ func main() {
 	mqUser = helpers.GetEnv("RABBITMQ_USERNAME", mqUser)
 	mqPass = helpers.GetEnv("RABBITMQ_PASSWORD", mqPass)
 	mqHost = helpers.GetEnv("RABBITMQ_HOSTNAME", mqHost)
+	enableSingleQueue = helpers.GetEnvBool("ENABLE_SINGLE_QUEUE", enableSingleQueue)
 	lagoonTargetName = helpers.GetEnv("LAGOON_TARGET_NAME", lagoonTargetName)
 	lagoonAppID = helpers.GetEnv("LAGOON_APP_ID", lagoonAppID)
 	pendingMessageCron = helpers.GetEnv("PENDING_MESSAGE_CRON", pendingMessageCron)