diff --git a/.github/workflows/build-apps.yml b/.github/workflows/build-apps.yml
index 56c1a31..1a95859 100644
--- a/.github/workflows/build-apps.yml
+++ b/.github/workflows/build-apps.yml
@@ -9,51 +9,21 @@ on:
 permissions: read-all
 
 jobs:
-  Calculator:
+  Build:
+    strategy:
+      matrix:
+        app_name: [Calculator, Diceware, GPIO, GraphicsDemo, HelloWorld, SerialConsole]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: "Build"
         uses: ./.github/actions/build-app
         with:
-          app_name: Calculator
-  Diceware:
+          app_name: ${{ matrix.app_name }}
+  Bundle:
     runs-on: ubuntu-latest
+    needs: [Build]
     steps:
       - uses: actions/checkout@v4
       - name: "Build"
-        uses: ./.github/actions/build-app
-        with:
-          app_name: Diceware
-  GPIO:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-app
-        with:
-          app_name: GPIO
-  GraphicsDemo:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-app
-        with:
-          app_name: GraphicsDemo
-  HelloWorld:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-app
-        with:
-          app_name: HelloWorld
-  SerialConsole:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-app
-        with:
-          app_name: SerialConsole
+        uses: ./.github/actions/release-apps
diff --git a/.github/workflows/release-apps.yml b/.github/workflows/release-apps.yml
deleted file mode 100644
index 36cc959..0000000
--- a/.github/workflows/release-apps.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Release Apps
-on:
-  workflow_run:
-    workflows: ["Build Apps"]
-    types: 
-      - completed
-
-permissions: read-all
-
-jobs:
-  Publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/release-apps