diff --git a/.github/workflows/build-push-deploy.yml b/.github/workflows/build-push-deploy.yml
index e4207501d..0cf705172 100644
--- a/.github/workflows/build-push-deploy.yml
+++ b/.github/workflows/build-push-deploy.yml
@@ -61,7 +61,6 @@ jobs:
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Maybe overwrite app/version.Version with git tag
-      if: github.ref_type == 'tag'
       run: echo 'GO_BUILD_FLAG=-ldflags=-X github.com/obolnetwork/charon/app/version.version=${{ github.ref_name }}' >> $GITHUB_ENV
 
     - uses: docker/build-push-action@v4
@@ -81,6 +80,7 @@ jobs:
         echo "::set-output name=short_sha::$calculatedSha"
 
     - name: Trigger dev relay deploy job
+      if: github.ref_type == 'tag'
       uses: peter-evans/repository-dispatch@v2
       with:
         token: ${{ secrets.CHARON_K8S_REPO_ACCESS_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7d2e6dae9..28ddaa097 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,6 +33,7 @@ jobs:
           token: ${{ secrets.RELEASE_SECRET }}
 
   trigger-dispatch:
+    needs: release
     runs-on: ubuntu-latest
     steps:
       - name: Extract tag name