diff --git a/entrypoint.sh b/entrypoint.sh
index 7c486e0..203cace 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -33,8 +33,9 @@ else
     echo "Codespell found one or more problems"
 fi
 
-# Remove the matcher, so no other jobs hit it.
-echo "::remove-matcher owner=codespell::"
+# Remove the matchers, so no other jobs hit them.
+echo "::remove-matcher owner=codespell-matcher-default::"
+echo "::remove-matcher owner=codespell-matcher-specified::"
 
 # If we are in warn-only mode, return always as if we pass
 if [ -n "${INPUT_ONLY_WARN}" ]; then
diff --git a/test/test.bats b/test/test.bats
index 96f5339..ea6b853 100644
--- a/test/test.bats
+++ b/test/test.bats
@@ -31,8 +31,9 @@ function setup() {
     [ "${lines[1]}" == "::add-matcher::${RUNNER_TEMP}/_github_workflow/codespell-matcher.json" ]
     outputRegex="^Running codespell on '${INPUT_PATH}'"
     [[ "${lines[2]}" =~ $outputRegex ]]
-    [ "${lines[-2]}" == "Codespell found one or more problems" ]
-    [ "${lines[-1]}" == "::remove-matcher owner=codespell::" ]
+    [ "${lines[-3]}" == "Codespell found one or more problems" ]
+    [ "${lines[-2]}" == "::remove-matcher owner=codespell-matcher-default::" ]
+    [ "${lines[-1]}" == "::remove-matcher owner=codespell-matcher-specified::" ]
 }
 
 @test "Check file names" {