diff --git a/.zuul.yaml b/.zuul.yaml
index f3848fbe..c11af82c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,7 +3,7 @@
       - openstack-specs-jobs
     check:
       jobs:
-        - openstack-tox-py27
+        - openstack-tox-py36
     gate:
       jobs:
-        - openstack-tox-py27
+        - openstack-tox-py36
diff --git a/doc/source/conf.py b/doc/source/conf.py
index bebae661..22f61b70 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -24,7 +24,7 @@ sys.path.insert(0, os.path.abspath('../..'))
 extensions = [
     'sphinx.ext.autodoc',
     #'sphinx.ext.intersphinx',
-    'oslosphinx',
+    'openstackdocstheme',
     'yasfb',
 ]
 
@@ -76,6 +76,8 @@ pygments_style = 'sphinx'
 # html_theme = '_theme'
 # html_static_path = ['static']
 
+html_theme = 'openstackdocs'
+
 # Output file base name for HTML help builder.
 htmlhelp_basename = '%sdoc' % project
 
diff --git a/requirements.txt b/requirements.txt
index bf630306..f5d3a353 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
-pbr>=0.6,<1.0
-oslosphinx
-sphinx>=1.1.2,<1.2
-yasfb>=0.5.1
+openstackdocstheme
+sphinx>=2.0.0
+yasfb>=0.8.0
diff --git a/tox.ini b/tox.ini
index 54356f87..b14fa900 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
 [tox]
 minversion = 1.6
-envlist = docs,py27
+envlist = docs,py36
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv =