diff --git a/reference/legacy.yaml b/reference/legacy.yaml
index 441ca53c2..d8070ff09 100644
--- a/reference/legacy.yaml
+++ b/reference/legacy.yaml
@@ -285,7 +285,6 @@ horizon:
 
 Infrastructure:
   irc-channel: openstack-infra
-  partial: yes
   deliverables:
     puppet-apps_site:
       retired-on: 2017-12-10
diff --git a/reference/projects.yaml b/reference/projects.yaml
index 05e62156d..0ca0d6821 100644
--- a/reference/projects.yaml
+++ b/reference/projects.yaml
@@ -710,61 +710,7 @@ I18n:
       expires-in: January 2020
       comment: yusuke1219 (ja)
   liaisons: []
-Infrastructure:
-  ptl:
-    name: APPOINTMENT NEEDED
-    irc: No nick supplied
-    email: example@example.org
-  irc-channel: openstack-infra
-  mission: >
-    Develop and maintain, in conjunction with the OpenDev project, the
-    tooling and infrastructure needed to support the development process
-    and general operation of the OpenStack project.
-  url: https://docs.openstack.org/infra/system-config/
-  deliverables:
-    bugdaystats:
-      repos:
-        - openstack/bugdaystats
-    devstack-gate:
-      repos:
-        - openstack/devstack-gate
-    diskimage-builder:
-      repos:
-        - openstack/diskimage-builder
-    logstash-filters:
-      repos:
-        - openstack/logstash-filters
-    nose-html-output:
-      repos:
-        - openstack/nose-html-output
-    openstack-nose:
-      repos:
-        - openstack/openstack-nose
-    openstack-planet:
-      repos:
-        - openstack/openstack-planet
-    openstack-zuul-jobs:
-      repos:
-        - openstack/openstack-zuul-jobs
-    openstack-zuul-roles:
-      repos:
-        - openstack/openstack-zuul-roles
-    os-loganalyze:
-      repos:
-        - openstack/os-loganalyze
-    project-config:
-      repos:
-        - openstack/project-config
-    ptgbot:
-      repos:
-        - openstack/ptgbot
-    reviewday:
-      repos:
-        - openstack/reviewday
-    reviewstats:
-      repos:
-        - openstack/reviewstats
-  liaisons: []
+
 ironic:
   ptl:
     name: Julia Kreger
diff --git a/reference/sigs-repos.yaml b/reference/sigs-repos.yaml
index 93d0a796d..1ac6b8e72 100644
--- a/reference/sigs-repos.yaml
+++ b/reference/sigs-repos.yaml
@@ -38,3 +38,18 @@ Multi-Arch:
 Automation:
   - repo: openstack/auto-scaling-sig
   - repo: openstack/self-healing-sig
+Testing and Collaboration Tools:
+  - repo: openstack/bugdaystats
+  - repo: openstack/devstack-gate
+  - repo: openstack/diskimage-builder
+  - repo: openstack/logstash-filters
+  - repo: openstack/nose-html-output
+  - repo: openstack/openstack-nose
+  - repo: openstack/openstack-planet
+  - repo: openstack/openstack-zuul-jobs
+  - repo: openstack/openstack-zuul-roles
+  - repo: openstack/os-loganalyze
+  - repo: openstack/project-config
+  - repo: openstack/ptgbot
+  - repo: openstack/reviewday
+  - repo: openstack/reviewstats
diff --git a/reference/upstream-investment-opportunities/2018/community-infrastructure-sysadmins.rst b/reference/upstream-investment-opportunities/2018/community-infrastructure-sysadmins.rst
index 255046480..8d45805f0 100644
--- a/reference/upstream-investment-opportunities/2018/community-infrastructure-sysadmins.rst
+++ b/reference/upstream-investment-opportunities/2018/community-infrastructure-sysadmins.rst
@@ -4,7 +4,7 @@ Community Infrastructure Sysadmins
 Description
 -----------
 
-The :ref:`project-infrastructure` team is responsible for designing,
+The Infrastructure team is responsible for designing,
 building and maintaining the systems that are used in the day to day
 operation of the OpenStack project as a whole; this includes
 development, testing, and collaboration tools. All of the software
diff --git a/reference/upstream-investment-opportunities/2019/community-infrastructure-sysadmins.rst b/reference/upstream-investment-opportunities/2019/community-infrastructure-sysadmins.rst
index 78779ba7b..4c31f832e 100644
--- a/reference/upstream-investment-opportunities/2019/community-infrastructure-sysadmins.rst
+++ b/reference/upstream-investment-opportunities/2019/community-infrastructure-sysadmins.rst
@@ -7,7 +7,7 @@ Summary
 
 The OpenStack community is seeking developers and system
 administrators with a background in maintaining Unix/Linux servers and
-free software to join the :ref:`project-infrastructure` team.  This
+free software to join the Infrastructure team.  This
 team is responsible for designing, building and maintaining the
 systems that are used in the day to day operation of the OpenStack
 project as a whole.