diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 102a684..75b5198 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,10 +38,12 @@ jobs:
         run: |
           if [ "${{github.ref_name}}" = "master" ]; then
             REGISTRY=$(echo ${{github.server_url}} | sed s%http://%% | sed s%https://%%)
+            docker login -u "${{github.repository_owner}}" -p "${{secrets.DEPLOY_TOKEN}}" "$REGISTRY"
+            docker login -u "${{secrets.DOCKER_HUB_USER}}" -p "${{secrets.DOCKER_HUB_TOKEN}}" docker.io
+            
             docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "$REGISTRY/${{github.repository}}:latest"
             docker push "$REGISTRY/${{github.repository}}:latest"
 
-            REGISTRY=$(echo ${{github.server_url}} | sed s%http://%% | sed s%https://%%)
-            docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "ztimson/kiwixm:latest"
-            docker push "ztimson/kiwixm:latest"
+            docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "docker.io/ztimson/kiwixm:latest"
+            docker push "docker.io/ztimson/kiwixm:latest"
           fi