diff --git a/scripts/check_for_fixups.sh b/scripts/check_for_fixups.sh
index 12a07e3fd..31ed8640e 100755
--- a/scripts/check_for_fixups.sh
+++ b/scripts/check_for_fixups.sh
@@ -13,13 +13,13 @@ fi
 echo "Base commit: $base_commit"
 
 # Get commits with "fixup!" in the message from base_commit to HEAD
-commits=$(git log -i -E --grep "fixup\!" --format="%h %s" "$base_commit..HEAD")
+commits=$(git log -i -E --grep '^fixup!' --grep '^squash!' --grep '^amend!' --grep '^[^\n]*WIP' --grep '^[^\n]*DROPME' --format="%h %s" "$base_commit..HEAD")
 
 if [ -z "$commits" ]; then
     echo "No fixup commits found."
     exit 0
 else
-    echo "Fixup commits found:"
+    echo "Fixup or WIP commits found:"
     echo "$commits"
     exit 1
 fi