diff --git a/doc/source/conf.py b/doc/source/conf.py
index e6637c5..e70f813 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -15,8 +15,6 @@ import datetime
 import os
 import sys
 
-import openstackdocstheme
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -105,8 +103,6 @@ man_pages = []
 # a list of builtin themes.
 # html_theme = 'nature'
 html_theme = "openstackdocs"
-html_theme_path = [openstackdocstheme.get_html_theme_path()]
-
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -132,11 +128,6 @@ html_theme_options = {}
 # pixels large.
 #html_favicon = None
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-git_cmd = "git log --pretty=format:'%ad, commit %h' --date=local -n1"
-html_last_updated_fmt = os.popen(git_cmd).read()
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #html_use_smartypants = True
diff --git a/requirements.txt b/requirements.txt
index 0e38b48..694dd65 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
-pbr>=1.8
+pbr>=2.0
 sphinx>=1.6.2
 testrepository>=0.0.18
 testtools>=0.9.34
-openstackdocstheme>=1.17.0 # Apache-2.0
+openstackdocstheme>=1.32.1 # Apache-2.0
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
diff --git a/setup.cfg b/setup.cfg
index 3197a6a..a4de866 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,14 +10,3 @@ classifier =
     Intended Audience :: Developers
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-
-[pbr]
-warnerrors = True
-
-[wheel]
-universal = 1
diff --git a/specs/train/add_dataframe_datapoint_object.rst b/specs/train/add_dataframe_datapoint_object.rst
index 9c3b72d..187797d 100644
--- a/specs/train/add_dataframe_datapoint_object.rst
+++ b/specs/train/add_dataframe_datapoint_object.rst
@@ -216,14 +216,14 @@ Implementation
 ==============
 
 Assignee(s)
------------
++++++++++++
 
 Primary assignee:
 
   peschk_l
 
 Work Items
-----------
+++++++++++
 
 * Create validation utils that will allow to check the datapoint/dataframe
   format.
diff --git a/specs/train/add_push_dataframes_api_endpoint.rst b/specs/train/add_push_dataframes_api_endpoint.rst
index 46f0f16..82768c9 100644
--- a/specs/train/add_push_dataframes_api_endpoint.rst
+++ b/specs/train/add_push_dataframes_api_endpoint.rst
@@ -71,7 +71,7 @@ The endpoint will support the following body parameters:
 Inside the body of the request, a collection of DataFrame json objects
 can be specified as follows:
 
-.. code-block:: javascript
+.. code-block:: none
 
   {
     "dataframes": [
diff --git a/tox.ini b/tox.ini
index 5f67cec..9907651 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,14 +8,14 @@ ignore_basepython_conflict = True
 basepython = python3
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
-install_command = pip install -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
 
 [testenv:venv]
 commands = {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands =
+  sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
 envdir = {toxworkdir}/docs