diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 76c7ff8..927d797 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -27,23 +27,5 @@ jobs:
 
   upgrade-pack:
     name: Build Upgrade Pack
-    runs-on: [ubuntu-latest]
-    container: ghcr.io/philips-software/amp-devcontainer-cpp:v6.0.2@sha256:36afaaa5ba4bc4e9bb471012db9733c26a210e315ddb33600f73bb9532b02a25 # 6.0.2
     needs: Build
-    steps:
-      - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
-        with:
-          name: HostInstall
-      - run: tar -zxvf Postmaster-*-Linux.tar.gz
-      - run: mkdir install
-      - run: mv Postmaster-*-Linux/* install/
-      - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
-        with:
-          name: postmaster
-      - run: tar -zxvf Postmaster-*-Generic-ELF.tar.gz
-      - run: cp -r Postmaster-*-Generic-ELF/* install/
-      - run: install/bin/postmaster.upgrade_pack_builder --app=install/bin/postmaster.postmaster_stm32f407.hex --output=Postmaster-0.3.1.upg # x-release-please-version
-      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        with:
-          name: UpgradePack
-          path: Postmaster-0.3.1.upg # x-release-please-version
+    uses: ./.github/workflows/wc-upgrade-pack.yml
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 604116e..ac229ed 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -23,6 +23,11 @@ jobs:
       target: ${{ matrix.target }}
       configuration: ${{ matrix.configuration }}
 
+  upgrade-pack:
+    name: Build Upgrade Pack
+    needs: [build]
+    uses: ./.github/workflows/wc-upgrade-pack.yml
+
   apply-release-notes-template:
     name: 📝 Apply Release Template
     runs-on: ubuntu-latest
diff --git a/.github/workflows/wc-upgrade-pack.yml b/.github/workflows/wc-upgrade-pack.yml
new file mode 100644
index 0000000..59a332f
--- /dev/null
+++ b/.github/workflows/wc-upgrade-pack.yml
@@ -0,0 +1,30 @@
+---
+name: Continuous Integration
+
+on:
+  workflow_call:
+
+permissions: {}
+
+jobs:
+  upgrade-pack:
+    name: Build Upgrade Pack
+    runs-on: [ubuntu-latest]
+    container: ghcr.io/philips-software/amp-devcontainer-cpp:v6.0.2@sha256:36afaaa5ba4bc4e9bb471012db9733c26a210e315ddb33600f73bb9532b02a25 # 6.0.2
+    steps:
+      - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        with:
+          name: HostInstall
+      - run: tar -zxvf Postmaster-*-Linux.tar.gz
+      - run: mkdir install
+      - run: mv Postmaster-*-Linux/* install/
+      - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        with:
+          name: postmaster
+      - run: tar -zxvf Postmaster-*-Generic-ELF.tar.gz
+      - run: cp -r Postmaster-*-Generic-ELF/* install/
+      - run: install/bin/postmaster.upgrade_pack_builder --app=install/bin/postmaster.postmaster_stm32f407.hex --output=Postmaster-0.3.1.upg # x-release-please-version
+      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        with:
+          name: UpgradePack
+          path: Postmaster-0.3.1.upg # x-release-please-version