diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index 8ce476d093..05989a3394 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -12,15 +12,31 @@ on:
 
 
 jobs:
-    bake:
+
+    obtain-targets:
+        runs-on: ubuntu-latest
+        outputs:
+            targets: ${{ steps.generate.outputs.targets }}
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: List targets
+              id: generate
+              uses: docker/bake-action/subaction/list-targets@v4
+              with:
+                  target: docker-buildx-bake
+                  workdir: util/dockerfiles
+
+    docker-buildx-bake:
         runs-on: [self-hosted, linux, x64]
+        needs:
+            - prepare
 
         strategy:
             fail-fast: false
             matrix:
-                target:
-                    - ubuntu-24-04_all-dependencies
-                    - gcc-version-11
+                target: ${{ fromJson(needs.obtain-targets.outputs.targets) }}
 
         permissions:
             packages: write