diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml
index 4b65142..b11fa35 100644
--- a/.github/actions/install/action.yml
+++ b/.github/actions/install/action.yml
@@ -25,7 +25,7 @@ runs:
               docker buildx build \
                 --cache-from type=registry,ref=ghcr.io/samizdapp/athena:${{ github.event.before }} \
                 --cache-from type=registry,ref=ghcr.io/samizdapp/athena:develop \
-                --tag ghcr.io/samizdapp/athena:${{ github.sha }} \
+                --tag ghcr.io/samizdapp/athena:${{ github.event.pull_request.head.sha }} \
                 --push \
                 .
         - name: Build and export validate image
@@ -34,5 +34,5 @@ runs:
               mkdir -p /tmp/images
               docker build . \
                 -f .github/workflows/validate.Dockerfile \
-                --build-arg VERSION=${{ github.sha }} \
-                --tag ghcr.io/samizdapp/athena-validate:${{ github.sha }}
+                --build-arg VERSION=${{ github.event.pull_request.head.sha }} \
+                --tag ghcr.io/samizdapp/athena-validate:${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 2c51c11..a964b60 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -35,7 +35,7 @@ jobs:
                   docker run \
                     --rm \
                     --entrypoint npm \
-                    ghcr.io/samizdapp/athena-validate:${{ github.sha }} \
+                    ghcr.io/samizdapp/athena-validate:${{ github.event.pull_request.head.sha }} \
                     run nx -- format:check  --base=${{ github.event.pull_request.base.sha }}
 
     lint:
@@ -59,7 +59,7 @@ jobs:
                   docker run \
                     --rm \
                     --entrypoint npm \
-                    ghcr.io/samizdapp/athena-validate:${{ github.sha }} \
+                    ghcr.io/samizdapp/athena-validate:${{ github.event.pull_request.head.sha }} \
                     run nx -- affected --target=lint  --base=${{ github.event.pull_request.base.sha }} --max-warnings=0
 
     # This workflow contains a single job called "build"
@@ -84,7 +84,7 @@ jobs:
                   docker run \
                     --rm \
                     --entrypoint npm \
-                    ghcr.io/samizdapp/athena-validate:${{ github.sha }} \
+                    ghcr.io/samizdapp/athena-validate:${{ github.event.pull_request.head.sha }} \
                     run nx -- affected --target=build --base=${{ github.event.pull_request.base.sha }}
 
     test:
@@ -108,5 +108,5 @@ jobs:
                   docker run \
                     --rm \
                     --entrypoint npm \
-                    ghcr.io/samizdapp/athena-validate:${{ github.sha }} \
+                    ghcr.io/samizdapp/athena-validate:${{ github.event.pull_request.head.sha }} \
                     run nx -- affected --target=test --base=${{ github.event.pull_request.base.sha }}