diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 42206737..d478dbb3 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -19,7 +19,7 @@ contact_links:
 - name: >-
     [🎉 NEW 🎉]
     🤷💻🤦 GitHub Discussions
-  url: https://github.com/aio-libs/propcache/discussions
+  url: https://github.com/orgs/aio-libs/discussions
   about: >-
     Please ask typical Q&A in the Discussions tab or on StackOverflow
 - name: 🤷💻🤦 StackOverflow
diff --git a/CHANGES/217.doc.rst b/CHANGES/217.doc.rst
new file mode 100644
index 00000000..94b52efe
--- /dev/null
+++ b/CHANGES/217.doc.rst
@@ -0,0 +1,3 @@
+Updated discussion links from the defunct Google Groups forum to
+the ``aio-libs`` org-wide GitHub Discussions
+-- by :user:`gundalow`.
diff --git a/README.rst b/README.rst
index ce10fbf8..88996baf 100644
--- a/README.rst
+++ b/README.rst
@@ -82,7 +82,7 @@ or have some suggestion in order to improve the library.
 Discussion list
 ---------------
 
-*aio-libs* google group: https://groups.google.com/forum/#!forum/aio-libs
+*aio-libs* GitHub Discussions: https://github.com/orgs/aio-libs/discussions
 
 Feel free to post your questions and ideas here.
 
diff --git a/docs/index.rst b/docs/index.rst
index e4253d82..2551bf96 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -35,7 +35,7 @@ or have some suggestion in order to improve the library.
 Discussion list
 ---------------
 
-*aio-libs* google group: https://groups.google.com/forum/#!forum/aio-libs
+*aio-libs* GitHub Discussions: https://github.com/orgs/aio-libs/discussions
 
 Feel free to post your questions and ideas here.