diff --git a/.github/workflows/build-and-push-docker.yaml b/.github/workflows/build-and-push-docker.yaml
deleted file mode 100644
index 6cf27166..00000000
--- a/.github/workflows/build-and-push-docker.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-name: Build and Push Docker Images
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build-and-push-image:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out the repository
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: 'linux/amd64,linux/arm64,linux/arm/v7'
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Read version from file
-        run: |
-          cat version >> $GITHUB_ENV
-
-      - name: Build and push core library Docker image
-        uses: docker/build-push-action@v6
-        with:
-          push: true
-          tags: |
-            ghcr.io/kit-mrt/arbitration_graphs:latest
-            ghcr.io/kit-mrt/arbitration_graphs:${{ env.VERSION }}
-          target: install
-
-      - name: Build and push Pacman demo Docker image
-        uses: docker/build-push-action@v6
-        with:
-          build-args: |
-            VERSION=${{ env.VERSION }}
-          context: demo
-          file: demo/Dockerfile
-          push: true
-          tags: |
-            ghcr.io/kit-mrt/arbitration_graphs_pacman_demo:latest
-            ghcr.io/kit-mrt/arbitration_graphs_pacman_demo:${{ env.VERSION }}
-          target: demo
-
-      - name: Build and push Pacman tutorial Docker image
-        uses: docker/build-push-action@v6
-        with:
-          build-args: |
-            VERSION=${{ env.VERSION }}
-          context: demo
-          file: demo/Dockerfile
-          push: true
-          tags: |
-            ghcr.io/kit-mrt/arbitration_graphs_pacman_tutorial:latest
-            ghcr.io/kit-mrt/arbitration_graphs_pacman_tutorial:${{ env.VERSION }}
-          target: tutorial
-
diff --git a/.github/workflows/bump-version-and-create-release.yaml b/.github/workflows/bump-version-and-create-release-and-push-docker-images.yaml
similarity index 68%
rename from .github/workflows/bump-version-and-create-release.yaml
rename to .github/workflows/bump-version-and-create-release-and-push-docker-images.yaml
index ec3acb6b..eb294e10 100644
--- a/.github/workflows/bump-version-and-create-release.yaml
+++ b/.github/workflows/bump-version-and-create-release-and-push-docker-images.yaml
@@ -125,3 +125,61 @@ jobs:
       - name: Run gui unit tests with/against released version
         run: |
           docker run --rm release_tester_gui
+
+  build-and-push-images:
+    needs: [compute-version, build-and-run-release-tests]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repository
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: 'linux/amd64,linux/arm64,linux/arm/v7'
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push core library Docker image
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: |
+            ghcr.io/kit-mrt/arbitration_graphs:latest
+            ghcr.io/kit-mrt/arbitration_graphs:${{ needs.compute-version.outputs.new_tag }}
+          target: install
+
+      - name: Build and push Pacman demo Docker image
+        uses: docker/build-push-action@v6
+        with:
+          build-args: |
+            VERSION=${{ env.VERSION }}
+          context: demo
+          file: demo/Dockerfile
+          push: true
+          tags: |
+            ghcr.io/kit-mrt/arbitration_graphs_pacman_demo:latest
+            ghcr.io/kit-mrt/arbitration_graphs_pacman_demo:${{ needs.compute-version.outputs.new_tag }}
+          target: demo
+
+      - name: Build and push Pacman tutorial Docker image
+        uses: docker/build-push-action@v6
+        with:
+          build-args: |
+            VERSION=${{ env.VERSION }}
+          context: demo
+          file: demo/Dockerfile
+          push: true
+          tags: |
+            ghcr.io/kit-mrt/arbitration_graphs_pacman_tutorial:latest
+            ghcr.io/kit-mrt/arbitration_graphs_pacman_tutorial:${{ needs.compute-version.outputs.new_tag }}
+          target: tutorial
+