diff --git a/.github/workflows/publish-builder-images.yaml b/.github/workflows/publish-builder-images.yaml
index 2f3987372b6..5d2c811f3f2 100644
--- a/.github/workflows/publish-builder-images.yaml
+++ b/.github/workflows/publish-builder-images.yaml
@@ -3,15 +3,6 @@ run-name: "Publish builder images for ${{ inputs.ref || github.ref_name }}"
 
 on:
   push:
-    branches:
-      - m1
-    paths:
-      - ".github/workflows/publish-builder-images.yaml"
-      - ".cargo/**"
-      - "Cargo.lock"
-      - "Cargo.toml"
-      - "docker/builder/**"
-      - "rust-toolchain.toml"
   workflow_dispatch:
     inputs:
       ref:
@@ -161,3 +152,17 @@ jobs:
             "${common_metadata_args[@]}" \
             "${tools_tags[@]}" \
             .
+
+          validator_tags=()
+          add_tags validator_tags "$IMAGE_NAMESPACE/validator"
+
+          docker buildx build \
+            --push \
+            --file docker/builder/validator.Dockerfile \
+            --target validator \
+            --build-context "debian-base=$DEBIAN_CONTEXT" \
+            --build-context "node-builder=docker-image://$IMAGE_NAMESPACE/aptos-node-builder:$SHORT_SHA" \
+            --build-context "tools-builder=docker-image://$IMAGE_NAMESPACE/tools-builder:$SHORT_SHA" \
+            "${common_metadata_args[@]}" \
+            "${validator_tags[@]}" \
+            .
diff --git a/.gitignore b/.gitignore
index 383d9e8dbd7..93dbd8dbe79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -148,3 +148,6 @@ genesis_antithesis_*/
 
 # Ignore generated credentials from google-github-actions/auth
 gha-creds-*.json
+
+# Ignore Claude Code local config
+.claude/