diff --git a/.github/workflows/build-push-grandine.yml b/.github/workflows/build-push-grandine.yml
index 8e8f034..4359b61 100644
--- a/.github/workflows/build-push-grandine.yml
+++ b/.github/workflows/build-push-grandine.yml
@@ -75,7 +75,7 @@ jobs:
           source_ref: ${{ inputs.ref }}
           build_script: ./grandine/build.sh
           target_dockerfile: ./grandine/Dockerfile.minimal
-          target_tag: ${{ inputs.docker_tag || inputs.ref }}-${{ matrix.slug }}-minimal
+          target_tag: ${{ inputs.docker_tag || inputs.ref }}-minimal-${{ matrix.slug }}
           target_repository: ethpandaops/grandine
           platform: ${{ matrix.platform }}
 
diff --git a/.github/workflows/build-push-prysm.yml b/.github/workflows/build-push-prysm.yml
index 4ab11a0..fa6e1e6 100644
--- a/.github/workflows/build-push-prysm.yml
+++ b/.github/workflows/build-push-prysm.yml
@@ -75,7 +75,7 @@ jobs:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
           build_script: ./prysm/build_beacon_minimal.sh
-          target_tag: ${{ inputs.docker_tag || inputs.ref }}-${{ matrix.slug }}-minimal
+          target_tag: ${{ inputs.docker_tag || inputs.ref }}-minimal-${{ matrix.slug }}
           target_repository: ethpandaops/prysm-beacon-chain
           target_dockerfile: ./prysm/Dockerfile.beacon
           platform: ${{ matrix.platform }}
@@ -129,7 +129,7 @@ jobs:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
           build_script: ./prysm/build_validator_minimal.sh
-          target_tag: ${{ inputs.docker_tag || inputs.ref }}-${{ matrix.slug }}-minimal
+          target_tag: ${{ inputs.docker_tag || inputs.ref }}-minimal-${{ matrix.slug }}
           target_repository: ethpandaops/prysm-validator
           target_dockerfile: ./prysm/Dockerfile.validator
           platform: ${{ matrix.platform }}