diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index be71810e2..790776c3e 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -33,10 +33,10 @@ Project Documentation
     https://docs.openstack.org/openstacksdk/latest/
 
 Bug tracker
-    https://storyboard.openstack.org/#!/project/openstack/openstacksdk
+    https://bugs.launchpad.net/openstacksdk
 
 Mailing list (prefix subjects with ``[sdk]`` for faster responses)
-    http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss
+    https://lists.openstack.org/mailman3/lists/openstack-discuss.lists.openstack.org/
 
 Code Hosting
     https://opendev.org/openstack/openstacksdk
diff --git a/README.rst b/README.rst
index c3d8a3a67..a3a062569 100644
--- a/README.rst
+++ b/README.rst
@@ -305,9 +305,9 @@ OpenStack service can be found in the `Project Navigator`__.
 Links
 -----
 
-* `Issue Tracker <https://storyboard.openstack.org/#!/project/openstack/openstacksdk>`_
+* `Issue Tracker <https://bugs.launchpad.net/openstacksdk>`_
 * `Code Review <https://review.opendev.org/#/q/status:open+project:openstack/openstacksdk,n,z>`_
 * `Documentation <https://docs.openstack.org/openstacksdk/latest/>`_
 * `PyPI <https://pypi.org/project/openstacksdk/>`_
-* `Mailing list <http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss>`_
+* `Mailing list <https://lists.openstack.org/mailman3/lists/openstack-discuss.lists.openstack.org/>`_
 * `Release Notes <https://docs.openstack.org/releasenotes/openstacksdk>`_
diff --git a/doc/source/conf.py b/doc/source/conf.py
index ec4dab832..b41ba20d9 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -31,7 +31,7 @@ extensions = [
 # openstackdocstheme options
 openstackdocs_repo_name = 'openstack/openstacksdk'
 openstackdocs_pdf_link = True
-openstackdocs_use_storyboard = True
+openstackdocs_use_storyboard = False
 html_theme = 'openstackdocs'
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index c434441fd..ac4be8e19 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -44,7 +44,7 @@ extensions = [
 
 # openstackdocstheme options
 openstackdocs_repo_name = 'openstack/openstacksdk'
-openstackdocs_use_storyboard = True
+openstackdocs_use_storyboard = False
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']