diff --git a/openstackdocstheme/theme/openstackdocs/footer.html b/openstackdocstheme/theme/openstackdocs/footer.html
index 43cb08a2..53e12a76 100644
--- a/openstackdocstheme/theme/openstackdocs/footer.html
+++ b/openstackdocstheme/theme/openstackdocs/footer.html
@@ -4,9 +4,8 @@
       <div class="col-lg-2 col-sm-2">
         <h3>OpenStack</h3>
         <ul>
-          <li><a href="https://openstack.org/projects/">Projects</a></li>
-          <li><a href="https://www.openstack.org/software/security/">OpenStack Security</a></li>
-          <li><a href="https://openstack.org/projects/openstack-faq/">Common Questions</a></li>
+          <li><a href="https://www.openstack.org/software/project-navigator/">Projects</a></li>
+          <li><a href="https://security.openstack.org/">OpenStack Security</a></li>
           <li><a href="https://openstack.org/blog/">Blog</a></li>g
           <li><a href="https://openstack.org/news/">News</a></li>
         </ul>
@@ -14,10 +13,10 @@
       <div class="col-lg-2 col-sm-2">
         <h3>Community</h3>
         <ul>
-          <li><a href="https://openstack.org/community/">User Groups</a></li>
+          <li><a href="https://www.meetup.com/pro/openinfradev/">User Groups</a></li>
           <li><a href="https://openstack.org/community/events/">Events</a></li>
           <li><a href="https://openstack.org/community/jobs/">Jobs</a></li>
-          <li><a href="https://openstack.org/foundation/companies/">Companies</a></li>
+          <li><a href="https://openinfra.dev/members/">Companies</a></li>
           <li><a href="https://docs.openstack.org/contributors">Contribute</a></li>
         </ul>
       </div>
@@ -33,21 +32,22 @@
       <div class="col-lg-2 col-sm-2">
         <h3>Branding & Legal</h3>
         <ul>
+          <li><a href="https://openinfra.dev/legal">Legal Docs</a></li>
           <li><a href="https://openstack.org/brand/">Logos & Guidelines</a></li>
-          <li><a href="https://openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
-          <li><a href="https://openstack.org/privacy/">Privacy Policy</a></li>
-          <li><a href="https://wiki.openstack.org/wiki/How_To_Contribute#Contributor_License_Agreement">OpenStack CLA</a></li>
+          <li><a href="https://openinfra.dev/legal/trademark-policy">Trademark Policy</a></li>
+          <li><a href="https://openinfra.dev/privacy-policy">Privacy Policy</a></li>
+          <li><a href="https://docs.openstack.org/contributors/common/setup-gerrit.html#individual-contributor-license-agreement">OpenInfra CLA</a></li>
         </ul>
       </div>
       <div class="col-lg-4 col-sm-4">
         <h3>Stay In Touch</h3>
         <a href="https://twitter.com/OpenStack" target="_blank" class="social-icons footer-twitter"></a>
-        <a href="https://www.facebook.com/openstack" target="_blank" class="social-icons footer-facebook"></a>
-        <a href="https://www.linkedin.com/company/openstack" target="_blank" class="social-icons footer-linkedin"></a>
+        <a href="https://www.facebook.com/openinfradev" target="_blank" class="social-icons footer-facebook"></a>
+        <a href="https://www.linkedin.com/company/open-infrastructure-foundation" target="_blank" class="social-icons footer-linkedin"></a>
         <a href="https://www.youtube.com/user/OpenStackFoundation" target="_blank" class="social-icons footer-youtube"></a>
         <p class="fine-print">
           The OpenStack project is provided under the
-          <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache 2.0 license</a>. Openstack.org is powered by
+          <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache 2.0 license</a>. Docs.openstack.org is powered by
           <a href="https://rackspace.com" target="_blank">Rackspace Cloud Computing</a>.
         </p>
       </div>
diff --git a/openstackdocstheme/theme/starlingxdocs/footer.html b/openstackdocstheme/theme/starlingxdocs/footer.html
index a3d5517c..df73b85b 100644
--- a/openstackdocstheme/theme/starlingxdocs/footer.html
+++ b/openstackdocstheme/theme/starlingxdocs/footer.html
@@ -18,21 +18,22 @@
       <div class="col-lg-2 col-sm-2">
         <h3>Branding & Legal</h3>
         <ul>
+          <li><a href="https://openinfra.dev/legal">Legal Docs</a></li>
           <li><a href="https://openstack.org/brand/">Logos & Guidelines</a></li>
-          <li><a href="https://openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
-          <li><a href="https://openstack.org/privacy/">Privacy Policy</a></li>
-          <li><a href="https://wiki.openstack.org/wiki/How_To_Contribute#Contributor_License_Agreement">OpenStack CLA</a></li>
+          <li><a href="https://openinfra.dev/legal/trademark-policy">Trademark Policy</a></li>
+          <li><a href="https://openinfra.dev/privacy-policy">Privacy Policy</a></li>
+          <li><a href="https://docs.openstack.org/contributors/common/setup-gerrit.html#individual-contributor-license-agreement">OpenInfra CLA</a></li>
         </ul>
       </div>
       <div class="col-lg-4 col-sm-4">
         <h3>Stay In Touch</h3>
-        <a href="https://twitter.com/OpenStack" target="_blank" class="social-icons footer-twitter"></a>
-        <a href="https://www.facebook.com/openstack" target="_blank" class="social-icons footer-facebook"></a>
-        <a href="https://www.linkedin.com/company/openstack" target="_blank" class="social-icons footer-linkedin"></a>
+        <a href="https://twitter.com/StarlingX" target="_blank" class="social-icons footer-twitter"></a>
+        <a href="https://www.facebook.com/openinfradev" target="_blank" class="social-icons footer-facebook"></a>
+        <a href="https://www.linkedin.com/company/open-infrastructure-foundation" target="_blank" class="social-icons footer-linkedin"></a>
         <a href="https://www.youtube.com/user/OpenStackFoundation" target="_blank" class="social-icons footer-youtube"></a>
         <p class="fine-print">
           The StarlingX project is provided under the
-          <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache 2.0 license</a>. starlingx.io is powered by
+          <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache 2.0 license</a>. Docs.starlingx.io is powered by
           <a href="https://rackspace.com" target="_blank">Rackspace Cloud Computing</a>.
         </p>
       </div>