diff --git a/.github/workflows/build_base.yaml b/.github/workflows/build_base.yaml
index 5a02cc8e..4479549f 100644
--- a/.github/workflows/build_base.yaml
+++ b/.github/workflows/build_base.yaml
@@ -29,6 +29,7 @@ jobs:
                   echo "core: ${{ steps.core.outputs.version }}"
 
     docker:
+        needs: versions
         runs-on: [self-hosted]
         strategy:
             matrix:
diff --git a/.github/workflows/build_bundle.yaml b/.github/workflows/build_bundle.yaml
index 1592029b..c8562558 100644
--- a/.github/workflows/build_bundle.yaml
+++ b/.github/workflows/build_bundle.yaml
@@ -8,12 +8,33 @@ on:
             - "**"
 
 jobs:
+    versions:
+        runs-on: ubuntu-latest
+        outputs:
+            coreversion: ${{ steps.core.outputs.version }}
+        steps:
+            - name: Checkout core repo
+              uses: actions/checkout@v4
+              with:
+                  repository: datarhei/core
+                  path: ./core
+
+            - name: Get latest version from core
+              id: core
+              run: |
+                  echo "version=$(cat ./core/app/version.go | grep -E -o '(Major|Minor|Patch): [0-9]+,' | sed -E 's/^.*: ([0-9]+),.*$/\1/g' | paste -sd '.' - )" >> "$GITHUB_OUTPUT"
+
+            - name: Show versions
+              run: |
+                  echo "core: ${{ steps.core.outputs.version }}"
+
     docker:
+        needs: versions
         runs-on: [self-hosted]
         strategy:
             matrix:
                 include:
-                    - core: "16.14.0"
+                    - core: ${{ needs.versions.outputs.coreversion }}
                       core_os: alpine3.19
                       ffmpeg: "5.1.3"
                       ffmpeg_os: alpine3.16
@@ -21,7 +42,7 @@ jobs:
                       branch: main
                       prefix:
                       latest: yes
-                    - core: "16.14.0"
+                    - core: ${{ needs.versions.outputs.coreversion }}
                       core_os: alpine3.19
                       ffmpeg: "5.1.3-rpi"
                       ffmpeg_os: alpine3.16
@@ -29,7 +50,7 @@ jobs:
                       branch: main
                       prefix: rpi-
                       latest: yes
-                    - core: "16.14.0"
+                    - core: ${{ needs.versions.outputs.coreversion }}
                       core_os: ubuntu20.04
                       ffmpeg: "5.1.3-vaapi"
                       ffmpeg_os: ubuntu20.04
@@ -37,7 +58,7 @@ jobs:
                       branch: main
                       prefix: vaapi-
                       latest: yes
-                    - core: "16.14.0"
+                    - core: ${{ needs.versions.outputs.coreversion }}
                       core_os: ubuntu20.04
                       ffmpeg: "5.1.3-cuda"
                       ffmpeg_os: ubuntu20.04