diff --git a/hadolint.sh b/hadolint.sh
index 3827766..34731f5 100755
--- a/hadolint.sh
+++ b/hadolint.sh
@@ -7,7 +7,15 @@
 TMP_FOLDER=$(mktemp -d -p .)
 cp /problem-matcher.json "${TMP_FOLDER}"
 chmod -R a+rX "${TMP_FOLDER}"
-trap "rm -rf \"${TMP_FOLDER}\"" EXIT
+
+# After the run has finished we remove the problem-matcher.json from
+# the repository so we don't leave the checkout dirty. We also remove
+# the matcher so it won't take effect in later steps.
+cleanup() {
+    echo "::remove-matcher owner=brpaz/hadolint-action::"
+    rm -rf "${TMP_FOLDER}"
+}
+trap cleanup EXIT
 
 echo "::add-matcher::${TMP_FOLDER}/problem-matcher.json"
 
diff --git a/problem-matcher.json b/problem-matcher.json
index f720974..215a6e0 100644
--- a/problem-matcher.json
+++ b/problem-matcher.json
@@ -1,7 +1,7 @@
 {
   "problemMatcher": [
     {
-      "owner": "hadolint",
+      "owner": "brpaz/hadolint-action",
       "pattern": [
         {
           "regexp": "(.*)\\:(\\d+)\\s(.*)",