diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4c84a131daa..2bff0acb1bd 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -43,6 +43,11 @@ jobs:
               run: |
                     echo "VERSION=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_ENV
                     echo "VERSION_SUFFIX=" >> $GITHUB_ENV
+            - name: Extract version (if hopr)
+              if: github.event.ref == 'refs/heads/hopr'
+              run: |
+                    echo "VERSION=latest" >> $GITHUB_ENV
+                    echo "VERSION_SUFFIX=-hopr" >> $GITHUB_ENV
         outputs:
             VERSION: ${{ env.VERSION }}
             VERSION_SUFFIX: ${{ env.VERSION_SUFFIX }}
@@ -121,7 +126,7 @@ jobs:
                 context: .
                 platforms: linux/${{ env.SHORT_ARCH }}
                 push: true
-                tags: ${{ steps.meta.outputs.tags }}
+                tags: ${{ env.VERSION }}-${{ env.SHORT_ARCH }}${{ env.VERSION_SUFFIX }}
                 labels: ${{ steps.meta.outputs.labels }}
 
     # build-docker-multiarch: