diff --git a/.github/workflows/docker-build-publish.yml b/.github/workflows/docker-build-publish.yml
index e85ac32..47033f0 100644
--- a/.github/workflows/docker-build-publish.yml
+++ b/.github/workflows/docker-build-publish.yml
@@ -83,12 +83,11 @@ jobs:
 
             echo "==== Building $NAME ===="
 
-            TAGS=()
-            TAGS+=("$NAME:${{ github.ref_name }}")
-            TAGS+=("$NAME:${{ github.sha }}")
+            TAGS+=("$FULL_IMAGE:${{ github.ref_name }}")
+            TAGS+=("$FULL_IMAGE:${{ github.sha }}")
 
             if [ "${{ steps.branch.outputs.is_default }}" = "true" ]; then
-              TAGS+=("$NAME:latest")
+              TAGS+=("$FULL_IMAGE:latest")
             fi
 
             TAG_ARGS=$(printf -- "--tag %s " "${TAGS[@]}")
@@ -96,8 +95,8 @@ jobs:
             docker buildx build \
               --file "$DOCKERFILE" \
               --target "$TARGET" \
-              --cache-from "type=registry,ref=$CACHE_REF" \
-              --cache-to "type=registry,ref=$CACHE_REF,mode=max" \
+              --cache-from "type=registry,ref=$CACHE_REF"
+              --cache-to "type=registry,ref=$CACHE_REF,mode=max"
               --load \
               $TAG_ARGS \
               $(printf -- "--build-arg %s " $BUILD_ARGS) \