diff --git a/doc/requirements.txt b/doc/requirements.txt
index 4d7c9a3..4449d99 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,6 +1,5 @@
 # this is required for the docs build jobs
-sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
-sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
-openstackdocstheme>=1.20.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
 doc8>=0.8.0 # Apache-2.0
 sphinxcontrib-apidoc>=0.2.0  # BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 7e7d28c..91a68c2 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -15,8 +15,9 @@ apidoc_separate_modules = True
 
 
 # openstackdocstheme options
-repository_name = 'openstack/validations-libs'
-use_storyboard = True
+openstackdocs_repo_name = 'openstack/validations-libs'
+openstackdocs_pdf_link = True
+openstackdocs_use_storyboard = True
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
 # text edit cycles.
@@ -45,7 +46,7 @@ add_function_parentheses = True
 add_module_names = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # A list of glob-style patterns that should be excluded when looking for
 # source files. They are matched against the source file names relative to the
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 37036a4..abc6a65 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -51,7 +51,6 @@ msgpack==0.5.6
 munch==2.2.0
 netaddr==0.7.18
 netifaces==0.10.6
-openstackdocstheme==1.20.0
 openstacksdk==0.24.0
 os-client-config==1.29.0
 os-net-config==7.1.0
@@ -94,7 +93,6 @@ python-swiftclient==3.5.0
 python-zaqarclient==1.9.0
 pytz==2018.3
 PyYAML==3.12
-reno==2.5.0
 requests==2.18.4
 requestsexceptions==1.4.0
 rfc3986==1.1.0
@@ -102,9 +100,6 @@ simplejson==3.13.2
 six==1.11.0
 smmap2==2.0.3
 snowballstemmer==1.2.1
-Sphinx==1.8.0
-sphinxcontrib-apidoc==0.2.0
-sphinxcontrib-websupport==1.0.1
 stestr==1.0.0
 stevedore==1.28.0
 tenacity==5.0.1
diff --git a/test-requirements.txt b/test-requirements.txt
index 0d58bb5..eaa8652 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,13 +2,10 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-openstackdocstheme>=1.20.0 # Apache-2.0
 hacking>=3.0,<3.1.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx>=1.8.0,!=2.1.0 # BSD
-sphinxcontrib-apidoc>=0.2.0  # BSD
 stestr>=1.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT