diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 43d2b62..31039db 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -49,7 +49,6 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - run: docker image ls
       - name: Push to github container registry
         if: ${{ success() && steps.login.conclusion != 'skipped' }}
         run: make push_base
@@ -110,9 +109,16 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Tag as latest
+        if: ${{ success() && steps.login.conclusion != 'skipped' }}
+        run: "make tag_latest_${{ matrix.img }}"
+        env:
+          BUILD_AMD64: ${{ fromJSON('[0, 1]')[matrix.arch.name == 'amd64'] }}
+          BUILD_ARM64: ${{ fromJSON('[0, 1]')[matrix.arch.name == 'arm64'] }}
+      - run: docker image ls
       - name: Push to github container registry
         if: ${{ success() && steps.login.conclusion != 'skipped' }}
-        run: "make tag_latest_${{ matrix.img }} push_${{ matrix.img }}"
+        run: "make push_${{ matrix.img }}"
         env:
           BUILD_AMD64: ${{ fromJSON('[0, 1]')[matrix.arch.name == 'amd64'] }}
           BUILD_ARM64: ${{ fromJSON('[0, 1]')[matrix.arch.name == 'arm64'] }}