diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a3a918..1ecee38 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -197,5 +197,5 @@ jobs:
           file: scripts/vtk-prompt.Dockerfile
           push: true
           tags: |
-            ghcr.io/kitware/vtk-prompt/vtk-prompt:latest
-            ghcr.io/kitware/vtk-prompt/vtk-prompt:${{ github.sha }}
+            ghcr.io/kitware/vtk-prompt/vtk-prompt:latest-master
+            ghcr.io/kitware/vtk-prompt/vtk-prompt:${{ github.sha }}-master
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 51bf594..87fa2a3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,6 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       published: ${{ steps.semrel.outputs.new_release_published }}
+      version: ${{ steps.semrel.outputs.new_release_version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -63,3 +64,31 @@ jobs:
 
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
+
+  docker:
+    name: Build and Push vtk-prompt Release Image
+    needs: release
+    if: needs.release.outputs.published == 'true'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: release
+
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: scripts/vtk-prompt.Dockerfile
+          push: true
+          tags: |
+            ghcr.io/kitware/vtk-prompt/vtk-prompt:${{ needs.release.outputs.version }}
+            ghcr.io/kitware/vtk-prompt/vtk-prompt:latest