diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8fcc8fcc..24f759dc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -225,7 +225,7 @@ jobs:
               uses: docker/login-action@v3
               with:
                   registry: ghcr.io
-                  username: ${{ github.actor }}
+                  username: ${{ github.repository_owner }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Create and push Manifest to GitHub
@@ -249,11 +249,13 @@ jobs:
 
             - name: Login to Docker Hub
               uses: docker/login-action@v3
+              if: ${{ (vars.DOCKER_USERNAME != '') && (secrets.DOCKERHUB_TOKEN != '') }}
               with:
-                  username: ${{ secrets.DOCKER_USERNAME }}
+                  username: ${{ vars.DOCKER_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
             - name: Create and push manifest to Docker Hub
+              if: ${{ (vars.DOCKER_USERNAME != '') && (secrets.DOCKERHUB_TOKEN != '') }}
               run: |
                   REPO_DOCKER="docker.io/${{ github.repository }}"
                   SHA_TAG="${{ github.ref_name }}-${{ github.sha }}"