diff --git a/config/config.yaml b/config/config.yaml
index 5b86a9df..244ff153 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -28,43 +28,31 @@ branch-protection:
   allow_disabled_policies: true
   orgs:
     cert-manager:
+      protect: true
+      required_status_checks:
+        contexts:
+        - dco
       repos:
+        cert-manager:
+          required_status_checks:
+            contexts:
+            - pull-cert-manager-bazel
+            - pull-cert-manager-deps
+            - pull-cert-manager-chart
+            - pull-cert-manager-e2e-v1-23
         website:
-          protect: true
           required_status_checks:
             contexts:
-            - dco
             - pull-cert-manager-website-verify
         webhook-example:
-          protect: true
           required_status_checks:
             contexts:
-            - dco
             - pull-cert-manager-webhook-example-verify
         trust:
-          protect: true
           required_status_checks:
             contexts:
-            - dco
             - pull-cert-manager-trust-verify
             - pull-cert-manager-trust-smoke
-
-    jetstack:
-      # TODO: enforce dco check org-wide
-      # protect: true
-      # required_status_checks:
-      #   contexts:
-      #   - dco
-      repos:
-        cert-manager:
-          protect: true
-          required_status_checks:
-            contexts:
-            - dco
-            - pull-cert-manager-bazel
-            - pull-cert-manager-deps
-            - pull-cert-manager-chart
-            - pull-cert-manager-e2e-v1-23
 sinker:
   resync_period: 1h
   max_prowjob_age: 48h
@@ -259,11 +247,14 @@ tide:
     - do-not-merge/invalid-owners-file
     - do-not-merge/work-in-progress
     - needs-rebase
-  # Repositories that enable the release-notes plugin (except cert-manager)
+  # cert-manager/cert-manager is the only repo in the cert-manager org which
+  # currently uses the release-note plugin so we duplicate the organization
+  # query parameters here and add the do-not-merge/release-note-label-needed to
+  # the list of labels which block a PR from being merged.
+  # TODO: Find out whether the org-wide defaults are added to the repo specific
+  # query fields here, in which case the fields can be de-duplicated.
   - repos:
-    - jetstack/tarmak
-    - jetstack/kube-oidc-proxy
-    - jetstack/version-checker
+    - cert-manager/cert-manager
     labels:
     - lgtm
     - approved
@@ -274,12 +265,15 @@ tide:
     - do-not-merge/cherry-pick-not-approved
     - do-not-merge/hold
     - do-not-merge/invalid-owners-file
-    - do-not-merge/release-note-label-needed
     - do-not-merge/work-in-progress
     - needs-rebase
-  # Maintain separate testing configuration as PRs in this repo don't need release note
+    - needs-kind
+    - do-not-merge/release-note-label-needed
+  # Repositories that enable the release-notes plugin (except cert-manager)
   - repos:
-    - jetstack/testing
+    - jetstack/tarmak
+    - jetstack/kube-oidc-proxy
+    - jetstack/version-checker
     labels:
     - lgtm
     - approved
@@ -287,14 +281,15 @@ tide:
     missingLabels:
     - do-not-merge
     - do-not-merge/blocked-paths
+    - do-not-merge/cherry-pick-not-approved
     - do-not-merge/hold
     - do-not-merge/invalid-owners-file
-    - do-not-merge/cherry-pick-not-approved
+    - do-not-merge/release-note-label-needed
     - do-not-merge/work-in-progress
     - needs-rebase
-  # Maintain separate cert-manager configuration to make it easy to enable code freeze
+  # Maintain separate testing configuration as PRs in this repo don't need release note
   - repos:
-    - jetstack/cert-manager
+    - jetstack/testing
     labels:
     - lgtm
     - approved
@@ -305,10 +300,8 @@ tide:
     - do-not-merge/cherry-pick-not-approved
     - do-not-merge/hold
     - do-not-merge/invalid-owners-file
-    - do-not-merge/release-note-label-needed
     - do-not-merge/work-in-progress
     - needs-rebase
-    - needs-kind
   merge_method:
     jetstack/preflight: squash
 
diff --git a/config/jobs/cert-manager/cert-manager-periodics.yaml b/config/jobs/cert-manager/cert-manager/cert-manager-periodics.yaml
similarity index 97%
rename from config/jobs/cert-manager/cert-manager-periodics.yaml
rename to config/jobs/cert-manager/cert-manager/cert-manager-periodics.yaml
index 383f5492..396577f4 100644
--- a/config/jobs/cert-manager/cert-manager-periodics.yaml
+++ b/config/jobs/cert-manager/cert-manager/cert-manager-periodics.yaml
@@ -5,7 +5,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: master
   labels:
@@ -42,7 +42,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: master
   annotations:
@@ -100,7 +100,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: master
   annotations:
@@ -158,7 +158,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: master
   annotations:
@@ -216,7 +216,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: master
   annotations:
@@ -274,7 +274,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: master
   annotations:
@@ -332,7 +332,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: master
   annotations:
@@ -393,7 +393,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: master
   annotations:
@@ -453,7 +453,7 @@ periodics:
   decorate: true
   # extra refs specify what repo should be cloned
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: master
   annotations:
@@ -514,7 +514,7 @@ periodics:
 #     - org: cert-manager
 #       repo: test-infra
 #       base_ref: main
-#     - org: jetstack
+#     - org: cert-manager
 #       repo: cert-manager
 #       base_ref: master
 #   annotations:
@@ -533,7 +533,7 @@ periodics:
 #     containers:
 #     - image: eu.gcr.io/jetstack-build-infra-images/golang-aws@sha256:1f330e4c9552ca383d157067b73fb0e090b64b0777939fd59e58b60e06020d66
 #       args:
-#       - bash 
+#       - bash
 #       - -c
 #       - |
 #         set -euo && \
@@ -547,7 +547,7 @@ periodics:
 #         pwd && \
 #         cd /home && \
 #         ls && \
-#         cd /home/prow/go/src/github.com/jetstack/cert-manager && \
+#         cd /home/prow/go/src/github.com/cert-manager/cert-manager && \
 #         ./devel/run-e2e.sh --acme-server-url=https://acme-staging-v02.api.letsencrypt.org/directory --ingress-controller-domain=aws.e2e-tests.cert-manager.io --testing-acme-email=cert-manager-dev-alerts@googlegroups.com --kubernetes-config=/home/prow/go/src/github.com/cert-manager/test-infra/aws/kubeconfig_cert-manager-cluster || true && \
 #         cd /home/prow/go/src/github.com/cert-manager/test-infra/aws && \
 #         terraform destroy -auto-approve;
diff --git a/config/jobs/cert-manager/cert-manager-presubmits.yaml b/config/jobs/cert-manager/cert-manager/cert-manager-presubmits.yaml
similarity index 99%
rename from config/jobs/cert-manager/cert-manager-presubmits.yaml
rename to config/jobs/cert-manager/cert-manager/cert-manager-presubmits.yaml
index 6908b0eb..e8444ef2 100644
--- a/config/jobs/cert-manager/cert-manager-presubmits.yaml
+++ b/config/jobs/cert-manager/cert-manager/cert-manager-presubmits.yaml
@@ -1,5 +1,5 @@
 presubmits:
-  jetstack/cert-manager:
+  cert-manager/cert-manager:
 
   - name: pull-cert-manager-bazel
     always_run: true
@@ -613,7 +613,7 @@ presubmits:
             cpu: 3500m
             memory: 12Gi
         env:
-        # Used by https://github.com/jetstack/cert-manager/blob/master/devel/cluster/create-kind.sh
+        # Used by https://github.com/cert-manager/cert-manager/blob/master/devel/cluster/create-kind.sh
         - name: K8S_VERSION
           value: "1.23"
         securityContext:
@@ -645,7 +645,7 @@ presubmits:
   #
   #  /test pull-cert-manager-issuers-venafi-tpp
   #
-  # See https://github.com/jetstack/cert-manager/issues/3555
+  # See https://github.com/cert-manager/cert-manager/issues/3555
   #
   - name: pull-cert-manager-issuers-venafi-tpp
     always_run: false
diff --git a/config/jobs/cert-manager/release-next/cert-manager-release-next-periodics.yaml b/config/jobs/cert-manager/cert-manager/release-next/cert-manager-release-next-periodics.yaml
similarity index 98%
rename from config/jobs/cert-manager/release-next/cert-manager-release-next-periodics.yaml
rename to config/jobs/cert-manager/cert-manager/release-next/cert-manager-release-next-periodics.yaml
index 292d645b..404c4faa 100644
--- a/config/jobs/cert-manager/release-next/cert-manager-release-next-periodics.yaml
+++ b/config/jobs/cert-manager/cert-manager/release-next/cert-manager-release-next-periodics.yaml
@@ -8,7 +8,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.8
   labels:
@@ -43,7 +43,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.8
   annotations:
@@ -101,7 +101,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.8
   annotations:
@@ -159,7 +159,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.8
   annotations:
@@ -217,7 +217,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.8
   annotations:
@@ -275,7 +275,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.8
   annotations:
@@ -333,7 +333,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.8
   annotations:
@@ -393,7 +393,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.8
   annotations:
@@ -452,7 +452,7 @@ periodics:
   decorate: true
   # extra refs specify what repo should be cloned
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.8
   annotations:
diff --git a/config/jobs/cert-manager/release-previous/README.md b/config/jobs/cert-manager/cert-manager/release-previous/README.md
similarity index 100%
rename from config/jobs/cert-manager/release-previous/README.md
rename to config/jobs/cert-manager/cert-manager/release-previous/README.md
diff --git a/config/jobs/cert-manager/release-previous/cert-manager-release-previous-periodics.yaml b/config/jobs/cert-manager/cert-manager/release-previous/cert-manager-release-previous-periodics.yaml
similarity index 98%
rename from config/jobs/cert-manager/release-previous/cert-manager-release-previous-periodics.yaml
rename to config/jobs/cert-manager/cert-manager/release-previous/cert-manager-release-previous-periodics.yaml
index ec992ec4..b486750d 100644
--- a/config/jobs/cert-manager/release-previous/cert-manager-release-previous-periodics.yaml
+++ b/config/jobs/cert-manager/cert-manager/release-previous/cert-manager-release-previous-periodics.yaml
@@ -5,7 +5,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.7
   labels:
@@ -43,7 +43,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.7
   annotations:
@@ -101,7 +101,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.7
   annotations:
@@ -159,7 +159,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.7
   annotations:
@@ -217,7 +217,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.7
   annotations:
@@ -275,7 +275,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.7
   annotations:
@@ -333,7 +333,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.7
   annotations:
@@ -393,7 +393,7 @@ periodics:
   agent: kubernetes
   decorate: true
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.7
   annotations:
@@ -453,7 +453,7 @@ periodics:
   decorate: true
   # extra refs specify what repo should be cloned
   extra_refs:
-  - org: jetstack
+  - org: cert-manager
     repo: cert-manager
     base_ref: release-1.7
   annotations:
diff --git a/config/jobs/cert-manager/release-previous/cert-manager-release-previous-presubmits.yaml b/config/jobs/cert-manager/cert-manager/release-previous/cert-manager-release-previous-presubmits.yaml
similarity index 99%
rename from config/jobs/cert-manager/release-previous/cert-manager-release-previous-presubmits.yaml
rename to config/jobs/cert-manager/cert-manager/release-previous/cert-manager-release-previous-presubmits.yaml
index 0211934f..4853bb2d 100644
--- a/config/jobs/cert-manager/release-previous/cert-manager-release-previous-presubmits.yaml
+++ b/config/jobs/cert-manager/cert-manager/release-previous/cert-manager-release-previous-presubmits.yaml
@@ -1,5 +1,5 @@
 presubmits:
-  jetstack/cert-manager:
+  cert-manager/cert-manager:
 
   - name: pull-cert-manager-bazel
     always_run: true
diff --git a/config/jobs/testing/testing-periodics.yaml b/config/jobs/testing/testing-periodics.yaml
index 4b23a1bf..44007124 100644
--- a/config/jobs/testing/testing-periodics.yaml
+++ b/config/jobs/testing/testing-periodics.yaml
@@ -28,7 +28,7 @@ periodics:
         -label:needs-ok-to-test
         -label:"cncf-cla: no"
         repo:jetstack/navigator
-        repo:jetstack/cert-manager
+        repo:cert-manager/cert-manager
       - --token=/etc/token/bot-github-token
       - |-
         --comment=/retest
@@ -61,7 +61,7 @@ periodics:
       args:
       - /app/robots/commenter/app.binary
       - |-
-        --query=repo:jetstack/cert-manager
+        --query=repo:cert-manager/cert-manager
         -label:lifecycle/frozen
         label:lifecycle/rotten
       - --updated=720h
@@ -97,7 +97,7 @@ periodics:
       args:
       - /app/robots/commenter/app.binary
       - |-
-        --query=repo:jetstack/cert-manager
+        --query=repo:cert-manager/cert-manager
         -label:lifecycle/frozen
         label:lifecycle/stale
         -label:lifecycle/rotten
@@ -136,7 +136,7 @@ periodics:
       args:
       - /app/robots/commenter/app.binary
       - |-
-        --query=repo:jetstack/cert-manager
+        --query=repo:cert-manager/cert-manager
         -label:lifecycle/frozen
         -label:lifecycle/stale
         -label:lifecycle/rotten
diff --git a/config/labels.yaml b/config/labels.yaml
index 39308be7..4ea079b7 100644
--- a/config/labels.yaml
+++ b/config/labels.yaml
@@ -7,7 +7,7 @@
 #     addedBy: human? prow plugin? other?
 ---
 repos:
-  jetstack/cert-manager:
+  cert-manager/cert-manager:
     labels:
     - color: 0052cc
       description: Indicates a PR directly modifies the 'pkg/apis' directory
diff --git a/config/plugins.yaml b/config/plugins.yaml
index d8f6651a..fce77ccd 100644
--- a/config/plugins.yaml
+++ b/config/plugins.yaml
@@ -22,7 +22,7 @@ triggers:
   - jetstack/vault-plugin-auth-templated-aws
   only_org_members: true
 - repos:
-  - jetstack/cert-manager
+  - cert-manager/cert-manager
   - cert-manager/website
   - cert-manager/trust
   only_org_members: true
@@ -53,7 +53,7 @@ repo_milestone:
   # You can curl the following endpoint in order to determine the github ID of your team
   # responsible for maintaining the milestones:
   # curl -H "Authorization: token <token>" https://api.github.com/orgs/<org-name>/teams
-  jetstack/cert-manager:
+  cert-manager/cert-manager:
     # https://github.com/orgs/cert-manager/teams/milestone-maintainers
     maintainers_id: 2805308
     maintainers_team: milestone-maintainers
@@ -67,7 +67,7 @@ repo_milestone:
     maintainers_team: milestone-maintainers
 
 milestone_applier:
-  jetstack/cert-manager:
+  cert-manager/cert-manager:
     master: v1.8
     release-1.7: v1.7
     release-1.6: v1.6
@@ -124,7 +124,7 @@ config_updater:
 
 require_matching_label:
 - missing_label: needs-kind
-  org: jetstack
+  org: cert-manager
   repo: cert-manager
   prs: true
   regexp: ^kind/
@@ -183,17 +183,9 @@ plugins:
     - wip
     - yuks
 
-  jetstack/cert-manager:
+  cert-manager/cert-manager:
     plugins:
-    - approve
-    - dco
-    - owners-label
     - release-note
-    - verify-owners
-
-  jetstack/cert-manager-webhook-example:
-    plugins:
-    - dco
 
   jetstack/tarmak:
     plugins:
diff --git a/legacy/README.md b/legacy/README.md
index 6614c055..3984dccc 100644
--- a/legacy/README.md
+++ b/legacy/README.md
@@ -17,7 +17,7 @@ You can run jobs using the bootstrap.py script like so:
 ```
 $ bootstrap/bootstrap.py \
     --job=pull-cert-manager-verify \
-    --repo=github.com/jetstack/cert-manager=master \
+    --repo=github.com/cert-manager/cert-manager=master \
     --scenario=execute \
     -- \
     make verify
diff --git a/prow/cluster/labelsync_cronjob.yaml b/prow/cluster/labelsync_cronjob.yaml
index ff78b2db..aa58f004 100644
--- a/prow/cluster/labelsync_cronjob.yaml
+++ b/prow/cluster/labelsync_cronjob.yaml
@@ -33,7 +33,7 @@ spec:
               - --config=/etc/config/labels.yaml
               - --confirm=true
               # TODO: enable label_sync across the whole org
-              - --only=jetstack/cert-manager,jetstack/testing,jetstack/kube-oidc-proxy,jetstack/tarmak,jetstack/terraform-google-gke-cluster,cert-manager/release,cert-manager/webhook-example,cert-manager/website,jetstack/cert-manager-nginx-plus-lab,cert-manager/csi-lib,cert-manager/approver-policy,cert-manager/csi-driver,cert-manager/istio-csr,cert-manager/csi-driver-spiffe,cert-manager/infrastructure,cert-manager/approver-policy-rego
+              - --only=cert-manager/cert-manager,jetstack/testing,jetstack/kube-oidc-proxy,jetstack/tarmak,jetstack/terraform-google-gke-cluster,cert-manager/release,cert-manager/webhook-example,cert-manager/website,jetstack/cert-manager-nginx-plus-lab,cert-manager/csi-lib,cert-manager/approver-policy,cert-manager/csi-driver,cert-manager/istio-csr,cert-manager/csi-driver-spiffe,cert-manager/infrastructure,cert-manager/approver-policy-rego
               - --token=/etc/github/oauth
               volumeMounts:
               - name: oauth
diff --git a/triage_party/triageparty_configmap.yaml b/triage_party/triageparty_configmap.yaml
index 2f6e449e..0c7e218b 100644
--- a/triage_party/triageparty_configmap.yaml
+++ b/triage_party/triageparty_configmap.yaml
@@ -23,7 +23,7 @@ data:
       name: generic
       min_similarity: 0.65
       repos:
-        - https://github.com/jetstack/cert-manager
+        - https://github.com/cert-manager/cert-manager
         - https://github.com/cert-manager/website
         - https://github.com/cert-manager/release
 
@@ -465,7 +465,7 @@ data:
         resolution: Close or deprioritize
         filters:
           - label: "priority/critical-urgent"
-      
+
       # Soon
       soon-bugs:
         name: "bugs labelled important/soon"