diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index e45e1dfc..0327b5b3 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -135,10 +135,8 @@ jobs:
           docker manifest push   ${IMAGE}:${TAG}-${VERSION//\~/-}
           docker manifest create ${IMAGE}:${VERSION//\~/-} ${AMD64} ${ARM64} ${ARMV7}
           docker manifest push   ${IMAGE}:${VERSION//\~/-}
+          docker manifest create ${IMAGE}:latest ${AMD64} ${ARM64} ${ARMV7}
+          docker manifest push   ${IMAGE}:latest
           fi
           docker manifest create ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} ${AMD64} ${ARM64} ${ARMV7}
-          docker manifest push   ${IMAGE}:${TAG}-${GITHUB_SHA:0:7}
-          if [[ ${TAG} == master ]]; then
-            docker manifest create ${IMAGE}:latest ${AMD64} ${ARM64} ${ARMV7}
-            docker manifest push   ${IMAGE}:latest
-          fi
\ No newline at end of file
+          docker manifest push   ${IMAGE}:${TAG}-${GITHUB_SHA:0:7}
\ No newline at end of file