diff --git a/.github/workflows/post-merge.yaml b/.github/workflows/post-merge.yaml
index bf669dab69..a5890b0f3a 100644
--- a/.github/workflows/post-merge.yaml
+++ b/.github/workflows/post-merge.yaml
@@ -203,6 +203,39 @@ jobs:
               "${S3_RELEASE_BINARY_URL}/binaries/edge/$(basename "$asset")"
           done
 
+  deploy-edge-docker:
+    name: Push Edge Docker Tags
+    runs-on: ubuntu-24.04
+    needs: [release-build, release-build-darwin]
+    steps:
+      - name: Check out code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Test
+        run: make ci-release-test
+        timeout-minutes: 60
+
+      - name: Download release binaries
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          pattern: binaries-*
+          merge-multiple: true
+          path: _release
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+
+      - name: Deploy OPA Edge Docker Tags
+        env:
+          DOCKER_USER: ${{ secrets.DOCKER_USER }} # zizmor: ignore[secrets-outside-env]
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} # zizmor: ignore[secrets-outside-env]
+          DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }} # zizmor: ignore[secrets-outside-env]
+        # Only run if required secrets are provided
+        if: ${{ env.DOCKER_USER && env.DOCKER_PASSWORD }}
+        run: make deploy-ci
+
   deploy-wasm-builder:
     name: Deploy WASM Builder
     runs-on: ubuntu-24.04