diff --git a/org/cloudfoundry.yml b/org/cloudfoundry.yml
index 2676a2c7..cabf217c 100644
--- a/org/cloudfoundry.yml
+++ b/org/cloudfoundry.yml
@@ -952,6 +952,11 @@ orgs:
         description: CredHub CLI provides a command line interface to interact with
           CredHub servers
         has_projects: true
+      credhub-oss-ci:
+        default_branch: main
+        has_projects: true
+        has_wiki: false
+        private: true
       credhub-perf-release:
         has_projects: true
       csb-brokerpak-aws:
@@ -2615,6 +2620,7 @@ orgs:
         privacy: closed
         repos:
           uaa-ci: admin
+          credhub-oss-ci: admin
       temp-prometheus-exporter-admins:
         description: "Temporary team for managing cf/ firehose exporter secrets until we have a permanent plan."
         maintainers:
diff --git a/toc/working-groups/foundational-infrastructure.md b/toc/working-groups/foundational-infrastructure.md
index a8d96290..449aca65 100644
--- a/toc/working-groups/foundational-infrastructure.md
+++ b/toc/working-groups/foundational-infrastructure.md
@@ -74,6 +74,7 @@ areas:
   - cloudfoundry/credhub-api-site
   - cloudfoundry/credhub-cli
   - cloudfoundry/credhub-ci-locks
+  - cloudfoundry/credhub-oss-ci
   - cloudfoundry/credhub-perf-release
   - cloudfoundry/secure-credentials-broker
 - name: Disaster Recovery (BBR)