diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 60cb6e9..95de743 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -39,7 +39,6 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to DockerHub
-        if: vars.DOCKERHUB_USERNAME != ''
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
@@ -55,9 +54,12 @@ jobs:
           tags: |
             ghcr.io/${{ env.ACTOR_LOWER }}/${{ env.REPO_NAME }}:${{ matrix.tag_name }}-${{ github.sha }}
             ghcr.io/${{ env.ACTOR_LOWER }}/${{ env.REPO_NAME }}:${{ matrix.tag_name }}
+            ghcr.io/${{ env.ACTOR_LOWER }}/${{ env.REPO_NAME }}:latest
+            ${{ steps.vars.outputs.DOCKERHUB_USERNAME }}/${{ env.REPO_NAME }}:${{ matrix.tag_name }}-${{ github.sha }}
+            ${{ steps.vars.outputs.DOCKERHUB_USERNAME }}/${{ env.REPO_NAME }}:${{ matrix.tag_name }}
+            ${{ steps.vars.outputs.DOCKERHUB_USERNAME }}/${{ env.REPO_NAME }}:latest
 
       - name: Docker Hub Description
-        if: vars.DOCKERHUB_USERNAME != ''
         uses: peter-evans/dockerhub-description@v3.4.2
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}