diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 86c17d6..b37532a 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -12,6 +12,6 @@ submitted for review via the Gerrit tool:
 
 Pull requests submitted through GitHub will be ignored.
 
-Bugs should be filed on OpenStack Storyboard, not GitHub:
+Bugs should be filed on Launchpad, not GitHub or Storyboard:
 
-   https://storyboard.openstack.org/#!/project/911
+   https://bugs.launchpad.net/octavia
diff --git a/README.rst b/README.rst
index 1229c91..f53b05a 100644
--- a/README.rst
+++ b/README.rst
@@ -24,7 +24,7 @@ https://docs.openstack.org/python-openstackclient/latest/
 * Documentation: https://docs.openstack.org/python-octaviaclient/latest/
 * Source: https://opendev.org/openstack/python-octaviaclient
 * Release notes: https://docs.openstack.org/releasenotes/python-octaviaclient/
-* Bugs: https://storyboard.openstack.org/#!/project/911
+* Bugs: https://bugs.launchpad.net/octavia
 
 Getting Started
 ===============
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 9364ddf..b81f9e1 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -54,7 +54,8 @@ pygments_style = 'native'
 # openstackdocstheme options
 openstackdocs_repo_name = 'openstack/python-octaviaclient'
 openstackdocs_pdf_link = True
-openstackdocs_use_storyboard = True
+openstackdocs_bug_project = 'octavia'
+openstackdocs_bug_tag = 'docs'
 
 autoprogram_cliff_application = 'openstack'
 
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 2876d76..8c21288 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -44,7 +44,8 @@ extensions = [
 
 # openstackdocstheme options
 openstackdocs_repo_name = 'openstack/python-octaviaclient'
-openstackdocs_use_storyboard = True
+openstackdocs_bug_project = 'octavia'
+openstackdocs_bug_tag = 'docs'
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']