diff --git a/org/org_management.py b/org/org_management.py
index fcab1637c..32d004695 100644
--- a/org/org_management.py
+++ b/org/org_management.py
@@ -513,8 +513,8 @@ def _kebab_case(name: str) -> str:
     generator = OrgGenerator()
     generator.load_from_project()
     if not generator.validate_repo_ownership():
-        # TODO: fail on error
-        print("ERROR: Repository ownership is invalid.")
+        print("ERROR: Repository ownership is invalid. Refer to RFC-0007.")
+        exit(1)
     generator.generate_org_members()
     generator.generate_teams()
     generator.generate_branch_protection()
diff --git a/org/test_org_management.py b/org/test_org_management.py
index 20d511b52..162f0c1be 100644
--- a/org/test_org_management.py
+++ b/org/test_org_management.py
@@ -493,9 +493,7 @@ def test_cf_org(self):
         # branch protection
         self.assertIn("cloudfoundry", o.branch_protection["branch-protection"]["orgs"])
 
-        # ERROR: Repository cloudfoundry/app-runtime-interfaces-infrastructure is owned by multiple WGs:
-        # App Runtime Interfaces, Documentation
-        o.validate_repo_ownership()  # TODO: assertTrue when repo ownership is cleaned up
+        self.assertTrue(o.validate_repo_ownership())
 
         o.generate_org_members()
         members = o.org_cfg["orgs"]["cloudfoundry"]["members"]
@@ -519,4 +517,4 @@ def test_cf_org(self):
 
         o.generate_branch_protection()
         bp_repos = o.branch_protection["branch-protection"]["orgs"]["cloudfoundry"]["repos"]
-        self.assertGreaterEqual(len(bp_repos), 1)  # TODO update after some WGs opted in
+        self.assertGreaterEqual(len(bp_repos), 3)