diff --git a/.github/workflows/android-finalize-once.yml b/.github/workflows/android-finalize-once.yml
index 77b1458..519b3ae 100644
--- a/.github/workflows/android-finalize-once.yml
+++ b/.github/workflows/android-finalize-once.yml
@@ -10,7 +10,6 @@ permissions:
 
 jobs:
   finalize:
-    if: ${{ !contains(github.event.head_commit.message, 'android-finalizer: apply') }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -20,6 +19,11 @@ jobs:
 
       - name: Apply final field UX and Spanish copy
         run: |
+          set -Eeuo pipefail
+          if git log -1 --pretty=%B | grep -Fq 'android-finalizer: apply'; then
+            echo 'Finalizer already applied.'
+            exit 0
+          fi
           python - <<'PY'
           from pathlib import Path
 
@@ -123,6 +127,10 @@ jobs:
       - name: Commit finalizer changes
         run: |
           set -Eeuo pipefail
+          if git log -1 --pretty=%B | grep -Fq 'android-finalizer: apply'; then
+            echo 'Finalizer already applied; nothing to commit.'
+            exit 0
+          fi
           git config user.name 'DH Android Finalizer'
           git config user.email 'android-finalizer@dhv2.local'
           git add android-app/app/src/main/java/com/korexlabs/dhinspeccion