diff --git a/ci/repokitteh/modules/newcontributor.star b/ci/repokitteh/modules/newcontributor.star
deleted file mode 100644
index 865e5e90c762..000000000000
--- a/ci/repokitteh/modules/newcontributor.star
+++ /dev/null
@@ -1,43 +0,0 @@
-
-NEW_CONTRIBUTOR_MESSAGE = """
-Hi @%s, welcome and thank you for your contribution.
-
-We will try to review your Pull Request as quickly as possible.
-
-In the meantime, please take a look at the [contribution guidelines](https://github.com/envoyproxy/envoy/blob/main/CONTRIBUTING.md) if you have not done so already.
-
-"""
-
-DRAFT_MESSAGE = """
-As a reminder, PRs marked as draft will not be automatically assigned reviewers,
-or be handled by maintainer-oncall triage.
-
-Please mark your PR as ready when you want it to be reviewed!
-"""
-
-
-def get_pr_author_association(issue_number):
-  return github.call(
-    method="GET",
-    path="repos/envoyproxy/envoy/pulls/%s" % issue_number)["json"]["author_association"]
-
-def is_newcontributor(issue_number):
-  return (
-    get_pr_author_association(issue_number)
-    in ["NONE", "FIRST_TIME_CONTRIBUTOR", "FIRST_TIMER"])
-
-def should_message_newcontributor(action, issue_number):
-  return (
-    action == 'opened'
-    and is_newcontributor(issue_number))
-
-def send_newcontributor_message(sender):
-  github.issue_create_comment(NEW_CONTRIBUTOR_MESSAGE % sender)
-
-def _pr(action, issue_number, sender, config, draft):
-  if should_message_newcontributor(action, issue_number):
-    send_newcontributor_message(sender)
-  if action == 'opened' and draft:
-    github.issue_create_comment(DRAFT_MESSAGE)
-
-handlers.pull_request(func=_pr)
diff --git a/ci/repokitteh/modules/newpr.star b/ci/repokitteh/modules/newpr.star
index 865e5e90c762..4c4797f44226 100644
--- a/ci/repokitteh/modules/newpr.star
+++ b/ci/repokitteh/modules/newpr.star
@@ -34,7 +34,14 @@ def should_message_newcontributor(action, issue_number):
 def send_newcontributor_message(sender):
   github.issue_create_comment(NEW_CONTRIBUTOR_MESSAGE % sender)
 
-def _pr(action, issue_number, sender, config, draft):
+def is_envoy_repo(repo_owner, repo_name):
+  return (
+    repo_owner == "envoyproxy"
+    and repo_name == "envoy")
+
+def _pr(action, issue_number, sender, config, draft, repo_owner, repo_name):
+  if not is_envoy_repo(repo_owner, repo_name):
+    return
   if should_message_newcontributor(action, issue_number):
     send_newcontributor_message(sender)
   if action == 'opened' and draft: