diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml
index 8c0b21c..b4217eb 100644
--- a/.github/workflows/release-please.yaml
+++ b/.github/workflows/release-please.yaml
@@ -6,6 +6,7 @@ on:
   push:
     branches:
     - "master"
+  release:
 
 jobs:
   release-please:
@@ -15,20 +16,10 @@ jobs:
       with:
         release-type: "simple"
   build-images:
-    if: ${{ github.event_name == 'push' }}
     runs-on: ubuntu-latest
     needs: release-please
     steps:
       - uses: actions/checkout@v2
-      - name: Set ENV for branch master/main
-        if: ${{ github.ref == 'refs/heads/master' }}
-        run: echo "RELEASE_VERSION=latest" >> $GITHUB_ENV
-      - name: Set ENV for tags
-        if: ${{ startsWith(github.ref, 'refs/tags/') }}
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      - name: Set ENV for specific branch
-        if: ${{ startsWith(github.ref, 'refs/heads/') && !endsWith(github.ref, '/master') }}
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}-${GITHUB_SHA}" >> $GITHUB_ENV
       - name: Login to GHCR
         uses: docker/login-action@v1
         with:
@@ -37,8 +28,9 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build Image Odyssey
         uses: docker/build-push-action@v2
+        if: ${{ steps.release_please.outputs.release_created }}
         with:
           context: .
           platforms: linux/amd64
           push: true
-          tags: ghcr.io/${{ github.repository }}:${{ env.RELEASE_VERSION }}
+          tags: ghcr.io/${{ github.repository }}:${{ steps.release-please.outputs.tag_name }}