diff --git a/assets/images/cncf-color.png b/assets/images/cncf-color.png
new file mode 100644
index 0000000..a1fa79e
Binary files /dev/null and b/assets/images/cncf-color.png differ
diff --git a/config.toml b/config.toml
index ad03a3d..dd266dd 100644
--- a/config.toml
+++ b/config.toml
@@ -59,12 +59,13 @@ guessSyntax = "true"
 
 [params]
 copyright = "2021-2023. The kcp Authors"
-footer_note = "Kubernetes and the Kubernetes logo are registered trademarks of The Linux Foundation."
+footer_note = "Kubernetes and the Kubernetes logo are registered trademarks of The Linux Foundation® (TLF)."
+footer_cncf_show = true
+footer_cncf_note = "We are a Cloud Native Computing Foundation sandbox project."
 
 archived_version = false
-version = "v0.8"
 url_latest_version = "https://kcp.io/"
-github_repo = "https://github.com/kcp-dev/kcp-dev.github.io"
+github_repo = "https://github.com/kcp-dev/kcp.io"
 github_project_repo = "https://github.com/kcp-dev/kcp"
 github_subdir = "docs"
 github_branch= "main"
@@ -84,7 +85,7 @@ url = "https://docs.kcp.io/kcp/main"
 [[menu.main]]
 name = "GitHub"
 weight = -99
-url = "https://github.com/kcp-dev/kcp/"
+url = "https://github.com/kcp-dev/kcp"
 [[menu.main]]
 name = "Contribute"
 weight = -99
@@ -102,29 +103,34 @@ name = "Twitter"
 brand = "twitter"
 url = "https://twitter.com/kcp"
 
+[[params.links.social]]
+name = "YouTube"
+brand = "youtube"
+url = "https://www.youtube.com/channel/UCfP_yS5uYix0ppSbm2ltS5Q"
+
 [params.links.footer]
 
 [params.links.footer.community]
 name = "Community"
 [[params.links.footer.community.links]]
-name = "Kubernetes Slack"
-url = "https://kubernetes.slack.com/archives/C021U8WSAFK"
-[[params.links.footer.community.links]]
 name = "Code of Conduct"
 url = "https://github.com/kcp-dev/kcp/blob/main/code-of-conduct.md"
 [[params.links.footer.community.links]]
+name = "Kubernetes Slack"
+url = "https://kubernetes.slack.com/archives/C021U8WSAFK"
+[[params.links.footer.community.links]]
 name = "User Mailing List"
 url = "https://groups.google.com/g/kcp-users"
 
 [params.links.footer.developer]
 name = "Developer Resources"
 [[params.links.footer.developer.links]]
-name = "Governance"
-url = "https://github.com/kcp-dev/kcp/blob/main/GOVERNANCE.md"
-[[params.links.footer.developer.links]]
 name = "How to Contribute"
 url = "https://github.com/kcp-dev/kcp/blob/main/CONTRIBUTING.md"
 [[params.links.footer.developer.links]]
+name = "Website Source"
+url = "https://github.com/kcp-dev/kcp.io"
+[[params.links.footer.developer.links]]
 name = "Developer Mailing List"
 url = "https://groups.google.com/g/kcp-dev"
 
@@ -137,6 +143,15 @@ url = "https://docs.kcp.io"
 name = "Report a Vulnerability"
 url = "https://github.com/kcp-dev/kcp/blob/main/SECURITY.md"
 
+[params.links.footer.policies]
+name = "Policies"
+[[params.links.footer.policies.links]]
+name = "Governance"
+url = "https://github.com/kcp-dev/kcp/blob/main/GOVERNANCE.md"
+[[params.links.footer.policies.links]]
+name = "Trademark Usage"
+url = "https://www.linuxfoundation.org/trademark-usage/"
+
 # hugo module configuration
 
 [module]
diff --git a/themes/kcp/layouts/partials/footer.html b/themes/kcp/layouts/partials/footer.html
index 3f72b91..ec50157 100644
--- a/themes/kcp/layouts/partials/footer.html
+++ b/themes/kcp/layouts/partials/footer.html
@@ -2,43 +2,51 @@
   <div
     class="mx-auto max-w-screen-xl space-y-8 px-4 py-16 sm:px-6 lg:space-y-16 lg:px-8"
   >
-    <div class="grid grid-cols-1 gap-8 lg:grid-cols-3">
-      <div>
-        <p class="mt-4 max-w-xs text-gray-500">
+    <div class="grid grid-cols-1 gap-8 lg:grid-cols-3 text-xs text-gray-500">
+      <div class="md:max-w-sm">
+        {{- if .Site.Params.footer_cncf_show }}
+        {{- $cncf_logo := resources.Get "images/cncf-color.png" }}
+        <img style="max-width: 300px;" src="{{ $cncf_logo.RelPermalink }}" alt="Cloud Native Computing Foundation Logo">
+        <p class="mt-4">
+            {{ .Site.Params.footer_cncf_note }}
+        </p>
+        {{- end }}
+        <p class="mt-4 text-gray-500">
           {{ .Site.Params.footer_note }}
         </p>
+        <p class="mt-4">
+            &copy; {{ .Site.Params.copyright }}.
+        </p>
 
-
-      {{- if .Site.Params.links.social }}
-      <p class="mt-8">Find us on</p>
-
+        {{- if .Site.Params.links.social }}
+        <p class="mt-4">Find us on</p>
         <ul class="mt-2 flex gap-6">
-            {{ range .Site.Params.links.social }}
-          <li>
-            <a
-                href="{{ .url }}"
-              rel="noreferrer"
-              target="_blank"
-              class="text-gray-700 transition hover:opacity-75"
-            >
-            <span class="sr-only">{{ .name }}</span>
+        {{ range .Site.Params.links.social }}
+            <li>
+                <a
+                    href="{{ .url }}"
+                    rel="noreferrer"
+                    target="_blank"
+                    class="text-gray-700 transition hover:opacity-75"
+                >
+                    <span class="sr-only">{{ .name }}</span>
 
-              <svg
-                class="h-6 w-6"
-                fill="currentColor"
-                viewBox="0 0 24 24"
-                aria-hidden="true"
-              >
-              {{ partial (printf "flowbite-icons/src/solid/brands/%s.svg" .brand) }}
-            </svg>
-            </a>
-          </li>
-          {{- end }}
+                    <svg
+                        class="h-6 w-6"
+                        fill="currentColor"
+                        viewBox="0 0 24 24"
+                        aria-hidden="true"
+                    >
+                        {{ partial (printf "flowbite-icons/src/solid/brands/%s.svg" .brand) }}
+                    </svg>
+                </a>
+            </li>
+        {{- end }}
         </ul>
         {{- end }}
-        <p class="mt-4 text-xs text-gray-400">
+    <p class="mt-8 text-gray-400">
         This page uses <a href="https://github.com/themesberg/flowbite-icons">flowbite-icons</a> and <a href="https://alpinejs.dev">alpine.js</a>, licensed under MIT License.
-        </p>
+     </p>
       </div>
 
       <div
@@ -60,9 +68,5 @@
         {{- end }}
       </div>
     </div>
-
-    <p class="text-xs text-gray-500">
-        &copy; {{ .Site.Params.copyright }}.
-    </p>
   </div>
 </footer>