diff --git a/.github/workflows/delivery-docker.yml b/.github/workflows/delivery-docker.yml
index a82f859b5..b83ab8be8 100644
--- a/.github/workflows/delivery-docker.yml
+++ b/.github/workflows/delivery-docker.yml
@@ -74,8 +74,8 @@ jobs:
       - name: Tag Image as Base
         if: ${{ (github.event.release != '' || github.event.inputs.tag_latest) && matrix.config == 'base' }}
         run: |
-          crane copy ${{ env.IMG_NAME }}:${{ steps.version.outputs.result }} ${{ env.IMG_NAME }}:base
+          crane copy ${{ env.IMG_NAME }}:${{ steps.version.outputs.result }}${{ matrix.suffix }} ${{ env.IMG_NAME }}:base
       - name: Tag Image as Latest
         if: ${{ (github.event.release != '' || github.event.inputs.tag_latest) && matrix.config != 'base' }}
         run: |
-          crane copy ${{ env.IMG_NAME }}:${{ steps.version.outputs.result }} ${{ env.IMG_NAME }}:latest
+          crane copy ${{ env.IMG_NAME }}:${{ steps.version.outputs.result }}${{ matrix.suffix }} ${{ env.IMG_NAME }}:latest
diff --git a/tools/test-fork.sh b/tools/test-fork.sh
index 84a7d770a..50389e6be 100755
--- a/tools/test-fork.sh
+++ b/tools/test-fork.sh
@@ -53,7 +53,7 @@ sed -i '' "/- config: windows-lcow/,+4d" $wfdir/build.yml
 
 echo "Replacing the registry account with owned one (assumes DOCKER_PASSWORD and DOCKER_USERNAME have been added to GitHub secrets, if not using ghcr.io)"
 sed -i '' "s/buildpacksio\/pack/$registry\/$username\/$reponame/g" $wfdir/check-latest-release.yml
-sed -i '' "/REPO_NAME: 'index.docker.io'/ s/index.docker.io/$registry/g" $wfdir/delivery-docker.yml
+sed -i '' "/REGISTRY_NAME: 'index.docker.io'/ s/index.docker.io/$registry/g" $wfdir/delivery-docker.yml
 sed -i '' "/USER_NAME: 'buildpacksio'/ s/buildpacksio/$username/g" $wfdir/delivery-docker.yml
 
 if [[ $registry != "index.docker.io" ]]; then