diff --git a/www/templates/contributor_guides.tmpl b/www/templates/contributor_guides.tmpl
index 9ddd3a65db..96fb5a46d5 100644
--- a/www/templates/contributor_guides.tmpl
+++ b/www/templates/contributor_guides.tmpl
@@ -12,7 +12,7 @@
                         <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 Open Infrastructure Foundation</a>
+                        <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>
diff --git a/www/templates/header.tmpl b/www/templates/header.tmpl
index 529ced1324..2a499058b8 100644
--- a/www/templates/header.tmpl
+++ b/www/templates/header.tmpl
@@ -61,7 +61,7 @@ data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
                             <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/foundation/companies/">Supporting Companies</a></li>
                             <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/community/jobs/">Jobs</a></li>
                             <li role="presentation" class="divider"></li>
-                            <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/join/">Join The Community</a></li>
+                            <li role="presentation"><a role="menuitem" tabindex="-1" href="https://openinfra.dev/join/">Join The Community</a></li>
                         </ul>
                     </li>
                     <li>
@@ -100,9 +100,8 @@ data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
                 <li class="join-nav-section">
                     <a href="#" id="dropdownMenuJoin">Join <i class="fa fa-caret-down"></i></a>
                     <ul class="dropdown-menu dropdown-hover" role="menu" aria-labelledby="dropdownMenuJoin" style="display: none;">
-                        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/join/register/?membership-type=foundation">Sign up for Foundation Membership</a></li>
-                        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/join/#sponsor">Sponsor the Foundation</a></li>
-                        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://www.openstack.org/foundation/">More about the Foundation</a></li>
+                        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://openinfra.dev/join">Sign up for Foundation Membership</a></li>
+                        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://openinfra.dev/">More about the Foundation</a></li>
                     </ul>
                 </li>
                 <li>