diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 2b75a68dda..0c99dc69dc 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -3,8 +3,8 @@ How to contribute
 =================
 
 Our community welcomes all people interested in open source cloud
-computing, and encourages you to join the `OpenStack Foundation
-<https://www.openstack.org/join>`_.
+computing, and encourages you to join the `Open Infrastructure Foundation
+<https://openinfra.dev/join>`_.
 
 The best way to get involved with the community is to talk with others
 online or at a meet up and offer contributions through our processes,
diff --git a/doc/common/glossary.rst b/doc/common/glossary.rst
index 53b07ea053..7a8e7db24a 100644
--- a/doc/common/glossary.rst
+++ b/doc/common/glossary.rst
@@ -827,9 +827,9 @@ C
    community project
 
       A project that is not officially endorsed by the OpenStack
-      Foundation. If the project is successful enough, it might be elevated
-      to an incubated project and then to a core project, or it might be
-      merged with the main code trunk.
+      Technical Commitee. If the project is successful enough, it
+      might be elevated to an incubated project and then to a core
+      project, or it might be merged with the main code trunk.
 
    compression
 
diff --git a/doc/doc-contrib-guide/source/quickstart/first-timers.rst b/doc/doc-contrib-guide/source/quickstart/first-timers.rst
index 2b8a542ebe..eddcec6dc2 100644
--- a/doc/doc-contrib-guide/source/quickstart/first-timers.rst
+++ b/doc/doc-contrib-guide/source/quickstart/first-timers.rst
@@ -366,7 +366,6 @@ instead:
 .. _`Sign the appropriate Individual Contributor License Agreement`: https://docs.opendev.org/opendev/infra-manual/latest/developers.html#sign-the-appropriate-individual-contributor-license-agreement
 .. _`Installing git-review`: https://docs.opendev.org/opendev/infra-manual/latest/developers.html#install-the-git-review-utility
 .. _`OpenStack Documentation Bug Team`: https://launchpad.net/~openstack-doc-bugs
-.. _`OpenStack Foundation`: https://www.openstack.org/join
 .. _`Development Workflow`: https://docs.opendev.org/opendev/infra-manual/latest/developers.html#development-workflow
 .. _`git`: http://msysgit.github.io
 .. _`curl`: http://curl.haxx.se/
diff --git a/www/ocata/index.html b/www/ocata/index.html
index 603287d00d..bbfd2b1505 100644
--- a/www/ocata/index.html
+++ b/www/ocata/index.html
@@ -85,8 +85,8 @@
         <p>Development and infrastructure documentation</p>
         <a href="/i18n/">OpenStack I18n Guide</a>
         <p>Internationalization workflow and conventions</p>
-        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
-        <p>How to join the OpenStack Foundation</p>
+        <a href="https://openinfra.dev/join/">Join the Open Infrastructure Foundation</a>
+        <p>How to join the Open Infrastructure Foundation</p>
         <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
         <p>Influence the future of OpenStack</p>
       </div>
diff --git a/www/pike/index.html b/www/pike/index.html
index c7b11841c9..128994027c 100644
--- a/www/pike/index.html
+++ b/www/pike/index.html
@@ -83,8 +83,8 @@
         <p>Development and infrastructure documentation</p>
         <a href="/i18n/">OpenStack I18n Guide</a>
         <p>Internationalization workflow and conventions</p>
-        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
-        <p>How to join the OpenStack Foundation</p>
+        <a href="https://openinfra.dev/join/">Join the Open Infrastructure Foundation</a>
+        <p>How to join the Open Infrastructure Foundation</p>
         <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
         <p>Influence the future of OpenStack</p>
       </div>
diff --git a/www/queens/index.html b/www/queens/index.html
index c7b11841c9..128994027c 100644
--- a/www/queens/index.html
+++ b/www/queens/index.html
@@ -83,8 +83,8 @@
         <p>Development and infrastructure documentation</p>
         <a href="/i18n/">OpenStack I18n Guide</a>
         <p>Internationalization workflow and conventions</p>
-        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
-        <p>How to join the OpenStack Foundation</p>
+        <a href="https://openinfra.dev/join/">Join the Open Infrastructure Foundation</a>
+        <p>How to join the Open Infrastructure Foundation</p>
         <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
         <p>Influence the future of OpenStack</p>
       </div>
diff --git a/www/rocky/index.html b/www/rocky/index.html
index 01834417ac..518f544cb4 100644
--- a/www/rocky/index.html
+++ b/www/rocky/index.html
@@ -83,8 +83,8 @@
         <p>Development and infrastructure documentation</p>
         <a href="/i18n/">OpenStack I18n Guide</a>
         <p>Internationalization workflow and conventions</p>
-        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
-        <p>How to join the OpenStack Foundation</p>
+        <a href="https://openinfra.dev/join/">Join the Open Infrastructure Foundation</a>
+        <p>How to join the Open Infrastructure Foundation</p>
         <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
         <p>Influence the future of OpenStack</p>
       </div>
diff --git a/www/stein/index.html b/www/stein/index.html
index 5127ec4eaa..4db7d5a3bd 100644
--- a/www/stein/index.html
+++ b/www/stein/index.html
@@ -89,8 +89,8 @@
         <p>Development and infrastructure documentation</p>
         <a href="/i18n/">OpenStack I18n Guide</a>
         <p>Internationalization workflow and conventions</p>
-        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
-        <p>How to join the OpenStack Foundation</p>
+        <a href="https://openinfra.dev/join/">Join the Open Infrastructure Foundation</a>
+        <p>How to join the Open Infrastructure Foundation</p>
         <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
         <p>Influence the future of OpenStack</p>
       </div>
diff --git a/www/templates/contributor_guides.tmpl b/www/templates/contributor_guides.tmpl
index 590fd2cc4a..9ddd3a65db 100644
--- a/www/templates/contributor_guides.tmpl
+++ b/www/templates/contributor_guides.tmpl
@@ -12,8 +12,8 @@
                         <p>Development and infrastructure documentation</p>
                         <a href="/i18n/">OpenStack I18n Guide</a>
                         <p>Internationalization workflow and conventions</p>
-                        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
-                        <p>How to join the OpenStack Foundation</p>
+                        <a href="https://www.openstack.org/join/">Join the Open Infrastructure Foundation</a>
+                        <p>How to join the Open Infrastructure Foundation</p>
                         <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
                         <p>Influence the future of OpenStack</p>
                     </div>
diff --git a/www/templates/header.tmpl b/www/templates/header.tmpl
index c431d68b71..529ced1324 100644
--- a/www/templates/header.tmpl
+++ b/www/templates/header.tmpl
@@ -53,7 +53,7 @@ data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
                         <a href="https://www.openstack.org/community/" class="drop" id="dropdownMenuCommunity">Community <i class="fa fa-caret-down"></i></a><i class="mobile-expand"></i>
                         <ul class="dropdown-menu dropdown-hover" role="menu" aria-labelledby="dropdownMenuCommunity">
                             <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/community/">Welcome! Start Here</a></li>
-                            <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/foundation/">OpenStack Foundation</a></li>
+                            <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/foundation/">Open Infrastructure Foundation</a></li>
                             <li role="presentation"><a role="menuitem" tabindex="-1" href="https://wiki.openstack.org">OpenStack Wiki</a></li>
                             <li role="presentation"><a role="menuitem" tabindex="-1" href="https://groups.openstack.org">User Groups</a></li>
                             <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/community/speakers/">Speakers Bureau</a></li>
diff --git a/www/train/index.html b/www/train/index.html
index 5127ec4eaa..4db7d5a3bd 100644
--- a/www/train/index.html
+++ b/www/train/index.html
@@ -89,8 +89,8 @@
         <p>Development and infrastructure documentation</p>
         <a href="/i18n/">OpenStack I18n Guide</a>
         <p>Internationalization workflow and conventions</p>
-        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
-        <p>How to join the OpenStack Foundation</p>
+        <a href="https://openinfra.dev/join/">Join the Open Infrastructure Foundation</a>
+        <p>How to join the Open Infrastructure Foundation</p>
         <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
         <p>Influence the future of OpenStack</p>
       </div>
diff --git a/www/ussuri/index.html b/www/ussuri/index.html
index 5127ec4eaa..4db7d5a3bd 100644
--- a/www/ussuri/index.html
+++ b/www/ussuri/index.html
@@ -89,8 +89,8 @@
         <p>Development and infrastructure documentation</p>
         <a href="/i18n/">OpenStack I18n Guide</a>
         <p>Internationalization workflow and conventions</p>
-        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
-        <p>How to join the OpenStack Foundation</p>
+        <a href="https://openinfra.dev/join/">Join the Open Infrastructure Foundation</a>
+        <p>How to join the Open Infrastructure Foundation</p>
         <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
         <p>Influence the future of OpenStack</p>
       </div>
diff --git a/www/victoria/index.html b/www/victoria/index.html
index 5127ec4eaa..4db7d5a3bd 100644
--- a/www/victoria/index.html
+++ b/www/victoria/index.html
@@ -89,8 +89,8 @@
         <p>Development and infrastructure documentation</p>
         <a href="/i18n/">OpenStack I18n Guide</a>
         <p>Internationalization workflow and conventions</p>
-        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
-        <p>How to join the OpenStack Foundation</p>
+        <a href="https://openinfra.dev/join/">Join the Open Infrastructure Foundation</a>
+        <p>How to join the Open Infrastructure Foundation</p>
         <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
         <p>Influence the future of OpenStack</p>
       </div>
diff --git a/www/wallaby/index.html b/www/wallaby/index.html
index 5127ec4eaa..4db7d5a3bd 100644
--- a/www/wallaby/index.html
+++ b/www/wallaby/index.html
@@ -89,8 +89,8 @@
         <p>Development and infrastructure documentation</p>
         <a href="/i18n/">OpenStack I18n Guide</a>
         <p>Internationalization workflow and conventions</p>
-        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
-        <p>How to join the OpenStack Foundation</p>
+        <a href="https://openinfra.dev/join/">Join the Open Infrastructure Foundation</a>
+        <p>How to join the Open Infrastructure Foundation</p>
         <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
         <p>Influence the future of OpenStack</p>
       </div>