diff --git a/.github/workflows/docker_build_push.yml b/.github/workflows/docker_build_push.yml
index 036e3ace..85820ec6 100644
--- a/.github/workflows/docker_build_push.yml
+++ b/.github/workflows/docker_build_push.yml
@@ -30,12 +30,8 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: 
-            # Latest for main, else branch name
+          tags: |
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
-
-      - name: Print tags
-        run: echo "Tags: ${{ steps.meta.outputs.tags }}"
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
diff --git a/.github/workflows/validate-book-build.yml b/.github/workflows/validate-book-build.yml
index c381a2d2..1febb23d 100644
--- a/.github/workflows/validate-book-build.yml
+++ b/.github/workflows/validate-book-build.yml
@@ -9,8 +9,10 @@ on:
 jobs:
   test_building_book:
     runs-on: ubuntu-latest
+
       env:
-        IMAGE: ghcr.io/hendricius/the-sourdough-framework:${{ github.ref_slug }}
+        IMAGE: ghcr.io/hendricius/the-sourdough-framework:${{ github.event.pull_request.head.ref }}
+
     steps:
       - name: Set up git repository
         uses: actions/checkout@v3