diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 0ffb1e7c1cd..5f95d77e1cd 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -5,10 +5,10 @@ about: Create a report to help us improve
 
 <!--
 
-Thank you for reporting a bug in InfluxDB IOx. 
+Thank you for reporting a bug in InfluxDB IOx.
 
 Have you read the contributing section of the README? Please do if you haven't.
-https://github.com/influxdata/influxdb_iox/blob/main/README.md
+https://github.com/influxdata/influxdb/blob/main/README.md
 
 * Please ask usage questions in the Influx Slack (there is an #influxdb-iox channel).
     * https://influxdata.com/slack
diff --git a/.github/ISSUE_TEMPLATE/developer_experience.md b/.github/ISSUE_TEMPLATE/developer_experience.md
index fb79ba10d41..987ad619c8e 100644
--- a/.github/ISSUE_TEMPLATE/developer_experience.md
+++ b/.github/ISSUE_TEMPLATE/developer_experience.md
@@ -7,7 +7,7 @@ about: Tell us about slow builds, tests, and code editing
 Thank you for sharing your development experience concerns with the InfluxDB IOx team.
 
 Have your read the contributing guide?
-https://github.com/influxdata/influxdb_iox/blob/main/CONTRIBUTING.md
+https://github.com/influxdata/influxdb/blob/main/CONTRIBUTING.md
 
 We welcome your thoughts and feedback on the IOx developer experience.
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 3ae0df3029a..08617fa8f4e 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -5,10 +5,10 @@ about: Opening a feature request kicks off a discussion
 
 <!--
 
-Thank you for suggesting an idea to improve InfluxDB IOx. 
+Thank you for suggesting an idea to improve InfluxDB IOx.
 
 Have you read the contributing section of the README? Please do if you haven't.
-https://github.com/influxdata/influxdb_iox/blob/main/README.md
+https://github.com/influxdata/influxdb/blob/main/README.md
 
 * Please ask usage questions in the Influx Slack (there is an #influxdb-iox channel).
     * https://influxdata.com/slack
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ac95532e18d..ec003d26881 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,5 +2,5 @@ Closes #
 
 Describe your proposed changes here.
 
-- [ ] I've read the contributing section of the project [README](https://github.com/influxdata/influxdb_iox/blob/main/README.md).
+- [ ] I've read the contributing section of the project [README](https://github.com/influxdata/influxdb/blob/main/README.md).
 - [ ] Signed [CLA](https://influxdata.com/community/cla/) (if not already signed).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index de5a6616b37..f296fe1fc5a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -28,8 +28,8 @@ As well as bug reports we also welcome feature requests (there is a dedicated is
 Typically, the maintainers will periodically review community feature requests and make decisions about if we want to add them.
 For features we don't plan to support we will close the feature request ticket (so, again, please check closed tickets for feature requests before submitting them).
 
-[issue]: https://github.com/influxdata/influxdb_iox/issues/new
-[New Issue]: https://github.com/influxdata/influxdb_iox/issues/new
+[issue]: https://github.com/influxdata/influxdb/issues/new
+[New Issue]: https://github.com/influxdata/influxdb/issues/new
 [How to Report Bugs Effectively]: https://www.chiark.greenend.org.uk/~sgtatham/bugs.html
 
 ## Contributing Changes
@@ -41,12 +41,12 @@ All code must adhere to the `rustfmt` format, and pass all of the `clippy` check
 
 ### Finding Issues To Work On
 
-The [good first issue](https://github.com/influxdata/influxdb_iox/labels/good%20first%20issue) and the [help wanted](https://github.com/influxdata/influxdb_iox/labels/help%20wanted) labels are used to identify issues where we encourage community contributions.
+The [good first issue](https://github.com/influxdata/influxdb/issues?q=is%3Aopen+is%3Aissue+label%3Agood-first-issue) and the [help wanted](https://github.com/influxdata/influxdb/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted) labels are used to identify issues where we encourage community contributions.
 They both indicate issues for which we would welcome independent community contributions, but the former indicates a sub-set of these that are especially good for first-time contributors.
 If you want some clarifications or guidance for working on one of these issues, or you simply want to let others know that you're working on one, please leave a comment on the ticket.
 
-[good first issue]: https://github.com/influxdata/influxdb_iox/labels/good%20first%20issue
-[help wanted]: https://github.com/influxdata/influxdb_iox/labels/help%20wanted
+[good first issue]: https://github.com/influxdata/influxdb/issues?q=is%3Aopen+is%3Aissue+label%3Agood-first-issue
+[help wanted]: https://github.com/influxdata/influxdb/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted
 
 ### Bigger Changes
 
@@ -67,7 +67,7 @@ Further, please don't expect us to accept significant changes without new test c
 ### Making a PR
 
 To open a PR you will need to have a Github account.
-Fork the `influxdb_iox` repo and work on a branch on your fork.
+Fork the `influxdb` repo and work on a branch on your fork.
 When you have completed your changes, or you want some incremental feedback make a Pull Request to InfluxDB IOx [here].
 
 If you want to discuss some work in progress then please prefix `[WIP]` to the
@@ -88,7 +88,7 @@ There are some tips on verifying the above in the [next section](#running-tests)
 * ask for help on the PR if any of the status checks are 🔴, and you don't know why;
 * wait patiently for one of the team to review your PR, which could take a few days.
 
-[here]: https://github.com/influxdata/influxdb_iox/compare
+[here]: https://github.com/influxdata/influxdb/compare
 [Conventional Commits]: https://www.conventionalcommits.org/en/v1.0.0/
 
 ## Running Tests