diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
index 7e6fcb804f..8eb69c4068 100644
--- a/.github/workflows/client.yml
+++ b/.github/workflows/client.yml
@@ -146,6 +146,21 @@ jobs:
           push: false
           context: .
 
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Build multi-platform Runtime Inage
+        if: github.event_name != 'workflow_dispatch'
+        uses: docker/build-push-action@v3
+        with:
+          target: runtime-docker
+          platforms: linux/amd64,linux/arm64
+          labels: |
+            version=${{ env.version }}
+            revision=${{ env.revision }}
+          push: false
+          context: .
+
       - name: Login to Google Container Registry
         if: github.event_name == 'workflow_dispatch'
         uses: docker/login-action@v2
@@ -176,6 +191,29 @@ jobs:
           push: true
           context: .
 
+      - name: Build and publish multi-platform Docker Runtime Image
+        if: github.event_name == 'workflow_dispatch'
+        uses: docker/build-push-action@v3
+        env:
+          IMAGE_NAME: "keep-client-mp"
+        with:
+          target: runtime-docker
+          platforms: linux/amd64, linux/arm64
+          tags: |
+            ${{ env.GCR_REGISTRY_URL }}/${{ env.GOOGLE_PROJECT_ID }}/${{ env.IMAGE_NAME }}
+            ${{ env.GCR_REGISTRY_URL }}/${{ env.GOOGLE_PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ env.version }}
+            ${{ env.GCR_REGISTRY_URL }}/${{ env.GOOGLE_PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.environment }}
+            ${{ env.GCR_REGISTRY_URL }}/${{ env.GOOGLE_PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ env.version }}-${{ github.event.inputs.environment }}
+          labels: |
+            version=${{ env.version }}
+            revision=${{ env.revision }}
+          build-args: |
+            ENVIRONMENT=${{ github.event.inputs.environment }}
+            VERSION=${{ env.version }}
+            REVISION=${{ env.revision }}
+          push: true
+          context: .
+
       - name: Build Client Binaries
         uses: docker/build-push-action@v3
         with: