diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e8b4731..44e1675 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -146,40 +146,20 @@ jobs:
           ls -la linux-bin/
           echo "Windows binary:"
           ls -la windows-bin/
-      
-      - name: Log in to private registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      
       - name: Build Linux Docker image
         if: ${{ always() && steps.download-linux.outcome == 'success' }}
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: Dockerfile.linux
-          platforms: linux/amd64
-          push: false
-          tags: ${{ env.DOCKER_IMAGE_NAME }}:linux-latest
-          build-args: |
-            BINARY_PATH=linux-bin/${{ needs.detect-project.outputs.project-name }}
+        run: |
+          docker build -f Dockerfile.linux -t ${{ env.IMAGE_NAME }}:linux-${{ env.TAG }} .
+          docker tag ${{ env.IMAGE_NAME }}:linux-${{ env.TAG }} ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:linux-${{ env.TAG }}
+          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:linux-${{ env.TAG }}
       
       - name: Build Windows Docker image
         if: ${{ always() && steps.download-windows.outcome == 'success' }}
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: Dockerfile.windows
-          platforms: windows-amd64
-          push: false
-          tags: ${{ env.DOCKER_IMAGE_NAME }}:windows-latest
-          build-args: |
-            BINARY_PATH=windows-bin/${{ needs.detect-project.outputs.project-name }}.exe
+        run: |
+          docker build -f Dockerfile.windows -t ${{ env.IMAGE_NAME }}:windows-${{ env.TAG }} .
+          docker tag ${{ env.IMAGE_NAME }}:windows-${{ env.TAG }} ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:windows-${{ env.TAG }}
+          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:windows-${{ env.TAG }}
 
   cleanup:
     name: Cleanup