diff --git a/.github/workflows/sushi30-docker.yml b/.github/workflows/sushi30-docker.yml
index 887d22f48..6dfa0401e 100644
--- a/.github/workflows/sushi30-docker.yml
+++ b/.github/workflows/sushi30-docker.yml
@@ -43,6 +43,7 @@ jobs:
           push: true
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:sushi30
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:picoclaw-whatsapp
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:sha-${{ steps.sha.outputs.short }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 41cc69348..d4edba742 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,7 +13,7 @@ RUN go mod download
 
 # Copy source and build
 COPY . .
-ARG BUILD_TARGET=build
+ARG BUILD_TARGET=build-whatsapp-native-docker
 RUN make ${BUILD_TARGET}
 
 # ============================================================