diff --git a/.github/workflows/branch-deploy.yaml b/.github/workflows/branch-deploy.yaml
index 88f5eb85d8..d91ba7cb8a 100644
--- a/.github/workflows/branch-deploy.yaml
+++ b/.github/workflows/branch-deploy.yaml
@@ -478,7 +478,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           repository: 'FlowFuse/helm'
-          ref: 'main'
+          ref: 'feat-emqx-default-broker'
           path: 'helm-repo'
           token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/ci/ci-values.yaml b/ci/ci-values.yaml
index fa78a9dc74..22a7a1bb61 100644
--- a/ci/ci-values.yaml
+++ b/ci/ci-values.yaml
@@ -7,7 +7,7 @@ forge:
   broker:
     enabled: true
     teamBroker:
-      uiOnly: true
+      enabled: false
   cloudProvider: aws
   cache:
     type: memory
diff --git a/forge/forge.js b/forge/forge.js
index 3f7b5bbfc2..44cf3b4134 100644
--- a/forge/forge.js
+++ b/forge/forge.js
@@ -483,7 +483,7 @@ module.exports = async (options = {}) => {
         try {
             await server.close()
         } catch (err2) {
-            server.log.error(`Failed to shutdown: ${err2.toString()}`)
+            server.log.error(`ERROR: Failed to shutdown: ${err2.toString()}`)
             server.log.error(err2.stack)
         }
         throw err