diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml
index 47900190..3e64d501 100644
--- a/.github/workflows/flowforge-container.yml
+++ b/.github/workflows/flowforge-container.yml
@@ -29,35 +29,37 @@ 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@feat-refactor-image-build
     with:
       image_name: 'forge-k8s'
       package_dependencies: |
         @flowfuse/flowfuse
         @flowfuse/driver-kubernetes
       build_context: 'flowforge-container'
-      build_platforms: '["linux/amd64"]'
+      # 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 }}
+  # 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'
+    # if: github.ref_name == 'main'
     name: Upload image to staging registry
-    needs: build-multi-architecture
+    needs: build
+    # needs: build-multi-architecture
     uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
     with:
       environment: stage
@@ -65,7 +67,8 @@ jobs:
       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,7 +78,8 @@ jobs:
   upload-production-image:
     if: github.ref_name == 'main'
     name: Upload image to production registry
-    needs: build-multi-architecture
+    # needs: build-multi-architecture
+    needs: build
     uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.28.0
     with:
       environment: production