diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index 2afa907d0d..a518bb8332 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -1,54 +1,39 @@
 ---
 name: Docker images build and push
 
+#on:
+#  push:
+#    branches:
+#      - 'develop'
+#    paths:
+#      - util/dockerfiles/**
 on:
     workflow_dispatch:
+
+
 jobs:
-    obtain-dockerfiles:
+    bake:
         runs-on: [self-hosted, linux, x64]
         container: ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest
-
-        steps:
-            - uses: actions/checkout@v4
-              with:
-          # Scheduled workflows run on the default branch by default. We
-          # therefore need to explicitly checkout the develop branch.
-                  ref: develop
-            - uses: actions/upload-artifact@v4
-              with:
-                  name: dockerfiles
-                  path: util/dockerfiles
-
-  # This builds and pushes the docker image.
-    build-and-push:
-        runs-on: [self-hosted, linux, x64]
-        needs: obtain-dockerfiles
         permissions:
             packages: write
             contents: read
-
         steps:
-            - uses: actions/download-artifact@v4
-              with:
-                  name: dockerfiles
-                  path: dockerfiles-docker-build
+            - name: Checkout
+              uses: actions/checkout@v4
 
-            - uses: docker/setup-qemu-action@v2
-              name: Setup QEMU
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v3
 
-            - uses: docker/setup-buildx-action@v2
-              name: Set up Docker Buildx
-
-            - uses: docker/login-action@v2
-              name: Login to the GitHub Container Registry
+            - name: Login to GitHub Container Registry
+              uses: docker/login-action@v3
               with:
                   registry: ghcr.io
                   username: ${{ github.repository_owner }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Build and push with bake
-              uses: docker/bake-action@v4
+            - name: Build and push
+              uses: docker/bake-action@v5
               with:
-                  workdir: ./dockerfiles-docker-build
-                  files: docker-bake.hcl
+                  workdir: util/dockerfiles
                   push: true