diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6e42bce..5712451 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -96,6 +96,23 @@ jobs:
               phishingclub \
               phishingclub.sig
 
+      - name: Build and push production Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile.release
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}:${{ steps.get_version.outputs.VERSION }}
+            ghcr.io/${{ github.repository }}:latest
+          labels: |
+            org.opencontainers.image.title=PhishingClub
+            org.opencontainers.image.url=${{ github.server_url }}/${{ github.repository }}
+            org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
+            org.opencontainers.image.version=${{ steps.get_version.outputs.VERSION }}
+            org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
+            org.opencontainers.image.revision=${{ github.sha }}
+
       - name: Extract release notes from RELEASE.md
         id: get_release_notes
         run: |
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 9551c8b..885771e 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -49,7 +49,7 @@ jobs:
           mkdir -p backend/frontend/build
           cp -r frontend/build/* backend/frontend/build/
 
-      - name: Build single binary with all features
+      - name: Build binary
         run: |
           sudo docker run --rm \
           -v "$(pwd)":/app \