diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 11068e0c..8eab9fce 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -158,5 +158,5 @@ jobs:
           push: true
           tags: |
             bpatrik/pigallery2:nightly-${{ matrix.container }}
-            bpatrik/pigallery2:${{ steps.vars.outputs.tag }}-${{ matrix.container == 'debian-buster' && '' || join(['-',matrix.container],'') }}
-            bpatrik/pigallery2:latest${{ matrix.container == 'debian-buster' && '' || join(['-',matrix.container],'') }}
+            bpatrik/pigallery2:${{ matrix.container == 'debian-buster' && steps.vars.outputs.tag  || format('{0}-{1}',steps.vars.outputs.tag,matrix.container) }}
+            bpatrik/pigallery2:${{ matrix.container == 'debian-buster' && 'latest' || format('latest-{0}',matrix.container) }}