diff --git a/.github/workflows/contracts-ecdsa.yml b/.github/workflows/contracts-ecdsa.yml
index 7ec449b67c..2f3efdfe8b 100644
--- a/.github/workflows/contracts-ecdsa.yml
+++ b/.github/workflows/contracts-ecdsa.yml
@@ -349,4 +349,4 @@ jobs:
           environment: ${{ github.event.inputs.environment }}
           upstream_builds: ${{ github.event.inputs.upstream_builds }}
           upstream_ref: dapp-development
-          version: ${{ steps.npm-version-bump.outputs.version }}
+          version: ${{ steps.npm-version-bump.outputs.version }}
\ No newline at end of file
diff --git a/.github/workflows/contracts-random-beacon.yml b/.github/workflows/contracts-random-beacon.yml
index 71460b2456..6402472d77 100644
--- a/.github/workflows/contracts-random-beacon.yml
+++ b/.github/workflows/contracts-random-beacon.yml
@@ -343,4 +343,4 @@ jobs:
           environment: ${{ github.event.inputs.environment }}
           upstream_builds: ${{ github.event.inputs.upstream_builds }}
           upstream_ref: dapp-development
-          version: ${{ steps.npm-version-bump.outputs.version }}
+          version: ${{ steps.npm-version-bump.outputs.version }}
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7813775382..7df458d649 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -114,3 +114,62 @@ jobs:
         run: |
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+
+  publish-docker-images:
+    needs: build-and-release
+    runs-on: ubuntu-latest
+    environment: keep-production  # Requires release-admin team approval
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Resolve versions
+        run: |
+          echo "version=$(git describe --tags --match 'v[0-9]*' HEAD)" >> $GITHUB_ENV
+          echo "revision=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          echo "dockerhub_org=${DOCKERHUB_ORG:-thresholdnetwork}" >> $GITHUB_ENV
+        env:
+          DOCKERHUB_ORG: ${{ secrets.DOCKERHUB_ORG }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Cache Docker layers
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-docker-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-docker-
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and Push Docker Images
+        uses: docker/build-push-action@v5
+        with:
+          target: runtime-docker
+          tags: |
+            ${{ env.dockerhub_org }}/keep-client:latest
+            ${{ env.dockerhub_org }}/keep-client:${{ env.version }}
+            ${{ env.dockerhub_org }}/keep-client:mainnet
+          labels: |
+            version=${{ env.version }}
+            revision=${{ env.revision }}
+          build-args: |
+            ENVIRONMENT=mainnet
+            VERSION=${{ env.version }}
+            REVISION=${{ env.revision }}
+          push: true
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-docker-new
+          context: .
+
+      - name: Move Docker cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-docker-new /tmp/.buildx-cache          
\ No newline at end of file
diff --git a/solidity/ecdsa/contracts/WalletRegistry.sol b/solidity/ecdsa/contracts/WalletRegistry.sol
index b24f2eeccd..81d05a6b34 100644
--- a/solidity/ecdsa/contracts/WalletRegistry.sol
+++ b/solidity/ecdsa/contracts/WalletRegistry.sol
@@ -34,6 +34,8 @@ import "@threshold-network/solidity-contracts/contracts/staking/IStaking.sol";
 
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
+// TODO: Remove this once the contract is deployed to the mainnet
+
 contract WalletRegistry is
     IWalletRegistry,
     IRandomBeaconConsumer,