diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d77690c..b970f38 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -87,7 +87,7 @@ jobs:
       
       - name:  Generate Isolated pom.xml
         run: |
-          docker run --rm -v ${{ github.workspace }}:/var/root/ ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasabld-amd64:main template \
+          docker run --rm -v ${{ github.workspace }}:/var/root/ ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasabld-amd64:${{ env.BRANCH }} template \
           --releaseMetadata var/root/galasa/modules/framework/release.yaml \
           --releaseMetadata /var/root/galasa/modules/extensions/release.yaml \
           --releaseMetadata /var/root/galasa/modules/managers/release.yaml \
@@ -212,7 +212,21 @@ jobs:
           registry: ${{ env.REGISTRY }}
           username: ${{ env.WRITE_GITHUB_PACKAGES_USERNAME }}
           password: ${{ env.WRITE_GITHUB_PACKAGES_TOKEN }}
-  
+
+      - name: Manually build docs.tar (full isolated)
+        run: |
+          docker pull ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-docs-site:${{ env.BRANCH }}
+          docker save -o ${{ github.workspace }}/isolated/full/target/isolated/docs.tar ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-docs-site:${{ env.BRANCH }}
+
+      - name: Download galasa-docs-site HTML from Galasa builds
+        uses: actions/download-artifact@v4
+        with:
+          name: galasa-docs-site
+          repository: galasa-dev/galasa
+          path: ${{ github.workspace }}/isolated/full/target/isolated/galasa-docs-site
+          github-token: ${{ github.token }}
+          run-id: ${{ needs.find-last-successful-build.outputs.workflow_id }}
+
       - name: Extract metadata for galasa-isolated image
         id: metadata-galasa-isolated
         uses: docker/metadata-action@v5
@@ -233,22 +247,8 @@ jobs:
 
       - name: Manually build isolated.tar (full isolated)
         run: |
-          docker pull ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-isolated:main
-          docker save -o ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-isolated:main
-
-      - name: Manually build docs.tar (full isolated)
-        run: |
-          docker pull ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-docs-site:main
-          docker save -o ${{ github.workspace }}/isolated/full/target/isolated/docs.tar ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-docs-site:main
-
-      - name: Download galasa-docs-site HTML from Galasa builds
-        uses: actions/download-artifact@v4
-        with:
-          name: galasa-docs-site
-          repository: galasa-dev/galasa
-          path: ${{ github.workspace }}/isolated/full/target/isolated/galasa-docs-site
-          github-token: ${{ github.token }}
-          run-id: ${{ needs.find-last-successful-build.outputs.workflow_id }}
+          docker pull ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-isolated:${{ env.BRANCH }}
+          docker save -o ${{ github.workspace }}/isolated/full/target/isolated/isolated.tar ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-isolated:${{ env.BRANCH }}
 
       - name: Build Isolated zip with maven
         working-directory: ./isolated/full
@@ -357,7 +357,7 @@ jobs:
       
       - name:  Generate MVP pom.xml
         run: |
-          docker run --rm -v ${{ github.workspace }}:/var/root/ ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasabld-amd64:main template \
+          docker run --rm -v ${{ github.workspace }}:/var/root/ ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasabld-amd64:${{ env.BRANCH }} template \
           --releaseMetadata var/root/galasa/modules/framework/release.yaml \
           --releaseMetadata /var/root/galasa/modules/extensions/release.yaml \
           --releaseMetadata /var/root/galasa/modules/managers/release.yaml \
@@ -483,6 +483,20 @@ jobs:
           username: ${{ env.WRITE_GITHUB_PACKAGES_USERNAME }}
           password: ${{ env.WRITE_GITHUB_PACKAGES_TOKEN }}
 
+      - name: Manually build docs.tar (MVP)
+        run: |
+          docker pull ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-docs-site:${{ env.BRANCH }}
+          docker save -o ${{ github.workspace }}/isolated/mvp/target/isolated/docs.tar ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-docs-site:${{ env.BRANCH }}
+
+      - name: Download galasa-docs-site HTML from Galasa builds
+        uses: actions/download-artifact@v4
+        with:
+          name: galasa-docs-site
+          repository: galasa-dev/galasa
+          path: ${{ github.workspace }}/isolated/mvp/target/isolated/galasa-docs-site
+          github-token: ${{ github.token }}
+          run-id: ${{ needs.find-last-successful-build.outputs.workflow_id }}
+
       - name: Extract metadata for galasa-mvp image
         id: metadata-galasa-mvp
         uses: docker/metadata-action@v5
@@ -503,22 +517,9 @@ jobs:
 
       - name: Manually build isolated.tar (MVP)
         run: |
-          docker pull ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-mvp:main
-          docker save -o ${{ github.workspace }}/isolated/mvp/target/isolated/isolated.tar ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-mvp:main
-
-      - name: Manually build docs.tar (MVP)
-        run: |
-          docker pull ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-docs-site:main
-          docker save -o ${{ github.workspace }}/isolated/mvp/target/isolated/docs.tar ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-docs-site:main
+          docker pull ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-mvp:${{ env.BRANCH }}
+          docker save -o ${{ github.workspace }}/isolated/mvp/target/isolated/isolated.tar ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/galasa-mvp:${{ env.BRANCH }}
 
-      - name: Download galasa-docs-site HTML from Galasa builds
-        uses: actions/download-artifact@v4
-        with:
-          name: galasa-docs-site
-          repository: galasa-dev/galasa
-          path: ${{ github.workspace }}/isolated/mvp/target/isolated/galasa-docs-site
-          github-token: ${{ github.token }}
-          run-id: ${{ needs.find-last-successful-build.outputs.workflow_id }}
 
       - name: Build MVP zip with maven
         working-directory: ./isolated/mvp