diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 9d764b057..74b442ef6 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -9,13 +9,13 @@ to set up and use Gerrit:
 
    https://docs.openstack.org/contributors/code-and-documentation/quick-start.html
 
-Bugs should be filed on StoryBoard:
+Bugs should be filed on Launchpad:
 
-   https://launchpad.net/python-openstackclient
+   https://bugs.launchpad.net/python-openstackclient
 
 Developers should also join the discussion on the mailing list, at:
 
-  http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss
+  https://lists.openstack.org/mailman3/lists/openstack-discuss.lists.openstack.org/
 
 or join the IRC channel on
 
diff --git a/README.rst b/README.rst
index 7f31bcdbe..f526ec6ad 100644
--- a/README.rst
+++ b/README.rst
@@ -24,7 +24,7 @@ language to describe operations in OpenStack.
 
 * `PyPi`_ - package installation
 * `Online Documentation`_
-* `Storyboard project`_ - bugs and feature requests
+* `Launchpad project`_ - bugs and feature requests
 * `Blueprints`_ - feature specifications (historical only)
 * `Source`_
 * `Developer`_ - getting started as a developer
@@ -36,7 +36,7 @@ language to describe operations in OpenStack.
 .. _PyPi: https://pypi.org/project/python-openstackclient
 .. _Online Documentation: https://docs.openstack.org/python-openstackclient/latest/
 .. _Blueprints: https://blueprints.launchpad.net/python-openstackclient
-.. _`Storyboard project`: https://storyboard.openstack.org/#!/project/openstack/python-openstackclient
+.. _`Launchpad project`: https://bugs.launchpad.net/python-openstackclient
 .. _Source: https://opendev.org/openstack/python-openstackclient
 .. _Developer: https://docs.openstack.org/project-team-guide/project-setup/python.html
 .. _Contributing: https://docs.openstack.org/infra/manual/developers.html
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 3302cd3a7..2ad39ab62 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -53,7 +53,7 @@ extensions = [
 
 # openstackdocstheme options
 openstackdocs_repo_name = 'openstack/python-openstackclient'
-openstackdocs_use_storyboard = True
+openstackdocs_use_storyboard = False
 openstackdocs_auto_name = False
 
 # Set aliases for extlinks