diff --git a/hadolint.sh b/hadolint.sh
index d28035d..edc6fab 100755
--- a/hadolint.sh
+++ b/hadolint.sh
@@ -12,7 +12,7 @@ fi
 # the matcher so it won't take effect in later steps.
 # shellcheck disable=SC2317
 cleanup() {
-  echo "::remove-matcher owner=brpaz/hadolint-action::"
+  echo "::remove-matcher owner=hadolint/hadolint-action::"
 }
 trap cleanup EXIT
 
diff --git a/problem-matcher.json b/problem-matcher.json
index 215a6e0..089f9c6 100644
--- a/problem-matcher.json
+++ b/problem-matcher.json
@@ -1,7 +1,7 @@
 {
   "problemMatcher": [
     {
-      "owner": "brpaz/hadolint-action",
+      "owner": "hadolint/hadolint-action",
       "pattern": [
         {
           "regexp": "(.*)\\:(\\d+)\\s(.*)",