diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml
index 5f495d69..4ab0f7fe 100644
--- a/.github/workflows/fileserver-container.yml
+++ b/.github/workflows/fileserver-container.yml
@@ -29,42 +29,31 @@ concurrency:
 jobs:
   build:
     name: Build single-architecture container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.28.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.29.0
     with:
       image_name: 'file-server'
       package_dependencies: |
         @flowfuse/file-server
       build_context: 'file-server'
-      build_platforms: '["linux/amd64"]'
+      build_platform: "linux/amd64"
       npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
       scan_image: true
     secrets:
       npm_registry_auth_token: ${{ secrets.NPM_PUBLISH_TOKEN }}
       temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
 
-  build-multi-architecture:
-    name: Build multi-architecture container image
-    needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.14.0
-    with:
-      image_name: 'file-server'
-      architecture_suffixes: |
-        -linux-amd64
-    secrets:
-      temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
-
   upload-stage-image:
     if: github.ref_name == 'main'
     name: Upload image to staging registry
-    needs: build-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    needs: build
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: stage
       service_name: 'file-server'
       deployment_name: 'flowforge-file'
       container_name: 'file-storage'
       deploy: false
-      image: ${{ needs.build-multi-architecture.outputs.image }}
+      image: ${{ needs.build.outputs.image }}
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
       aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }}
@@ -74,15 +63,15 @@ jobs:
   upload-production-image:
     if: github.ref_name == 'main'
     name: Upload image to production registry
-    needs: build-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    needs: build
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: production
       service_name: 'file-server'
       deployment_name: 'flowforge-file'
       container_name: 'file-storage'
       deploy: false
-      image: ${{ needs.build-multi-architecture.outputs.image }}
+      image: ${{ needs.build.outputs.image }}
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
       aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }}
@@ -129,14 +118,14 @@ jobs:
     # if: github.ref_name == 'main'
     if: false
     name: Deploy to staging environment
-    needs: build-multi-architecture
+    needs: build
     uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
     with:
       environment: stage
       service_name: 'file-server'
       deployment_name: 'flowforge-file'
       container_name: 'file-storage'
-      image: ${{ needs.build-multi-architecture.outputs.image }}
+      image: ${{ needs.build.outputs.image }}
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
       aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }}
@@ -147,14 +136,14 @@ jobs:
     # if: github.ref_name == 'main'
     if: false
     name: Deploy to production environment
-    needs: [build-multi-architecture, deploy-stage]
+    needs: [build, deploy-stage]
     uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
     with:
       environment: production
       service_name: 'file-server'
       deployment_name: 'flowforge-file'
       container_name: 'file-storage'
-      image: ${{ needs.build-multi-architecture.outputs.image }}
+      image: ${{ needs.build.outputs.image }}
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
       aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }}
diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml
index 47900190..756253fe 100644
--- a/.github/workflows/flowforge-container.yml
+++ b/.github/workflows/flowforge-container.yml
@@ -29,43 +29,34 @@ concurrency:
 jobs:
   build:
     name: Build single-architecture container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.28.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.29.0
     with:
       image_name: 'forge-k8s'
       package_dependencies: |
         @flowfuse/flowfuse
         @flowfuse/driver-kubernetes
       build_context: 'flowforge-container'
-      build_platforms: '["linux/amd64"]'
+      build_platform: "linux/amd64"
       npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
       scan_image: true
     secrets:
       npm_registry_auth_token: ${{ secrets.NPM_PUBLISH_TOKEN }}
       temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
 
-  build-multi-architecture:
-    name: Build multi-architecture container image
-    needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.14.0
-    with:
-      image_name: 'forge-k8s'
-      architecture_suffixes: |
-        -linux-amd64
-    secrets:
-      temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
-
   upload-stage-image:
     if: github.ref_name == 'main'
     name: Upload image to staging registry
-    needs: build-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    needs: build
+    # needs: build-multi-architecture
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: stage
       service_name: 'forge-k8s'
       deployment_name: flowforge
       container_name: forge
       deploy: false
-      image: ${{ needs.build-multi-architecture.outputs.image }}
+      # image: ${{ needs.build-multi-architecture.outputs.image }}
+      image: ${{ needs.build.outputs.image }}
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
       aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }}
@@ -75,15 +66,17 @@ jobs:
   upload-production-image:
     if: github.ref_name == 'main'
     name: Upload image to production registry
-    needs: build-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    # needs: build-multi-architecture
+    needs: build
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: production
       service_name: 'forge-k8s'
       deployment_name: flowforge
       container_name: forge
       deploy: false
-      image: ${{ needs.build-multi-architecture.outputs.image }}
+      # image: ${{ needs.build-multi-architecture.outputs.image }}
+      image: ${{ needs.build.outputs.image }}
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
       aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }}
@@ -130,8 +123,8 @@ jobs:
     # if: github.ref_name == 'main'
     if: false
     name: Deploy to staging environment
-    needs: build-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    needs: build
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: stage
       service_name: 'forge-k8s'
@@ -148,8 +141,8 @@ jobs:
     # if: github.ref_name == 'main'
     if: false
     name: Deploy to production environment
-    needs: [build-multi-architecture, deploy-stage]
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    needs: [build, deploy-stage]
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: production
       service_name: 'forge-k8s'
diff --git a/.github/workflows/nodered-container.yml b/.github/workflows/nodered-container.yml
index 7a77cdc4..4d609fe4 100644
--- a/.github/workflows/nodered-container.yml
+++ b/.github/workflows/nodered-container.yml
@@ -29,7 +29,7 @@ concurrency:
 jobs:
   build-302:
     name: Build 3.0.2 container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.28.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.29.0
     with:
       image_name: 'node-red'
       dockerfile_path: Dockerfile
@@ -37,35 +37,25 @@ jobs:
       package_dependencies: |
         @flowforge/nr-project-nodes
       build_context: 'node-red-container'
-      build_platforms: '["linux/arm64"]'
+      build_platform: "linux/arm64"
       npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
       scan_image: true
     secrets:
       npm_registry_auth_token: ${{ secrets.NPM_PUBLISH_TOKEN }}
       temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
-  build-302-multi-architecture:
-    name: Build multi-architecture container image
-    needs: build-302
-    uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.14.0
-    with:
-      image_name: 'node-red'
-      image_tag_prefix: '3.0.2-'
-      architecture_suffixes: |
-        -linux-arm64
-    secrets:
-      temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
+
   upload-302-stage:
     name: Upload image to staging ECR
     if: github.ref_name == 'main'
-    needs: build-302-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    needs: build-302
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: stage
       service_name: 'node-red'
       deployment_name: 'node-red'
       container_name: 'node-red'
       deploy: false
-      image: ${{ needs.build-302-multi-architecture.outputs.image }}
+      image: ${{ needs.build-302.outputs.image }}
       image_tag_prefix: '3.0.2-'
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -75,15 +65,15 @@ jobs:
   upload-302-prod:
     name: Upload image to production ECR
     if: github.ref_name == 'main'
-    needs: build-302-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    needs: build-302
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: production
       service_name: 'node-red'
       deployment_name: 'node-red'
       container_name: 'node-red'
       deploy: false
-      image: ${{ needs.build-302-multi-architecture.outputs.image }}
+      image: ${{ needs.build-302.outputs.image }}
       image_tag_prefix: '3.0.2-'
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -93,7 +83,7 @@ jobs:
 
   build-223:
     name: Build 2.2.3 container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.28.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.29.0
     with:
       image_name: 'node-red'
       dockerfile_path: Dockerfile-2.2.x
@@ -101,35 +91,24 @@ jobs:
       package_dependencies: |
         @flowforge/nr-project-nodes
       build_context: 'node-red-container'
-      build_platforms: '["linux/arm64"]'
+      build_platform: "linux/arm64"
       npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
       scan_image: true
     secrets:
       npm_registry_auth_token: ${{ secrets.NPM_PUBLISH_TOKEN }}
       temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
-  build-223-multi-architecture:
-    name: Build multi-architecture container image
-    needs: build-223
-    uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.14.0
-    with:
-      image_name: 'node-red'
-      image_tag_prefix: '2.2.3-'
-      architecture_suffixes: |
-        -linux-arm64
-    secrets:
-      temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
   upload-223-stage:
     name: Upload image to staging ECR
     if: github.ref_name == 'main'
-    needs: build-223-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    needs: build-223
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: stage
       service_name: 'node-red'
       deployment_name: 'node-red'
       container_name: 'node-red'
       deploy: false
-      image: ${{ needs.build-223-multi-architecture.outputs.image }}
+      image: ${{ needs.build-223.outputs.image }}
       image_tag_prefix: '2.2.3-'
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -139,15 +118,15 @@ jobs:
   upload-223-prod:
     name: Upload image to production ECR
     if: github.ref_name == 'main'
-    needs: build-223-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    needs: build-223
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: production
       service_name: 'node-red'
       deployment_name: 'node-red'
       container_name: 'node-red'
       deploy: false
-      image: ${{ needs.build-223-multi-architecture.outputs.image }}
+      image: ${{ needs.build-223.outputs.image }}
       image_tag_prefix: '2.2.3-'
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -157,7 +136,7 @@ jobs:
 
   build-310:
     name: Build 3.1.x container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.28.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.29.0
     with:
       image_name: 'node-red'
       dockerfile_path: Dockerfile-3.1
@@ -165,35 +144,24 @@ jobs:
       package_dependencies: |
         @flowforge/nr-project-nodes
       build_context: 'node-red-container'
-      build_platforms: '["linux/arm64"]'
+      build_platform: "linux/arm64"
       npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
       scan_image: true
     secrets:
       npm_registry_auth_token: ${{ secrets.NPM_PUBLISH_TOKEN }}
       temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
-  build-310-multi-architecture:
-    name: Build multi-architecture container image
-    needs: build-310
-    uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.14.0
-    with:
-      image_name: 'node-red'
-      image_tag_prefix: '3.1.x-'
-      architecture_suffixes: |
-        -linux-arm64
-    secrets:
-      temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
   upload-310-stage:
     name: Upload image to staging ECR
     if: github.ref_name == 'main'
-    needs: build-310-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    needs: build-310
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: stage
       service_name: 'node-red'
       deployment_name: 'node-red'
       container_name: 'node-red'
       deploy: false
-      image: ${{ needs.build-310-multi-architecture.outputs.image }}
+      image: ${{ needs.build-310.outputs.image }}
       image_tag_prefix: '3.1.x-'
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -203,15 +171,15 @@ jobs:
   upload-310-prod:
     name: Upload image to production ECR
     if: github.ref_name == 'main'
-    needs: build-310-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    needs: build-310
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: production
       service_name: 'node-red'
       deployment_name: 'node-red'
       container_name: 'node-red'
       deploy: false
-      image: ${{ needs.build-310-multi-architecture.outputs.image }}
+      image: ${{ needs.build-310.outputs.image }}
       image_tag_prefix: '3.1.x-'
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -221,7 +189,7 @@ jobs:
 
   build-40:
     name: Build 4.0.x container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.28.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.29.0
     with:
       image_name: 'node-red'
       dockerfile_path: Dockerfile-4.0
@@ -229,35 +197,24 @@ jobs:
       package_dependencies: |
         @flowforge/nr-project-nodes
       build_context: 'node-red-container'
-      build_platforms: '["linux/arm64"]'
+      build_platform: "linux/arm64"
       npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
       scan_image: true
     secrets:
       npm_registry_auth_token: ${{ secrets.NPM_PUBLISH_TOKEN }}
       temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
-  build-40-multi-architecture:
-    name: Build multi-architecture container image
-    needs: build-40
-    uses: flowfuse/github-actions-workflows/.github/workflows/merge_multiarch_images.yml@v0.14.0
-    with:
-      image_name: 'node-red'
-      image_tag_prefix: '4.0.x-'
-      architecture_suffixes: |
-        -linux-arm64
-    secrets:
-      temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
   upload-40-stage:
     name: Upload image to staging ECR
     if: github.ref_name == 'main'
-    needs: build-40-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    needs: build-40
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: stage
       service_name: 'node-red'
       deployment_name: 'node-red'
       container_name: 'node-red'
       deploy: false
-      image: ${{ needs.build-40-multi-architecture.outputs.image }}
+      image: ${{ needs.build-40.outputs.image }}
       image_tag_prefix: '4.0.x-'
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -267,15 +224,15 @@ jobs:
   upload-40-prod:
     name: Upload image to production ECR
     if: github.ref_name == 'main'
-    needs: build-40-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
+    needs: build-40
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.29.0
     with:
       environment: production
       service_name: 'node-red'
       deployment_name: 'node-red'
       container_name: 'node-red'
       deploy: false
-      image: ${{ needs.build-40-multi-architecture.outputs.image }}
+      image: ${{ needs.build-40.outputs.image }}
       image_tag_prefix: '4.0.x-'
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}