diff --git a/.github/workflows/simulator.yml b/.github/workflows/ci-scrypto-builder.yml
similarity index 85%
rename from .github/workflows/simulator.yml
rename to .github/workflows/ci-scrypto-builder.yml
index d1c773a3bc4..0978212a0e2 100644
--- a/.github/workflows/simulator.yml
+++ b/.github/workflows/ci-scrypto-builder.yml
@@ -1,9 +1,6 @@
-name: Simulator
+name: Build scrypto-builder image
 
 on:
-  pull_request:
-  release:
-    types: [published]
   push:
     branches:
       - develop
@@ -25,10 +22,10 @@ jobs:
     needs: tags
     uses: radixdlt/public-iac-resuable-artifacts/.github/workflows/docker-build.yml@main
     with:
-      runs_on: ubuntu-latest
+      runs_on: ubuntu-latest-16-cores
       image_registry: "docker.io"
       image_organization: "radixdlt"
-      image_name: "simulator"
+      image_name: "scrypto-builder"
       tag: ${{ needs.tags.outputs.tag }}
       context: "."
       dockerfile: "Dockerfile"
@@ -36,7 +33,7 @@ jobs:
       provenance: "false"
       scan_image: false
       snyk_target_ref: ${{ github.ref_name }}
-      enable_dockerhub: ${{ github.event_name }} == 'release'
+      enable_dockerhub: false
       post_script: "./update-assets.sh --reuse-image --image-tag ${{ needs.tags.outputs.tag }}"
     secrets:
       workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDP }}
diff --git a/.github/workflows/publish-scrypto-builder.yml b/.github/workflows/publish-scrypto-builder.yml
new file mode 100644
index 00000000000..ba2d95ee1b8
--- /dev/null
+++ b/.github/workflows/publish-scrypto-builder.yml
@@ -0,0 +1,32 @@
+name: Publish scrypto-builder image
+
+on:
+  workflow_dispatch:
+    inputs:
+      image-label:
+        description: "Docker image label to be published"
+
+jobs:
+
+  build-amd:
+    needs: oidc_debugger
+    uses: radixdlt/public-iac-resuable-artifacts/.github/workflows/docker-build.yml@main
+    with:
+      runs_on: ubuntu-latest-16-cores
+      environment: "release"
+      image_registry: "docker.io"
+      image_organization: "radixdlt"
+      image_name: "scrypto-builder"
+      tag: ${{ inputs.image-label }}
+      context: "."
+      dockerfile: "Dockerfile"
+      platforms: "linux/amd64"
+      provenance: "false"
+      scan_image: true
+      snyk_target_ref: ${{ github.ref_name }}
+      enable_dockerhub: true
+    secrets:
+      workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDP }}
+      service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
+      role_to_assume: ${{ secrets.DOCKERHUB_RELEASER_ROLE }}
+