diff --git a/build-verified/action.yaml b/build-verified/action.yaml
index 2c5c1db..c9a6a49 100644
--- a/build-verified/action.yaml
+++ b/build-verified/action.yaml
@@ -8,6 +8,11 @@ inputs:
     description: "Features to enable during build"
     required: false
     default: ""
+  base-image:
+    description: "Override solana-verify's --base-image. Pass the same value
+      to verify-build to keep the verify-PDA aligned."
+    required: false
+    default: ""
 
 runs:
   using: "composite"
@@ -20,10 +25,18 @@ runs:
 
     - name: Build Verified
       shell: bash
+      env:
+        FEATURES_INPUT: ${{ inputs.features }}
+        BASE_IMAGE: ${{ inputs.base-image }}
+        PROGRAM: ${{ inputs.program }}
       run: |
-        FEATURES="${{ inputs.features }}"
-        if [ ! -z "$FEATURES" ]; then
-          FEATURES="--features $FEATURES"
+        FEATURES=""
+        if [ -n "$FEATURES_INPUT" ]; then
+          FEATURES="--features $FEATURES_INPUT"
+        fi
+        BASE_IMAGE_ARG=""
+        if [ -n "$BASE_IMAGE" ]; then
+          BASE_IMAGE_ARG="--base-image $BASE_IMAGE"
         fi
         # Run solana-verify directly without Docker
-        ~/.cargo/bin/solana-verify build --library-name ${{ inputs.program }} -- $FEATURES
+        ~/.cargo/bin/solana-verify build $BASE_IMAGE_ARG --library-name "$PROGRAM" -- $FEATURES
diff --git a/verify-build/action.yaml b/verify-build/action.yaml
index 53e2841..9a70557 100644
--- a/verify-build/action.yaml
+++ b/verify-build/action.yaml
@@ -40,6 +40,16 @@ inputs:
   vault-address:
     description: "The Squads vault address (required if use-squads is true)"
     required: false
+  base-image:
+    description: "Override solana-verify's --base-image. Must match
+      build-verified to keep the verify-PDA aligned with the built .so."
+    required: false
+    default: ""
+  features:
+    description: "Comma-separated cargo features. Must match build-verified
+      to keep the verify-PDA aligned with the built .so."
+    required: false
+    default: ""
 
 runs:
   using: "composite"
@@ -54,62 +64,109 @@ runs:
 
     - name: Debug Environment
       shell: bash
+      env:
+        EVENT_NETWORK: ${{ github.event.inputs.network }}
+        EVENT_VERIFY: ${{ github.event.inputs.verify }}
+        HAS_KEYPAIR: ${{ inputs.keypair != '' }}
       run: |
-        echo "Network: ${{ github.event.inputs.network }}"
-        echo "Verify: ${{ github.event.inputs.verify }}"
-        echo "Has keypair: ${{ inputs.keypair != '' }}"
+        echo "Network: $EVENT_NETWORK"
+        echo "Verify: $EVENT_VERIFY"
+        echo "Has keypair: $HAS_KEYPAIR"
 
     - name: Verify Build
       shell: bash
       if: inputs.use-squads == 'false'
+      env:
+        SKIP_BUILD: ${{ inputs.skip-build }}
+        SKIP_PROMPT: ${{ inputs.skip-prompt }}
+        MOUNT_PATH: ${{ inputs.mount-path }}
+        COMMIT_HASH: ${{ inputs.commit-hash }}
+        NETWORK: ${{ inputs.network }}
+        BASE_IMAGE: ${{ inputs.base-image }}
+        FEATURES_INPUT: ${{ inputs.features }}
+        PROGRAM_ID: ${{ inputs.program-id }}
+        RPC_URL: ${{ inputs.rpc-url }}
+        PROGRAM: ${{ inputs.program }}
+        REPO_URL: ${{ inputs.repo-url }}
       run: |
         ARGS=""
 
-        if [ "${{ inputs.skip-build }}" = "true" ]; then
+        if [ "$SKIP_BUILD" = "true" ]; then
           ARGS="$ARGS --skip-build"
         fi
 
-        if [ "${{ inputs.skip-prompt }}" = "true" ]; then
+        if [ "$SKIP_PROMPT" = "true" ]; then
           ARGS="$ARGS --skip-prompt"
         fi
 
-        if [ -n "${{ inputs.mount-path }}" ]; then
-          ARGS="$ARGS --mount-path ${{ inputs.mount-path }}"
+        if [ -n "$MOUNT_PATH" ]; then
+          ARGS="$ARGS --mount-path $MOUNT_PATH"
         fi
 
-        if [ -n "${{ inputs.commit-hash }}" ]; then
-          ARGS="$ARGS --commit-hash ${{ inputs.commit-hash }}"
+        if [ -n "$COMMIT_HASH" ]; then
+          ARGS="$ARGS --commit-hash $COMMIT_HASH"
         fi
 
-        if [ "${{ inputs.network }}" = "mainnet" ]; then
+        if [ "$NETWORK" = "mainnet" ]; then
           ARGS="$ARGS --remote"
         fi
 
+        if [ -n "$BASE_IMAGE" ]; then
+          ARGS="$ARGS --base-image $BASE_IMAGE"
+        fi
+
+        CARGO_ARGS=""
+        if [ -n "$FEATURES_INPUT" ]; then
+          CARGO_ARGS="-- --features $FEATURES_INPUT"
+        fi
+
         solana-verify verify-from-repo \
-          --program-id ${{ inputs.program-id }} \
-          --url ${{ inputs.rpc-url }} \
-          --library-name ${{ inputs.program }} \
+          --program-id "$PROGRAM_ID" \
+          --url "$RPC_URL" \
+          --library-name "$PROGRAM" \
           -k ./deploy-keypair.json \
           $ARGS \
-          ${{ inputs.repo-url }}
+          "$REPO_URL" \
+          $CARGO_ARGS
 
     - name: Export PDA Transaction
       id: export-pda
       if: inputs.use-squads == 'true'
       shell: bash
+      env:
+        BASE_IMAGE: ${{ inputs.base-image }}
+        FEATURES_INPUT: ${{ inputs.features }}
+        REPO_URL: ${{ inputs.repo-url }}
+        PROGRAM_ID: ${{ inputs.program-id }}
+        VAULT_ADDRESS: ${{ inputs.vault-address }}
+        COMMIT_HASH: ${{ inputs.commit-hash }}
+        RPC_URL: ${{ inputs.rpc-url }}
+        PROGRAM: ${{ inputs.program }}
       run: |
         echo "=== Exporting PDA Transaction ==="
 
+        BASE_IMAGE_ARG=""
+        if [ -n "$BASE_IMAGE" ]; then
+          BASE_IMAGE_ARG="--base-image $BASE_IMAGE"
+        fi
+
+        CARGO_ARGS=""
+        if [ -n "$FEATURES_INPUT" ]; then
+          CARGO_ARGS="-- --features $FEATURES_INPUT"
+        fi
+
         # Get the last line which should be the base64 transaction
         TX=$(solana-verify export-pda-tx \
-          ${{ inputs.repo-url }} \
-          --program-id ${{ inputs.program-id }} \
-          --uploader ${{ inputs.vault-address }} \
-          --commit-hash ${{ inputs.commit-hash }} \
-          --url ${{ inputs.rpc-url }} \
-          --library-name ${{ inputs.program }} \
-          --encoding base64 | tail -n 1)
-          
+          "$REPO_URL" \
+          --program-id "$PROGRAM_ID" \
+          --uploader "$VAULT_ADDRESS" \
+          --commit-hash "$COMMIT_HASH" \
+          --url "$RPC_URL" \
+          --library-name "$PROGRAM" \
+          $BASE_IMAGE_ARG \
+          --encoding base64 \
+          $CARGO_ARGS | tail -n 1)
+
         # Verify we got a base64 string
         if [[ ! "$TX" =~ ^[A-Za-z0-9+/=]*$ ]]; then
           echo "Error: Invalid base64 transaction"