diff --git a/.github/workflows/controller-build.yaml b/.github/workflows/controller-build.yaml
new file mode 100644
index 00000000..d1a5d68c
--- /dev/null
+++ b/.github/workflows/controller-build.yaml
@@ -0,0 +1,22 @@
+name: controller-build
+
+on:
+  pull_request_target:
+    types: [ closed ]
+    branches: [ master ]
+    paths:
+      - workshop.json
+      - .github/workflows/controller-build.yaml
+  workflow_dispatch:
+
+concurrency:
+  group: build-publish-controller
+  cancel-in-progress: true
+
+jobs:
+  call-build-publish-controller:
+    if: github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true
+    uses: perftool-incubator/crucible/.github/workflows/build-publish-controller.yaml@master
+    with:
+      ci_target: "rickshaw"
+    secrets: inherit
diff --git a/.github/workflows/crucible-ci.yaml b/.github/workflows/crucible-ci.yaml
index fa8bb733..ae883de9 100644
--- a/.github/workflows/crucible-ci.yaml
+++ b/.github/workflows/crucible-ci.yaml
@@ -27,6 +27,7 @@ jobs:
             .github/workflows/run-crucible-tracking.yaml
             .github/workflows/crucible-merged.yaml
             .github/workflows/crucible-ci.yaml
+            .github/workflows/controller-build.yaml
             .github/workflows/unittest.yaml
             docs/**
             engine/engine-script-library.py
diff --git a/.github/workflows/unittest.yaml b/.github/workflows/unittest.yaml
index ac33d945..0e2fcfe6 100644
--- a/.github/workflows/unittest.yaml
+++ b/.github/workflows/unittest.yaml
@@ -27,6 +27,7 @@ jobs:
             .github/workflows/run-crucible-tracking.yaml
             .github/workflows/crucible-merged.yaml
             .github/workflows/crucible-ci.yaml
+            .github/workflows/controller-build.yaml
             .github/workflows/unittest.yaml
             docs/**
             engine/engine-script-library.py