diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index f7184200..177d691c 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,6 +1,6 @@
 blank_issues_enabled: false
 contact_links:
-  - name: OAuth2-Proxy Slack
-    url: https://gophers.slack.com/messages/CM2RSS25N
+  - name: OAuth2 Proxy Slack
+    url: https://cloud-native.slack.com/archives/C098Y5URZ2N
     about: Feel free to ask any questions here.
 
diff --git a/README.md b/README.md
index 88849cb9..0252f52b 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 
 OAuth2 Proxy is a flexible, open-source tool that can act as either a standalone reverse proxy or a middleware component integrated into existing reverse proxy or load balancer setups. It provides a simple and secure way to protect your web applications with OAuth2 / OIDC authentication. As a reverse proxy, it intercepts requests to your application and redirects users to an OAuth2 provider for authentication. As a middleware, it can be seamlessly integrated into your existing infrastructure to handle authentication for multiple applications.
 
-OAuth2 Proxy supports a lot of OAuth2 as well as OIDC providers. Either through a generic OIDC client or a specific implementation for Google, Microsoft Entra ID, GitHub, login.gov and others. Through specialised provider implementations oauth2-proxy can extract more details about the user like preferred usernames and groups. Those details can then be forwarded as HTTP headers to your upstream applications.
+OAuth2 Proxy supports a lot of OAuth2 as well as OIDC providers. Either through a generic OIDC client or a specific implementation for Google, Microsoft Entra ID, GitHub, login.gov and others. Through specialised provider implementations OAuth2 Proxy can extract more details about the user like preferred usernames and groups. Those details can then be forwarded as HTTP headers to your upstream applications.
 
 ![Simplified Architecture](docs/static/img/simplified-architecture.svg)
 
@@ -23,7 +23,7 @@ OAuth2 Proxy's [Installation Docs](https://oauth2-proxy.github.io/oauth2-proxy/i
 ## Releases
 
 ### Binaries
-We publish oauth2-proxy as compiled binaries on GitHub for all major architectures as well as more exotic ones like `ppc64le` as well as `s390x`.
+We publish OAuth2 Proxy as compiled binaries on GitHub for all major architectures as well as more exotic ones like `ppc64le` as well as `s390x`.
 
 Check out the [latest release](https://github.com/oauth2-proxy/oauth2-proxy/releases/latest).
 
@@ -49,9 +49,9 @@ SAP Open Source Program
 Microsoft Azure credits for open source projects
 
 ## Getting Involved
-[![Slack](https://img.shields.io/badge/slack-Gopher_%23oauth2--proxy-red?logo=slack)](https://gophers.slack.com/archives/CM2RSS25N)
+[![Slack](https://img.shields.io/badge/slack-CNCF_%23oauth2--proxy-blue?logo=slack)](https://cloud-native.slack.com/archives/C098Y5URZ2N)
 
-Join the #oauth2-proxy [Slack channel](https://gophers.slack.com/archives/CM2RSS25N) to chat with other users of oauth2-proxy or reach out to the maintainers directly. Use the [public invite link](https://invite.slack.golangbridge.org/) to get an invite for the Gopher Slack space.
+Join the #oauth2-proxy [Slack channel](https://cloud-native.slack.com/archives/C098Y5URZ2N) to chat with other users of OAuth2 Proxy or reach out to the maintainers directly. Use the [public invite link](https://communityinviter.com/apps/cloud-native/cncf) to get an invite for the Gopher Slack space.
 
 OAuth2 Proxy is a community-driven project. We rely on the contribut️ions of our users to continually improve it. While review times can vary, we appreciate your patience and understanding. As a volunteer-driven project, we strive to keep this project stable and might take longer to merge changes.
 
diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
index 5123f943..efe17b7b 100644
--- a/docs/docusaurus.config.js
+++ b/docs/docusaurus.config.js
@@ -105,7 +105,7 @@ const config = {
             dropdownActiveClassDisabled: true,
           },
           {
-            href: 'https://gophers.slack.com/messages/CM2RSS25N',
+            href: 'https://cloud-native.slack.com/archives/C098Y5URZ2N',
             label: 'Slack',
             position: 'right',
           },