diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b3e2c0bb5a0..9255c757f83 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,23 +1,23 @@
-/.bundle/ @cockroachdb/docs-infra-prs
-/.github/ @cockroachdb/docs-infra-prs
-/__tests__/ @cockroachdb/docs-infra-prs
-/_layouts/  @cockroachdb/docs-infra-prs
-/_plugins/  @cockroachdb/docs-infra-prs
-/css/ @cockroachdb/docs-infra-prs
-/fonts/ @cockroachdb/docs-infra-prs
-/githooks/  @cockroachdb/docs-infra-prs
-/jekyll-algolia-dev/  @cockroachdb/docs-infra-prs
-/js/  @cockroachdb/docs-infra-prs
-/netlify/ @cockroachdb/docs-infra-prs
-/vale/  @cockroachdb/docs-infra-prs
-_redirects  @cockroachdb/docs-infra-prs
-.gitattributes  @cockroachdb/docs-infra-prs
-.gitignore  @cockroachdb/docs-infra-prs
-.htmltest.yaml  @cockroachdb/docs-infra-prs
-.vale.ini @cockroachdb/docs-infra-prs
-Gemfile @cockroachdb/docs-infra-prs
-Makefile  @cockroachdb/docs-infra-prs
-package.json  @cockroachdb/docs-infra-prs
-search.html @cockroachdb/docs-infra-prs
-sitemap.xml @cockroachdb/docs-infra-prs
-update.sh @cockroachdb/docs-infra-prs
+/.bundle/ @cockroachlabs/docs-infra-prs
+/.github/ @cockroachlabs/docs-infra-prs
+/__tests__/ @cockroachlabs/docs-infra-prs
+/_layouts/  @cockroachlabs/docs-infra-prs
+/_plugins/  @cockroachlabs/docs-infra-prs
+/css/ @cockroachlabs/docs-infra-prs
+/fonts/ @cockroachlabs/docs-infra-prs
+/githooks/  @cockroachlabs/docs-infra-prs
+/jekyll-algolia-dev/  @cockroachlabs/docs-infra-prs
+/js/  @cockroachlabs/docs-infra-prs
+/netlify/ @cockroachlabs/docs-infra-prs
+/vale/  @cockroachlabs/docs-infra-prs
+_redirects  @cockroachlabs/docs-infra-prs
+.gitattributes  @cockroachlabs/docs-infra-prs
+.gitignore  @cockroachlabs/docs-infra-prs
+.htmltest.yaml  @cockroachlabs/docs-infra-prs
+.vale.ini @cockroachlabs/docs-infra-prs
+Gemfile @cockroachlabs/docs-infra-prs
+Makefile  @cockroachlabs/docs-infra-prs
+package.json  @cockroachlabs/docs-infra-prs
+search.html @cockroachlabs/docs-infra-prs
+sitemap.xml @cockroachlabs/docs-infra-prs
+update.sh @cockroachlabs/docs-infra-prs
diff --git a/.github/scripts/cross_version_link_linter.py b/.github/scripts/cross_version_link_linter.py
index c4e73f43e33..4192c50851e 100644
--- a/.github/scripts/cross_version_link_linter.py
+++ b/.github/scripts/cross_version_link_linter.py
@@ -247,7 +247,7 @@ def format_violations_for_github(self) -> str:
             "",
             "**Action Required**: Please update all cross-version links to use version variables or ensure links stay within the same version.",
             "",
-            "For more information about proper link formatting, see the [CockroachDB Docs Style Guide](https://github.com/cockroachdb/docs/blob/main/StyleGuide.md#links)."
+            "For more information about proper link formatting, see the [CockroachDB Docs Style Guide](https://github.com/cockroachlabs/docs/blob/main/StyleGuide.md#links)."
         ])
 
         return "\n".join(lines)
diff --git a/.github/scripts/docs-prs-reviews.go b/.github/scripts/docs-prs-reviews.go
index 16705229a2a..2b111c1e90e 100644
--- a/.github/scripts/docs-prs-reviews.go
+++ b/.github/scripts/docs-prs-reviews.go
@@ -6,7 +6,7 @@
 // As of the Change Date specified in that file, in accordance with
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0, included in the file
-// https://raw.githubusercontent.com/cockroachdb/cockroach/master/licenses/APL.txt
+// https://raw.githubusercontent.com/cockroachlabs/cockroach-private/master/licenses/APL.txt
 
 package main
 
@@ -83,7 +83,7 @@ type prReviewParse struct {
 }
 
 const (
-	docsOrganization = "cockroachdb"
+	docsOrganization = "cockroachlabs"
 	docsRepo         = "docs"
 	docsPrsTeam      = "docs-prs"
 )
diff --git a/.github/workflows/changed_files.yml b/.github/workflows/changed_files.yml
index 18963c60d62..16c4e97fea1 100644
--- a/.github/workflows/changed_files.yml
+++ b/.github/workflows/changed_files.yml
@@ -29,7 +29,7 @@ jobs:
 
           function generateMainFiles() {
             html_file=`echo "${1%.md}.html" | sed -E 's/src\/[^\/]*\///g'`
-            file="<li><a href=\"https://deploy-preview-$pr_num--cockroachdb-docs.netlify.app/docs/$html_file\" target=\"_blank\" rel=\"noopener\">$1</a></li>"
+            file="<li><a href=\"https://deploy-preview-$pr_num--cockroachlabs-docs.netlify.app/docs/$html_file\" target=\"_blank\" rel=\"noopener\">$1</a></li>"
             output+="$file"
           }
 
@@ -86,7 +86,7 @@ jobs:
               read -ra path <<< "$file"
               IFS=$OLDIFS
               major_version=${path[-2]}
-              file="<li>${file}:<ul><li><a href=\"https://deploy-preview-$pr_num--cockroachdb-docs.netlify.app/docs/releases/${major_version}.html\" target=\"_blank\" rel=\"noopener\">releases/${major_version}.md</a></li></ul></li>"
+              file="<li>${file}:<ul><li><a href=\"https://deploy-preview-$pr_num--cockroachlabs-docs.netlify.app/docs/releases/${major_version}.html\" target=\"_blank\" rel=\"noopener\">releases/${major_version}.md</a></li></ul></li>"
               output+="$file"
             elif [[ $file == src/*/_includes/v* || $file == src/*/_includes/cockroachcloud* || $file == src/*/images/* ]] && [[ $file != src/**/*.json ]] && [[ $file != *.gitignore* ]]
             then
diff --git a/MarkdownGuide.md b/MarkdownGuide.md
index 15619dd9692..b4de4c2712d 100644
--- a/MarkdownGuide.md
+++ b/MarkdownGuide.md
@@ -592,7 +592,7 @@ The contents of `shared-file.md` will now appear on all of the pages where you a
 
 #### Different content depending on page name
 
-There may be cases where the content of the include file will need to vary slightly depending on what pages that content is being shared into. For example, while working on [cockroachdb/docs#12216](https://github.com/cockroachdb/docs/pull/12216),  I needed a way to:
+There may be cases where the content of the include file will need to vary slightly depending on what pages that content is being shared into. For example, while working on [cockroachlabs/docs#12216](https://github.com/cockroachlabs/docs/pull/12216),  I needed a way to:
 
 - Have text be a link on the [Known Limitations](https://www.cockroachlabs.com/docs/stable/known-limitations) page.
 - Have that same text _not_ be a link on the [Cost-Based Optimizer](https://www.cockroachlabs.com/docs/stable/cost-based-optimizer) page (since it would be a self-referring link).
@@ -615,7 +615,7 @@ Locality-optimized search
 
 #### Remote includes
 
-Sometimes, you need to include files that are maintained in other places than the `cockroachdb/docs` repo but referenced in our docs. The `remote_include` tag is used for this. We most often use this tag for code samples, which are maintained in various repos.
+Sometimes, you need to include files that are maintained in other places than the `cockroachlabs/docs` repo but referenced in our docs. The `remote_include` tag is used for this. We most often use this tag for code samples, which are maintained in various repos.
 
 For code samples, you usually want to show only part of a larger file to highlight a specific technique, or due to length considerations.
 
@@ -639,7 +639,7 @@ For more information about the `remote_include` tag, see the README in the [jeky
 
 ### Filter tabs
 
-Use filter tabs to create navigation between related pages. The [`filter-tabs.md`](https://github.com/cockroachdb/docs/blob/main/src/current/_includes/filter-tabs.md) include generates tabs that link to different pages.
+Use filter tabs to create navigation between related pages. The [`filter-tabs.md`](https://github.com/cockroachlabs/docs/blob/main/src/current/_includes/filter-tabs.md) include generates tabs that link to different pages.
 
 **Note:** Filter tabs link to different URLs/pages, not tabs within a single page.
 
diff --git a/README.md b/README.md
index fe776def3c5..a808d5d25b9 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ This repository contains the source files for the CockroachDB documentation avai
 
 ## Suggest Improvements
 
-Want a topic added to the docs? Need additional details or clarification? See an error or other problem? Please [open an issue](https://github.com/cockroachdb/docs/issues).
+Want a topic added to the docs? Need additional details or clarification? See an error or other problem? Please [open an issue](https://github.com/cockroachlabs/docs/issues).
 
 ## Resources
 
diff --git a/StyleGuide.md b/StyleGuide.md
index 05b31906b98..f8532ebaffe 100644
--- a/StyleGuide.md
+++ b/StyleGuide.md
@@ -283,7 +283,7 @@ Avoid terms that imply violence or harm.
 - Replace "performance _hit_" with **reduced performance**.
 - Replace "want to _hit_ up" with **want to visit**.
 
-Terminology around "kill" vs. "stop" vs. "terminate" is nuanced, as described [in this GitHub comment](https://github.com/cockroachdb/docs/issues/7767#issuecomment-662028864). Use your best judgement.
+Terminology around "kill" vs. "stop" vs. "terminate" is nuanced, as described [in this GitHub comment](https://github.com/cockroachlabs/docs/issues/7767#issuecomment-662028864). Use your best judgement.
 
 ### Write accessible documentation
 
@@ -372,7 +372,7 @@ A _concept_ topic explains how a particular feature works, or how a specific sys
 
 - Provide as much relevant information as you can, and then link to other pages as necessary. If there is a related [reference](#reference) topic, link to it from within the conceptual topic.
 
-For templates that provide a starting point for writing concept topics, refer to the [concept templates](https://github.com/cockroachdb/docs/tree/main/templates/concept).
+For templates that provide a starting point for writing concept topics, refer to the [concept templates](https://github.com/cockroachlabs/docs/tree/main/templates/concept).
 
 #### Examples
 
@@ -403,7 +403,7 @@ A _task_ topic provides step-by-step instructions to complete a specific goal. T
 
 Tasks should **not** include concept or reference information; instead, a task should link to [Concept](#concept) and [Reference](#reference) topics as needed.
 
-For templates that provide a starting point for writing task topics, refer to the [task templates](https://github.com/cockroachdb/docs/tree/main/templates/task).
+For templates that provide a starting point for writing task topics, refer to the [task templates](https://github.com/cockroachlabs/docs/tree/main/templates/task).
 
 #### Examples
 
@@ -422,7 +422,7 @@ Reference topics help users understand the precise meaning and effect of Cockroa
 - The content should be comprehensive and accurate. This principle might apply to other page types, but it is especially important for reference, as it is the ultimate source of truth for a particular feature or interface.
 - The content should be succinct. Details are often presented in table format. Prose is better suited for [Concept](#concept) topics.
 
-For templates that provide a starting point for writing reference topics, refer to the [reference templates](https://github.com/cockroachdb/docs/tree/main/templates/reference).
+For templates that provide a starting point for writing reference topics, refer to the [reference templates](https://github.com/cockroachlabs/docs/tree/main/templates/reference).
 
 #### Examples
 
@@ -436,7 +436,7 @@ _Guides_ offer the reader a perspective on how to decide between a number of dif
 
 To accomplish this goal, guides often link to several different [Concept](#concept) topics and compare and contrast them. They can also link to multiple [Task](#task) topics.
 
-For templates that provide a starting point for writing guide topics, refer to the [guide templates](https://github.com/cockroachdb/docs/tree/main/templates/guide).
+For templates that provide a starting point for writing guide topics, refer to the [guide templates](https://github.com/cockroachlabs/docs/tree/main/templates/guide).
 
 #### Examples
 
@@ -564,7 +564,7 @@ For include file syntax, refer to the [Markdown Guide](MarkdownGuide.md#include-
 
 Reference issues and pull requests by their corresponding number, prepended with `#`.
 
-**Example:** `[#1](https://github.com/cockroachdb/docs/pull/1)`
+**Example:** `[#1](https://github.com/cockroachlabs/docs/pull/1)`
 
 #### External links
 
diff --git a/src/current/Dockerfile b/src/current/Dockerfile
index 12af3b7796f..35fe085e463 100644
--- a/src/current/Dockerfile
+++ b/src/current/Dockerfile
@@ -11,7 +11,7 @@ FROM ruby:3.4-slim
 # Version labels
 LABEL org.opencontainers.image.title="CockroachDB Docs Builder"
 LABEL org.opencontainers.image.description="Hermetic build environment for CockroachDB documentation"
-LABEL org.opencontainers.image.source="https://github.com/cockroachdb/docs"
+LABEL org.opencontainers.image.source="https://github.com/cockroachlabs/docs"
 LABEL ruby.version="3.4.0"
 LABEL bundler.version="2.7.2"
 LABEL jekyll.version="4.3.4"
diff --git a/src/current/_data/redirects.yml b/src/current/_data/redirects.yml
index dbb125c614c..0091403e816 100644
--- a/src/current/_data/redirects.yml
+++ b/src/current/_data/redirects.yml
@@ -31,7 +31,7 @@
 # in the list of versions that matches a major version in
 # versions.csv, Jekyll will automatically add a redirect
 # for the dev and stable aliases for that page. versions.csv:
-# https://github.com/cockroachdb/docs/blob/main/src/current/_data/versions.csv
+# https://github.com/cockroachlabs/docs/blob/main/src/current/_data/versions.csv
 #
 # Each redirect added in redirects.yml generates a redirect
 # for the page without the .md extension and a redirect for
diff --git a/src/current/_data/v24.2/metrics/metrics.yml b/src/current/_data/v24.2/metrics/metrics.yml
index 61f9fc4d74d..4301ee66dc5 100644
--- a/src/current/_data/v24.2/metrics/metrics.yml
+++ b/src/current/_data/v24.2/metrics/metrics.yml
@@ -3,7 +3,7 @@
 # https://github.com/cockroachlabs/managed-service/pull/16129/files
 # console/assets/js/pages/clusterDetail/metrics/graphConfigs.tsx
 # The data for the metrics was also sourced from
-# https://github.com/cockroachdb/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
+# https://github.com/cockroachlabs/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
 # 
 # The corresponding metrics-list.csv file was generated using the v23.2.0 binary with the following command:
 # cockroach gen metric-list --format=csv > metrics-list.csv
diff --git a/src/current/_data/v24.3/metrics/metrics.yml b/src/current/_data/v24.3/metrics/metrics.yml
index 61f9fc4d74d..4301ee66dc5 100644
--- a/src/current/_data/v24.3/metrics/metrics.yml
+++ b/src/current/_data/v24.3/metrics/metrics.yml
@@ -3,7 +3,7 @@
 # https://github.com/cockroachlabs/managed-service/pull/16129/files
 # console/assets/js/pages/clusterDetail/metrics/graphConfigs.tsx
 # The data for the metrics was also sourced from
-# https://github.com/cockroachdb/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
+# https://github.com/cockroachlabs/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
 # 
 # The corresponding metrics-list.csv file was generated using the v23.2.0 binary with the following command:
 # cockroach gen metric-list --format=csv > metrics-list.csv
diff --git a/src/current/_data/v25.1/metrics/metrics.yml b/src/current/_data/v25.1/metrics/metrics.yml
index 61f9fc4d74d..4301ee66dc5 100644
--- a/src/current/_data/v25.1/metrics/metrics.yml
+++ b/src/current/_data/v25.1/metrics/metrics.yml
@@ -3,7 +3,7 @@
 # https://github.com/cockroachlabs/managed-service/pull/16129/files
 # console/assets/js/pages/clusterDetail/metrics/graphConfigs.tsx
 # The data for the metrics was also sourced from
-# https://github.com/cockroachdb/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
+# https://github.com/cockroachlabs/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
 # 
 # The corresponding metrics-list.csv file was generated using the v23.2.0 binary with the following command:
 # cockroach gen metric-list --format=csv > metrics-list.csv
diff --git a/src/current/_data/v25.2/metrics/metrics-cloud.yml b/src/current/_data/v25.2/metrics/metrics-cloud.yml
index 61f9fc4d74d..4301ee66dc5 100644
--- a/src/current/_data/v25.2/metrics/metrics-cloud.yml
+++ b/src/current/_data/v25.2/metrics/metrics-cloud.yml
@@ -3,7 +3,7 @@
 # https://github.com/cockroachlabs/managed-service/pull/16129/files
 # console/assets/js/pages/clusterDetail/metrics/graphConfigs.tsx
 # The data for the metrics was also sourced from
-# https://github.com/cockroachdb/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
+# https://github.com/cockroachlabs/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
 # 
 # The corresponding metrics-list.csv file was generated using the v23.2.0 binary with the following command:
 # cockroach gen metric-list --format=csv > metrics-list.csv
diff --git a/src/current/_data/v25.3/metrics/metrics-cloud.yml b/src/current/_data/v25.3/metrics/metrics-cloud.yml
index 61f9fc4d74d..4301ee66dc5 100644
--- a/src/current/_data/v25.3/metrics/metrics-cloud.yml
+++ b/src/current/_data/v25.3/metrics/metrics-cloud.yml
@@ -3,7 +3,7 @@
 # https://github.com/cockroachlabs/managed-service/pull/16129/files
 # console/assets/js/pages/clusterDetail/metrics/graphConfigs.tsx
 # The data for the metrics was also sourced from
-# https://github.com/cockroachdb/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
+# https://github.com/cockroachlabs/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
 # 
 # The corresponding metrics-list.csv file was generated using the v23.2.0 binary with the following command:
 # cockroach gen metric-list --format=csv > metrics-list.csv
diff --git a/src/current/_data/v25.4/metrics/metrics-cloud.yml b/src/current/_data/v25.4/metrics/metrics-cloud.yml
index d863553c16a..67aa825d751 100644
--- a/src/current/_data/v25.4/metrics/metrics-cloud.yml
+++ b/src/current/_data/v25.4/metrics/metrics-cloud.yml
@@ -3,7 +3,7 @@
 # https://github.com/cockroachlabs/managed-service/pull/16129/files
 # console/assets/js/pages/clusterDetail/metrics/graphConfigs.tsx
 # The data for the metrics was also sourced from
-# https://github.com/cockroachdb/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
+# https://github.com/cockroachlabs/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
 # 
 # The corresponding metrics-list.csv file was generated using the v23.2.0 binary with the following command:
 # cockroach gen metric-list --format=csv > metrics-list.csv
diff --git a/src/current/_data/v26.1/metrics/metrics-cloud.yml b/src/current/_data/v26.1/metrics/metrics-cloud.yml
index d863553c16a..67aa825d751 100644
--- a/src/current/_data/v26.1/metrics/metrics-cloud.yml
+++ b/src/current/_data/v26.1/metrics/metrics-cloud.yml
@@ -3,7 +3,7 @@
 # https://github.com/cockroachlabs/managed-service/pull/16129/files
 # console/assets/js/pages/clusterDetail/metrics/graphConfigs.tsx
 # The data for the metrics was also sourced from
-# https://github.com/cockroachdb/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
+# https://github.com/cockroachlabs/docs/blob/main/src/current/_includes/v23.2/essential-metrics.md
 # 
 # The corresponding metrics-list.csv file was generated using the v23.2.0 binary with the following command:
 # cockroach gen metric-list --format=csv > metrics-list.csv
diff --git a/src/current/_data/v26.2/metrics/metrics-cloud.yml b/src/current/_data/v26.2/metrics/metrics-cloud.yml
index c55e004a6f7..76eb341333f 100644
--- a/src/current/_data/v26.2/metrics/metrics-cloud.yml
+++ b/src/current/_data/v26.2/metrics/metrics-cloud.yml
@@ -2,7 +2,7 @@
 # The metrics are in the order of appearance in the configuration file:
 # https://github.com/cockroachlabs/managed-service/blob/master/console/ui/cc-console/assets/js/pages/clusterDetail/metrics/graphConfigs.tsx
 # The data for the metrics was also sourced from
-# https://github.com/cockroachdb/docs/blob/main/src/current/_includes/v26.2/metric-names.md
+# https://github.com/cockroachlabs/docs/blob/main/src/current/_includes/v26.2/metric-names.md
 #
 # The corresponding metrics.yaml file was generated using the v26.2 binary with the following command:
 # cockroach gen metric-list > metrics.yaml
diff --git a/src/current/_data/v26.3/metrics/metrics-cloud.yml b/src/current/_data/v26.3/metrics/metrics-cloud.yml
index 603e023f03c..3f3babb06dc 100644
--- a/src/current/_data/v26.3/metrics/metrics-cloud.yml
+++ b/src/current/_data/v26.3/metrics/metrics-cloud.yml
@@ -2,7 +2,7 @@
 # The metrics are in the order of appearance in the configuration file:
 # https://github.com/cockroachlabs/managed-service/blob/master/console/ui/cc-console/assets/js/pages/clusterDetail/metrics/graphConfigs.tsx
 # The data for the metrics was also sourced from
-# https://github.com/cockroachdb/docs/blob/main/src/current/_includes/v26.2/metric-names.md
+# https://github.com/cockroachlabs/docs/blob/main/src/current/_includes/v26.2/metric-names.md
 #
 # The corresponding metrics.yaml file was generated using the v26.2 binary with the following command:
 # cockroach gen metric-list > metrics.yaml
diff --git a/src/current/_includes/contribute-options.html b/src/current/_includes/contribute-options.html
index 3348bc15b36..8e1b15d401e 100644
--- a/src/current/_includes/contribute-options.html
+++ b/src/current/_includes/contribute-options.html
@@ -1,13 +1 @@
-<div>
-  <div class="contribute dropdown">
-    <button class="btn-contribute dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-      <i class="fab fa-github"></i> Contribute
-      <span class="carat-arrow-down"><img src="{{ 'images/carat-down-fill.svg' | relative_url }}" alt="Carat arrow pointing down"></span>
-    </button>
-    <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-      <li><a href="https://github.com/cockroachdb/docs/tree/main/src/current/{{ page.path }}" target="_blank" id="view-page-source">View Page Source</a></li>
-      <li><a href="https://github.com/cockroachdb/docs/edit/main/src/current/{{ page.path }}" target="_blank" id="edit-this-page">Edit This Page</a></li>
-      <li><a href="https://github.com/cockroachdb/docs/issues/new?title=Feedback:%20{{page.title}}&amp;body=Page%3A%20https%3A%2F%2Fcockroachlabs.com/docs{{page.url}}%0A%0A%23%23%20What is the reason for your feedback?%0A%0A&#91;%20&#93;%20Missing the information I need%0A%0A&#91;%20&#93;%20Too complicated%0A%0A&#91;%20&#93;%20Out of date%0A%0A&#91;%20&#93;%20Something is broken%0A%0A&#91;%20&#93;%20Other%0A%0A%23%23%20Additional details&amp;" target="_blank">Report Doc Issue</a></li>
-    </ul>
-  </div>
-</div>
+{% comment %} Contribute dropdown removed: docs repo is now private (Project Stanley). {% endcomment %}
diff --git a/src/current/_includes/feedback-widget-bottom.html b/src/current/_includes/feedback-widget-bottom.html
index 2aabe97876e..7bd801a3d08 100644
--- a/src/current/_includes/feedback-widget-bottom.html
+++ b/src/current/_includes/feedback-widget-bottom.html
@@ -13,7 +13,7 @@
       $('#feedback-prompt-toc').hide()
     });
     $("#no-button-bottom").bind("click", function () {
-      $('#feedback-prompt-bottom').html('<p class="feedback-response-bottom">Thank you.</p><p><a href="https://github.com/cockroachdb/docs/issues/new?title=Feedback:%20{{page.title}}&amp;body=Page%3A%20https%3A%2F%2Fcockroachlabs.com/docs{{page.url}}%0A%0A%23%23%20What is the reason for your feedback?%0A%0A&#91;%20&#93;%20Missing the information I need%0A%0A&#91;%20&#93;%20Too complicated%0A%0A&#91;%20&#93;%20Out of date%0A%0A&#91;%20&#93;%20Something is broken%0A%0A&#91;%20&#93;%20Other%0A%0A%23%23%20Additional details&amp;" target="_blank" data-proofer-ignore>Please tell us more.</a></p></p>')
+      $('#feedback-prompt-bottom').html('<p class="feedback-response-bottom">Thank you for your feedback!</p>')
       $('#feedback-prompt-toc').hide()
     });
   });
diff --git a/src/current/_includes/feedback-widget-toc.html b/src/current/_includes/feedback-widget-toc.html
index 0dc6d278c91..b2556e30257 100644
--- a/src/current/_includes/feedback-widget-toc.html
+++ b/src/current/_includes/feedback-widget-toc.html
@@ -13,7 +13,7 @@
       $('#feedback-prompt-bottom').hide()
     });
     $("#no-button-toc").bind("click", function () {
-      $('#feedback-prompt-toc').html('<p class="feedback-response-toc">Thank you.</p><p><a href="https://github.com/cockroachdb/docs/issues/new?title=Feedback:%20{{page.title}}&amp;body=Page%3A%20https%3A%2F%2Fcockroachlabs.com/docs{{page.url}}%0A%0A%23%23%20What is the reason for your feedback?%0A%0A&#91;%20&#93;%20Missing the information I need%0A%0A&#91;%20&#93;%20Too complicated%0A%0A&#91;%20&#93;%20Out of date%0A%0A&#91;%20&#93;%20Something is broken%0A%0A&#91;%20&#93;%20Other%0A%0A%23%23%20Additional details&amp;" target="_blank" data-proofer-ignore>Please tell us more.</a></p></p>')
+      $('#feedback-prompt-toc').html('<p class="feedback-response-toc">Thank you for your feedback!</p>')
       $('#feedback-prompt-bottom').hide()
     });
   });
diff --git a/src/current/_layouts/default.html b/src/current/_layouts/default.html
index 997daac6a67..c3868be70f0 100755
--- a/src/current/_layouts/default.html
+++ b/src/current/_layouts/default.html
@@ -42,9 +42,6 @@
 {% if page.toc == true %}
         <div class="toc-col col-md-2">
           <div class="toc-col-contents">  <!-- lets all elements scroll -->
-            <div class="d-none d-lg-block pb-4">
-              {% include contribute-options.html %}
-            </div>
             <div class="toc-right-title">On this page</div>
             <div id="toc-right">
             </div>
diff --git a/src/current/_layouts/page.html b/src/current/_layouts/page.html
index b105ae0c6f2..b180e13337c 100755
--- a/src/current/_layouts/page.html
+++ b/src/current/_layouts/page.html
@@ -20,15 +20,6 @@
   {% endunless %}
 <div class="{{ post_header_class }}">
 <h1 class="post-title-main w-100">{{ page.title }}</h1>
-  {% unless page.contribute == false %}
-    {% assign toc_classes = 'd-block ' %}
-    {% unless page.toc == false %}
-      {% assign toc_classes = toc_classes | append: 'd-lg-none' %}
-    {% endunless %}
-    <div class="{{toc_classes}}">
-      {% include contribute-options.html %}
-    </div>
-  {% endunless %}
 </div>
 {% endif %}
 
diff --git a/src/current/docs-mcp-integration.md b/src/current/docs-mcp-integration.md
index 1f9f7cf0d73..1b12c10dbc7 100644
--- a/src/current/docs-mcp-integration.md
+++ b/src/current/docs-mcp-integration.md
@@ -183,7 +183,7 @@ If the configuration doesn't seem to take effect:
 
 For issues or feedback about the CockroachDB Docs MCP Server:
 
-- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- Report documentation issues through the feedback widget on any docs page
 - Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
 
 ## See Also
diff --git a/src/current/v23.1/build-a-java-app-with-cockroachdb-jooq.md b/src/current/v23.1/build-a-java-app-with-cockroachdb-jooq.md
index 7701e284e1c..b4f4c8899f2 100644
--- a/src/current/v23.1/build-a-java-app-with-cockroachdb-jooq.md
+++ b/src/current/v23.1/build-a-java-app-with-cockroachdb-jooq.md
@@ -88,7 +88,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
 1. Open `jooq-basic-sample/src/main/java/com/cockroachlabs/Sample.java`, and edit the connection string passed to `DriverManager.getConnection()` in the `Sample` class's `main()` method so that the certificate paths are fully and correctly specified.
 1. Compile and run the code using Maven:
 
@@ -107,7 +107,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
@@ -186,7 +186,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
 1. Compile and run the code using Maven:
 
     {% include_cached copy-clipboard.html %}
@@ -204,7 +204,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
diff --git a/src/current/v23.1/community-tooling.md b/src/current/v23.1/community-tooling.md
index e1c5fa46702..f816576851b 100644
--- a/src/current/v23.1/community-tooling.md
+++ b/src/current/v23.1/community-tooling.md
@@ -10,7 +10,7 @@ The following tools have been tested or developed by the CockroachDB community,
 If you encounter problems with using these tools, please contact the maintainer of the tool with details.
 
 {{site.data.alerts.callout_success}}
-If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please [open a pull request to our docs GitHub repository](https://github.com/cockroachdb/docs/edit/master/v21.2/community-tooling.md).
+If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please contact the [Cockroach Labs documentation team](https://support.cockroachlabs.com/).
 {{site.data.alerts.end}}
 
 ## Drivers and data access frameworks
diff --git a/src/current/v23.1/docs-mcp-integration.md b/src/current/v23.1/docs-mcp-integration.md
index 19aaac0b955..6456d75c32d 100644
--- a/src/current/v23.1/docs-mcp-integration.md
+++ b/src/current/v23.1/docs-mcp-integration.md
@@ -183,7 +183,7 @@ If the configuration doesn't seem to take effect:
 
 For issues or feedback about the CockroachDB Docs MCP Server:
 
-- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- Report documentation issues through the feedback widget on any docs page
 - Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
 
 ## See Also
diff --git a/src/current/v23.2/build-a-java-app-with-cockroachdb-jooq.md b/src/current/v23.2/build-a-java-app-with-cockroachdb-jooq.md
index 7701e284e1c..b4f4c8899f2 100644
--- a/src/current/v23.2/build-a-java-app-with-cockroachdb-jooq.md
+++ b/src/current/v23.2/build-a-java-app-with-cockroachdb-jooq.md
@@ -88,7 +88,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
 1. Open `jooq-basic-sample/src/main/java/com/cockroachlabs/Sample.java`, and edit the connection string passed to `DriverManager.getConnection()` in the `Sample` class's `main()` method so that the certificate paths are fully and correctly specified.
 1. Compile and run the code using Maven:
 
@@ -107,7 +107,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
@@ -186,7 +186,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
 1. Compile and run the code using Maven:
 
     {% include_cached copy-clipboard.html %}
@@ -204,7 +204,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
diff --git a/src/current/v23.2/community-tooling.md b/src/current/v23.2/community-tooling.md
index e1c5fa46702..f816576851b 100644
--- a/src/current/v23.2/community-tooling.md
+++ b/src/current/v23.2/community-tooling.md
@@ -10,7 +10,7 @@ The following tools have been tested or developed by the CockroachDB community,
 If you encounter problems with using these tools, please contact the maintainer of the tool with details.
 
 {{site.data.alerts.callout_success}}
-If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please [open a pull request to our docs GitHub repository](https://github.com/cockroachdb/docs/edit/master/v21.2/community-tooling.md).
+If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please contact the [Cockroach Labs documentation team](https://support.cockroachlabs.com/).
 {{site.data.alerts.end}}
 
 ## Drivers and data access frameworks
diff --git a/src/current/v23.2/docs-mcp-integration.md b/src/current/v23.2/docs-mcp-integration.md
index 19aaac0b955..6456d75c32d 100644
--- a/src/current/v23.2/docs-mcp-integration.md
+++ b/src/current/v23.2/docs-mcp-integration.md
@@ -183,7 +183,7 @@ If the configuration doesn't seem to take effect:
 
 For issues or feedback about the CockroachDB Docs MCP Server:
 
-- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- Report documentation issues through the feedback widget on any docs page
 - Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
 
 ## See Also
diff --git a/src/current/v24.1/build-a-java-app-with-cockroachdb-jooq.md b/src/current/v24.1/build-a-java-app-with-cockroachdb-jooq.md
index 7701e284e1c..b4f4c8899f2 100644
--- a/src/current/v24.1/build-a-java-app-with-cockroachdb-jooq.md
+++ b/src/current/v24.1/build-a-java-app-with-cockroachdb-jooq.md
@@ -88,7 +88,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
 1. Open `jooq-basic-sample/src/main/java/com/cockroachlabs/Sample.java`, and edit the connection string passed to `DriverManager.getConnection()` in the `Sample` class's `main()` method so that the certificate paths are fully and correctly specified.
 1. Compile and run the code using Maven:
 
@@ -107,7 +107,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
@@ -186,7 +186,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
 1. Compile and run the code using Maven:
 
     {% include_cached copy-clipboard.html %}
@@ -204,7 +204,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
diff --git a/src/current/v24.1/community-tooling.md b/src/current/v24.1/community-tooling.md
index e1c5fa46702..f816576851b 100644
--- a/src/current/v24.1/community-tooling.md
+++ b/src/current/v24.1/community-tooling.md
@@ -10,7 +10,7 @@ The following tools have been tested or developed by the CockroachDB community,
 If you encounter problems with using these tools, please contact the maintainer of the tool with details.
 
 {{site.data.alerts.callout_success}}
-If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please [open a pull request to our docs GitHub repository](https://github.com/cockroachdb/docs/edit/master/v21.2/community-tooling.md).
+If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please contact the [Cockroach Labs documentation team](https://support.cockroachlabs.com/).
 {{site.data.alerts.end}}
 
 ## Drivers and data access frameworks
diff --git a/src/current/v24.1/docs-mcp-integration.md b/src/current/v24.1/docs-mcp-integration.md
index 19aaac0b955..6456d75c32d 100644
--- a/src/current/v24.1/docs-mcp-integration.md
+++ b/src/current/v24.1/docs-mcp-integration.md
@@ -183,7 +183,7 @@ If the configuration doesn't seem to take effect:
 
 For issues or feedback about the CockroachDB Docs MCP Server:
 
-- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- Report documentation issues through the feedback widget on any docs page
 - Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
 
 ## See Also
diff --git a/src/current/v24.2/build-a-java-app-with-cockroachdb-jooq.md b/src/current/v24.2/build-a-java-app-with-cockroachdb-jooq.md
index 9cc7c07ccf1..3c762bf8b7f 100644
--- a/src/current/v24.2/build-a-java-app-with-cockroachdb-jooq.md
+++ b/src/current/v24.2/build-a-java-app-with-cockroachdb-jooq.md
@@ -88,7 +88,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
 1. Open `jooq-basic-sample/src/main/java/com/cockroachlabs/Sample.java`, and edit the connection string passed to `DriverManager.getConnection()` in the `Sample` class's `main()` method so that the certificate paths are fully and correctly specified.
 1. Compile and run the code using Maven:
 
@@ -107,7 +107,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
@@ -186,7 +186,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
 1. Compile and run the code using Maven:
 
     {% include_cached copy-clipboard.html %}
@@ -204,7 +204,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
diff --git a/src/current/v24.2/community-tooling.md b/src/current/v24.2/community-tooling.md
index e1c5fa46702..f816576851b 100644
--- a/src/current/v24.2/community-tooling.md
+++ b/src/current/v24.2/community-tooling.md
@@ -10,7 +10,7 @@ The following tools have been tested or developed by the CockroachDB community,
 If you encounter problems with using these tools, please contact the maintainer of the tool with details.
 
 {{site.data.alerts.callout_success}}
-If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please [open a pull request to our docs GitHub repository](https://github.com/cockroachdb/docs/edit/master/v21.2/community-tooling.md).
+If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please contact the [Cockroach Labs documentation team](https://support.cockroachlabs.com/).
 {{site.data.alerts.end}}
 
 ## Drivers and data access frameworks
diff --git a/src/current/v24.2/docs-mcp-integration.md b/src/current/v24.2/docs-mcp-integration.md
index 19aaac0b955..6456d75c32d 100644
--- a/src/current/v24.2/docs-mcp-integration.md
+++ b/src/current/v24.2/docs-mcp-integration.md
@@ -183,7 +183,7 @@ If the configuration doesn't seem to take effect:
 
 For issues or feedback about the CockroachDB Docs MCP Server:
 
-- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- Report documentation issues through the feedback widget on any docs page
 - Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
 
 ## See Also
diff --git a/src/current/v24.3/build-a-java-app-with-cockroachdb-jooq.md b/src/current/v24.3/build-a-java-app-with-cockroachdb-jooq.md
index 9cc7c07ccf1..3c762bf8b7f 100644
--- a/src/current/v24.3/build-a-java-app-with-cockroachdb-jooq.md
+++ b/src/current/v24.3/build-a-java-app-with-cockroachdb-jooq.md
@@ -88,7 +88,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
 1. Open `jooq-basic-sample/src/main/java/com/cockroachlabs/Sample.java`, and edit the connection string passed to `DriverManager.getConnection()` in the `Sample` class's `main()` method so that the certificate paths are fully and correctly specified.
 1. Compile and run the code using Maven:
 
@@ -107,7 +107,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
@@ -186,7 +186,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
 1. Compile and run the code using Maven:
 
     {% include_cached copy-clipboard.html %}
@@ -204,7 +204,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
diff --git a/src/current/v24.3/community-tooling.md b/src/current/v24.3/community-tooling.md
index e1c5fa46702..f816576851b 100644
--- a/src/current/v24.3/community-tooling.md
+++ b/src/current/v24.3/community-tooling.md
@@ -10,7 +10,7 @@ The following tools have been tested or developed by the CockroachDB community,
 If you encounter problems with using these tools, please contact the maintainer of the tool with details.
 
 {{site.data.alerts.callout_success}}
-If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please [open a pull request to our docs GitHub repository](https://github.com/cockroachdb/docs/edit/master/v21.2/community-tooling.md).
+If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please contact the [Cockroach Labs documentation team](https://support.cockroachlabs.com/).
 {{site.data.alerts.end}}
 
 ## Drivers and data access frameworks
diff --git a/src/current/v24.3/docs-mcp-integration.md b/src/current/v24.3/docs-mcp-integration.md
index 19aaac0b955..6456d75c32d 100644
--- a/src/current/v24.3/docs-mcp-integration.md
+++ b/src/current/v24.3/docs-mcp-integration.md
@@ -183,7 +183,7 @@ If the configuration doesn't seem to take effect:
 
 For issues or feedback about the CockroachDB Docs MCP Server:
 
-- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- Report documentation issues through the feedback widget on any docs page
 - Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
 
 ## See Also
diff --git a/src/current/v25.1/build-a-java-app-with-cockroachdb-jooq.md b/src/current/v25.1/build-a-java-app-with-cockroachdb-jooq.md
index 9cc7c07ccf1..3c762bf8b7f 100644
--- a/src/current/v25.1/build-a-java-app-with-cockroachdb-jooq.md
+++ b/src/current/v25.1/build-a-java-app-with-cockroachdb-jooq.md
@@ -88,7 +88,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
 1. Open `jooq-basic-sample/src/main/java/com/cockroachlabs/Sample.java`, and edit the connection string passed to `DriverManager.getConnection()` in the `Sample` class's `main()` method so that the certificate paths are fully and correctly specified.
 1. Compile and run the code using Maven:
 
@@ -107,7 +107,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
@@ -186,7 +186,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
 1. Compile and run the code using Maven:
 
     {% include_cached copy-clipboard.html %}
@@ -204,7 +204,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
diff --git a/src/current/v25.1/community-tooling.md b/src/current/v25.1/community-tooling.md
index e1c5fa46702..f816576851b 100644
--- a/src/current/v25.1/community-tooling.md
+++ b/src/current/v25.1/community-tooling.md
@@ -10,7 +10,7 @@ The following tools have been tested or developed by the CockroachDB community,
 If you encounter problems with using these tools, please contact the maintainer of the tool with details.
 
 {{site.data.alerts.callout_success}}
-If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please [open a pull request to our docs GitHub repository](https://github.com/cockroachdb/docs/edit/master/v21.2/community-tooling.md).
+If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please contact the [Cockroach Labs documentation team](https://support.cockroachlabs.com/).
 {{site.data.alerts.end}}
 
 ## Drivers and data access frameworks
diff --git a/src/current/v25.1/docs-mcp-integration.md b/src/current/v25.1/docs-mcp-integration.md
index 19aaac0b955..6456d75c32d 100644
--- a/src/current/v25.1/docs-mcp-integration.md
+++ b/src/current/v25.1/docs-mcp-integration.md
@@ -183,7 +183,7 @@ If the configuration doesn't seem to take effect:
 
 For issues or feedback about the CockroachDB Docs MCP Server:
 
-- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- Report documentation issues through the feedback widget on any docs page
 - Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
 
 ## See Also
diff --git a/src/current/v25.2/build-a-java-app-with-cockroachdb-jooq.md b/src/current/v25.2/build-a-java-app-with-cockroachdb-jooq.md
index 9cc7c07ccf1..3c762bf8b7f 100644
--- a/src/current/v25.2/build-a-java-app-with-cockroachdb-jooq.md
+++ b/src/current/v25.2/build-a-java-app-with-cockroachdb-jooq.md
@@ -88,7 +88,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
 1. Open `jooq-basic-sample/src/main/java/com/cockroachlabs/Sample.java`, and edit the connection string passed to `DriverManager.getConnection()` in the `Sample` class's `main()` method so that the certificate paths are fully and correctly specified.
 1. Compile and run the code using Maven:
 
@@ -107,7 +107,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
@@ -186,7 +186,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
 1. Compile and run the code using Maven:
 
     {% include_cached copy-clipboard.html %}
@@ -204,7 +204,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
diff --git a/src/current/v25.2/community-tooling.md b/src/current/v25.2/community-tooling.md
index e1c5fa46702..f816576851b 100644
--- a/src/current/v25.2/community-tooling.md
+++ b/src/current/v25.2/community-tooling.md
@@ -10,7 +10,7 @@ The following tools have been tested or developed by the CockroachDB community,
 If you encounter problems with using these tools, please contact the maintainer of the tool with details.
 
 {{site.data.alerts.callout_success}}
-If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please [open a pull request to our docs GitHub repository](https://github.com/cockroachdb/docs/edit/master/v21.2/community-tooling.md).
+If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please contact the [Cockroach Labs documentation team](https://support.cockroachlabs.com/).
 {{site.data.alerts.end}}
 
 ## Drivers and data access frameworks
diff --git a/src/current/v25.2/docs-mcp-integration.md b/src/current/v25.2/docs-mcp-integration.md
index 19aaac0b955..6456d75c32d 100644
--- a/src/current/v25.2/docs-mcp-integration.md
+++ b/src/current/v25.2/docs-mcp-integration.md
@@ -183,7 +183,7 @@ If the configuration doesn't seem to take effect:
 
 For issues or feedback about the CockroachDB Docs MCP Server:
 
-- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- Report documentation issues through the feedback widget on any docs page
 - Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
 
 ## See Also
diff --git a/src/current/v25.3/build-a-java-app-with-cockroachdb-jooq.md b/src/current/v25.3/build-a-java-app-with-cockroachdb-jooq.md
index 9cc7c07ccf1..3c762bf8b7f 100644
--- a/src/current/v25.3/build-a-java-app-with-cockroachdb-jooq.md
+++ b/src/current/v25.3/build-a-java-app-with-cockroachdb-jooq.md
@@ -88,7 +88,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
 1. Open `jooq-basic-sample/src/main/java/com/cockroachlabs/Sample.java`, and edit the connection string passed to `DriverManager.getConnection()` in the `Sample` class's `main()` method so that the certificate paths are fully and correctly specified.
 1. Compile and run the code using Maven:
 
@@ -107,7 +107,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
@@ -186,7 +186,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
 1. Compile and run the code using Maven:
 
     {% include_cached copy-clipboard.html %}
@@ -204,7 +204,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
diff --git a/src/current/v25.3/community-tooling.md b/src/current/v25.3/community-tooling.md
index e1c5fa46702..f816576851b 100644
--- a/src/current/v25.3/community-tooling.md
+++ b/src/current/v25.3/community-tooling.md
@@ -10,7 +10,7 @@ The following tools have been tested or developed by the CockroachDB community,
 If you encounter problems with using these tools, please contact the maintainer of the tool with details.
 
 {{site.data.alerts.callout_success}}
-If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please [open a pull request to our docs GitHub repository](https://github.com/cockroachdb/docs/edit/master/v21.2/community-tooling.md).
+If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please contact the [Cockroach Labs documentation team](https://support.cockroachlabs.com/).
 {{site.data.alerts.end}}
 
 ## Drivers and data access frameworks
diff --git a/src/current/v25.3/docs-mcp-integration.md b/src/current/v25.3/docs-mcp-integration.md
index 19aaac0b955..6456d75c32d 100644
--- a/src/current/v25.3/docs-mcp-integration.md
+++ b/src/current/v25.3/docs-mcp-integration.md
@@ -183,7 +183,7 @@ If the configuration doesn't seem to take effect:
 
 For issues or feedback about the CockroachDB Docs MCP Server:
 
-- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- Report documentation issues through the feedback widget on any docs page
 - Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
 
 ## See Also
diff --git a/src/current/v25.4/build-a-java-app-with-cockroachdb-jooq.md b/src/current/v25.4/build-a-java-app-with-cockroachdb-jooq.md
index 9cc7c07ccf1..3c762bf8b7f 100644
--- a/src/current/v25.4/build-a-java-app-with-cockroachdb-jooq.md
+++ b/src/current/v25.4/build-a-java-app-with-cockroachdb-jooq.md
@@ -88,7 +88,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
 1. Open `jooq-basic-sample/src/main/java/com/cockroachlabs/Sample.java`, and edit the connection string passed to `DriverManager.getConnection()` in the `Sample` class's `main()` method so that the certificate paths are fully and correctly specified.
 1. Compile and run the code using Maven:
 
@@ -107,7 +107,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
@@ -186,7 +186,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
 1. Compile and run the code using Maven:
 
     {% include_cached copy-clipboard.html %}
@@ -204,7 +204,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
diff --git a/src/current/v25.4/community-tooling.md b/src/current/v25.4/community-tooling.md
index e1c5fa46702..f816576851b 100644
--- a/src/current/v25.4/community-tooling.md
+++ b/src/current/v25.4/community-tooling.md
@@ -10,7 +10,7 @@ The following tools have been tested or developed by the CockroachDB community,
 If you encounter problems with using these tools, please contact the maintainer of the tool with details.
 
 {{site.data.alerts.callout_success}}
-If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please [open a pull request to our docs GitHub repository](https://github.com/cockroachdb/docs/edit/master/v21.2/community-tooling.md).
+If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please contact the [Cockroach Labs documentation team](https://support.cockroachlabs.com/).
 {{site.data.alerts.end}}
 
 ## Drivers and data access frameworks
diff --git a/src/current/v25.4/docs-mcp-integration.md b/src/current/v25.4/docs-mcp-integration.md
index 19aaac0b955..6456d75c32d 100644
--- a/src/current/v25.4/docs-mcp-integration.md
+++ b/src/current/v25.4/docs-mcp-integration.md
@@ -183,7 +183,7 @@ If the configuration doesn't seem to take effect:
 
 For issues or feedback about the CockroachDB Docs MCP Server:
 
-- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- Report documentation issues through the feedback widget on any docs page
 - Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
 
 ## See Also
diff --git a/src/current/v26.1/build-a-java-app-with-cockroachdb-jooq.md b/src/current/v26.1/build-a-java-app-with-cockroachdb-jooq.md
index 9cc7c07ccf1..3c762bf8b7f 100644
--- a/src/current/v26.1/build-a-java-app-with-cockroachdb-jooq.md
+++ b/src/current/v26.1/build-a-java-app-with-cockroachdb-jooq.md
@@ -88,7 +88,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
 1. Open `jooq-basic-sample/src/main/java/com/cockroachlabs/Sample.java`, and edit the connection string passed to `DriverManager.getConnection()` in the `Sample` class's `main()` method so that the certificate paths are fully and correctly specified.
 1. Compile and run the code using Maven:
 
@@ -107,7 +107,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
@@ -186,7 +186,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
 1. Compile and run the code using Maven:
 
     {% include_cached copy-clipboard.html %}
@@ -204,7 +204,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
diff --git a/src/current/v26.1/community-tooling.md b/src/current/v26.1/community-tooling.md
index a0a6ceff0ab..98c1ea312cd 100644
--- a/src/current/v26.1/community-tooling.md
+++ b/src/current/v26.1/community-tooling.md
@@ -10,7 +10,7 @@ The following tools have been tested or developed by the CockroachDB community,
 If you encounter problems with using these tools, please contact the maintainer of the tool with details.
 
 {{site.data.alerts.callout_success}}
-If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please [open a pull request to our docs GitHub repository](https://github.com/cockroachdb/docs/edit/master/v21.2/community-tooling.md).
+If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please contact the [Cockroach Labs documentation team](https://support.cockroachlabs.com/).
 {{site.data.alerts.end}}
 
 ## Drivers and data access frameworks
diff --git a/src/current/v26.1/docs-mcp-integration.md b/src/current/v26.1/docs-mcp-integration.md
index 19aaac0b955..6456d75c32d 100644
--- a/src/current/v26.1/docs-mcp-integration.md
+++ b/src/current/v26.1/docs-mcp-integration.md
@@ -183,7 +183,7 @@ If the configuration doesn't seem to take effect:
 
 For issues or feedback about the CockroachDB Docs MCP Server:
 
-- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- Report documentation issues through the feedback widget on any docs page
 - Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
 
 ## See Also
diff --git a/src/current/v26.2/build-a-java-app-with-cockroachdb-jooq.md b/src/current/v26.2/build-a-java-app-with-cockroachdb-jooq.md
index 9cc7c07ccf1..3c762bf8b7f 100644
--- a/src/current/v26.2/build-a-java-app-with-cockroachdb-jooq.md
+++ b/src/current/v26.2/build-a-java-app-with-cockroachdb-jooq.md
@@ -88,7 +88,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
 1. Open `jooq-basic-sample/src/main/java/com/cockroachlabs/Sample.java`, and edit the connection string passed to `DriverManager.getConnection()` in the `Sample` class's `main()` method so that the certificate paths are fully and correctly specified.
 1. Compile and run the code using Maven:
 
@@ -107,7 +107,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
@@ -186,7 +186,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
 1. Compile and run the code using Maven:
 
     {% include_cached copy-clipboard.html %}
@@ -204,7 +204,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
diff --git a/src/current/v26.2/community-tooling.md b/src/current/v26.2/community-tooling.md
index a0a6ceff0ab..98c1ea312cd 100644
--- a/src/current/v26.2/community-tooling.md
+++ b/src/current/v26.2/community-tooling.md
@@ -10,7 +10,7 @@ The following tools have been tested or developed by the CockroachDB community,
 If you encounter problems with using these tools, please contact the maintainer of the tool with details.
 
 {{site.data.alerts.callout_success}}
-If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please [open a pull request to our docs GitHub repository](https://github.com/cockroachdb/docs/edit/master/v21.2/community-tooling.md).
+If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please contact the [Cockroach Labs documentation team](https://support.cockroachlabs.com/).
 {{site.data.alerts.end}}
 
 ## Drivers and data access frameworks
diff --git a/src/current/v26.2/docs-mcp-integration.md b/src/current/v26.2/docs-mcp-integration.md
index 19aaac0b955..6456d75c32d 100644
--- a/src/current/v26.2/docs-mcp-integration.md
+++ b/src/current/v26.2/docs-mcp-integration.md
@@ -183,7 +183,7 @@ If the configuration doesn't seem to take effect:
 
 For issues or feedback about the CockroachDB Docs MCP Server:
 
-- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- Report documentation issues through the feedback widget on any docs page
 - Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
 
 ## See Also
diff --git a/src/current/v26.3/build-a-java-app-with-cockroachdb-jooq.md b/src/current/v26.3/build-a-java-app-with-cockroachdb-jooq.md
index 9cc7c07ccf1..3c762bf8b7f 100644
--- a/src/current/v26.3/build-a-java-app-with-cockroachdb-jooq.md
+++ b/src/current/v26.3/build-a-java-app-with-cockroachdb-jooq.md
@@ -88,7 +88,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/jooq-basic-sample/jooq-basic-sample.zip).
 1. Open `jooq-basic-sample/src/main/java/com/cockroachlabs/Sample.java`, and edit the connection string passed to `DriverManager.getConnection()` in the `Sample` class's `main()` method so that the certificate paths are fully and correctly specified.
 1. Compile and run the code using Maven:
 
@@ -107,7 +107,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
@@ -186,7 +186,7 @@ In addition, the code shows a pattern for automatically handling [transaction re
 
 To run it:
 
-1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachdb/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
+1. Download and unzip [jooq-basic-sample.zip](https://github.com/cockroachlabs/docs/raw/master/_includes/{{ page.version.version }}/app/insecure/jooq-basic-sample/jooq-basic-sample.zip).
 1. Compile and run the code using Maven:
 
     {% include_cached copy-clipboard.html %}
@@ -204,7 +204,7 @@ To run it:
     $ mvn exec:java -Dexec.mainClass=com.cockroachlabs.Sample
     ~~~
 
-Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachdb/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
+Here are the contents of [`Sample.java`](https://raw.githubusercontent.com/cockroachlabs/docs/master/_includes/{{page.version.version}}/app/insecure/jooq-basic-sample/Sample.java), the Java file containing the main `Sample` class:
 
 {% include_cached copy-clipboard.html %}
 ~~~ java
diff --git a/src/current/v26.3/community-tooling.md b/src/current/v26.3/community-tooling.md
index a0a6ceff0ab..98c1ea312cd 100644
--- a/src/current/v26.3/community-tooling.md
+++ b/src/current/v26.3/community-tooling.md
@@ -10,7 +10,7 @@ The following tools have been tested or developed by the CockroachDB community,
 If you encounter problems with using these tools, please contact the maintainer of the tool with details.
 
 {{site.data.alerts.callout_success}}
-If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please [open a pull request to our docs GitHub repository](https://github.com/cockroachdb/docs/edit/master/v21.2/community-tooling.md).
+If you have a tested or developed a third-party tool with CockroachDB, and would like it listed on this page, please contact the [Cockroach Labs documentation team](https://support.cockroachlabs.com/).
 {{site.data.alerts.end}}
 
 ## Drivers and data access frameworks
diff --git a/src/current/v26.3/docs-mcp-integration.md b/src/current/v26.3/docs-mcp-integration.md
index 19aaac0b955..6456d75c32d 100644
--- a/src/current/v26.3/docs-mcp-integration.md
+++ b/src/current/v26.3/docs-mcp-integration.md
@@ -183,7 +183,7 @@ If the configuration doesn't seem to take effect:
 
 For issues or feedback about the CockroachDB Docs MCP Server:
 
-- Report documentation issues on [GitHub](https://github.com/cockroachdb/docs/issues)
+- Report documentation issues through the feedback widget on any docs page
 - Join the [CockroachDB Community Slack](https://www.cockroachlabs.com/join-community/) for help
 
 ## See Also