diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index f46f622..0b68fdf 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -17,12 +17,13 @@ jobs:
       VERSION: ${{ steps.version.outputs.VERSION }}
 
   build-images:
+    needs: metadata
     runs-on: ubuntu-latest
     env:
       REGISTRY: ghcr.io
       IMAGE_NAME: ghcr.io/sosheskaz/infinitude-ha-addon
       INFINITUDE_IMAGE_NAME: ghcr.io/sosheskaz/infinitude-core:${{ github.event.release.tag_name }}
-      VERSION: ${{ jobs.metadata.outputs.VERSION }}
+      VERSION: ${{ needs.metadata.outputs.VERSION }}
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index d973235..0000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-name: Build Release
-on: [release]  # yamllint disable-line rule:truthy
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ghcr.io/sosheskaz/infinitude-ha-addon
-  INFINITUDE_IMAGE_NAME: ghcr.io/sosheskaz/infinitude-core:${{ github.event.release.tag_name }}
-  VERSION: ${{ github.event.release.tag_name }}
-
-jobs:
-  build-images:
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: build base image
-        run: docker buildx bake infinitude-base --push
-
-      - name: build release image
-        run: docker buildx bake release --push