diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5eaf4bb..001f976 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -156,6 +156,7 @@ jobs:
             --platform linux/amd64 \
             -f Dockerfile.linux \
             --build-arg BINARY_NAME=${{ needs.detect-project.outputs.project-name }} \
+            --load \
             -t ${{ env.IMAGE_NAME }}:linux-${{ env.TAG }} .
 
       - name: Login to Docker Registry
@@ -178,7 +179,7 @@ jobs:
         run: |
           echo "Building Windows Docker-Image with env-Tag: ${{env.TAG }}"
           docker build -f Dockerfile.windows -t ${{ env.IMAGE_NAME }}:windows-${{ env.TAG }} .
-          echo docker login git.triggermeelmo.com -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+          echo docker login ${{ env.REGISTRY }} -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
           echo "Tagging Windows Docker image"
           docker tag ${{ env.IMAGE_NAME }}:windows-${{ env.TAG }} ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:windows-${{ env.TAG }}
           echo "Pushing Windows Docker image to registry: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:windows-${{ env.TAG }}"