diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 72ab3fb..0b1a2f0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -197,16 +197,8 @@ jobs:
             --platform windows/amd64 \
             -f Dockerfile.windows \
             --build-arg BINARY_NAME=${{ needs.detect-project.outputs.project-name }} \
-            --load \
-            -t ${{ env.IMAGE_NAME }}:windows-${{ env.TAG }} .
-
-      - name: Tag and Push Windows Docker image
-        if: ${{ success() }}
-        run: |
-          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 }}"
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:windows-${{ env.TAG }}
+            --push \
+            -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:windows-${{ env.TAG }} .
 
   cleanup:
     name: Cleanup
diff --git a/Dockerfile.windows b/Dockerfile.windows
index 23b7631..5fac439 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -6,7 +6,7 @@ WORKDIR C:/app
 
 # Copy the Windows binary
 ARG BINARY_NAME
-env BINARY_NAME=${BINARY_NAME:-WatcherAgent}
+ENV BINARY_NAME=${BINARY_NAME:-WatcherAgent}
 COPY windows-bin/${BINARY_NAME}.exe .
 
 ENTRYPOINT ["C:/app/${BINARY_NAME}.exe"]
\ No newline at end of file