diff --git a/.github/workflows/remote-controller.yaml b/.github/workflows/remote-controller.yaml
index e5d7fcf2..6ab105dd 100644
--- a/.github/workflows/remote-controller.yaml
+++ b/.github/workflows/remote-controller.yaml
@@ -111,6 +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 ENABLE_SINGLE_QUEUE=true #true by default
         # export GO111MODULE=on
         make controller-test
\ No newline at end of file
diff --git a/main.go b/main.go
index d6d1d03e..ec32f35e 100644
--- a/main.go
+++ b/main.go
@@ -183,7 +183,7 @@ func main() {
 		"The number of workers to start with.")
 	flag.IntVar(&rabbitRetryInterval, "rabbitmq-retry-interval", 30,
 		"The retry interval for rabbitmq.")
-	flag.BoolVar(&enableSingleQueue, "enable-single-queue", false, "Flag to have this controller use the single queue option.")
+	flag.BoolVar(&enableSingleQueue, "enable-single-queue", true, "Flag to have this controller use the single queue option.")
 	flag.StringVar(&leaderElectionID, "leader-election-id", "lagoon-builddeploy-leader-election-helper",
 		"The ID to use for leader election.")
 	flag.StringVar(&pendingMessageCron, "pending-message-cron", "15,45 * * * *",