diff --git a/doc/source/conf.py b/doc/source/conf.py
index bab9f84..7a463b9 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -13,7 +13,7 @@
 # serve to show the default.
 
 import os
-import openstackdocstheme
+import pbr.version
 
 # 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
@@ -29,8 +29,8 @@ import openstackdocstheme
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
+    'openstackdocstheme',
     'sphinx.ext.autodoc',
-    'oslosphinx',
     'sphinxmark'
 ]
 
@@ -52,18 +52,33 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = 'openstack-ansible-plugins'
-copyright = '2015, openstack-ansible-plugins contributors'
-author = 'openstack-ansible-plugins contributors'
+author = 'OpenStack-Ansible Contributors'
+category = 'Miscellaneous'
+copyright = '2014-2016, OpenStack-Ansible Contributors'
+description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.'
+project = 'OpenStack-Ansible'
+role_name = 'plugins'
+target_name = 'openstack-ansible-' + role_name
+title = 'OpenStack-Ansible Documentation: ' + role_name + 'role'
+
+# The link to the browsable source code (for the left hand menu)
+oslosphinx_cgit_link = 'https://git.openstack.org/cgit/openstack/' + target_name
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = 'master'
+version_info = pbr.version.VersionInfo(target_name)
 # The full version, including alpha/beta/rc tags.
-release = 'master'
+release = version_info.version_string_with_vcs()
+# The short X.Y version.
+version = version_info.canonical_version_string()
+
+# openstackdocstheme options
+repository_name = 'openstack/' + target_name
+bug_project = project.lower()
+bug_tag = ''
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -122,7 +137,7 @@ html_theme = 'openstackdocs'
 # html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = [openstackdocstheme.get_html_theme_path()]
+# html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
@@ -152,7 +167,7 @@ html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 6525275..5c7c23c 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -23,7 +23,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import openstackdocstheme
 import pbr.version
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -40,6 +39,7 @@ import pbr.version
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
+    'openstackdocstheme',
     'reno.sphinxext',
 ]
 
@@ -56,23 +56,37 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'OpenStack-Ansible Release Notes'
-copyright = u'2015, OpenStack-Ansible Developers'
+author = 'OpenStack-Ansible Contributors'
+category = 'Miscellaneous'
+copyright = '2014-2016, OpenStack-Ansible Contributors'
+description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.'
+project = 'OpenStack-Ansible'
+role_name = 'plugins'
+target_name = 'openstack-ansible-' + role_name
+title = 'OpenStack-Ansible Documentation: ' + role_name + 'role'
+
+# The link to the browsable source code (for the left hand menu)
+oslosphinx_cgit_link = 'https://git.openstack.org/cgit/openstack/' + target_name
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version_info = pbr.version.VersionInfo('openstack-ansible-plugins')
+version_info = pbr.version.VersionInfo(target_name)
 # The full version, including alpha/beta/rc tags.
 release = version_info.version_string_with_vcs()
 # The short X.Y version.
 version = version_info.canonical_version_string()
 
+# openstackdocstheme options
+repository_name = 'openstack/' + target_name
+bug_project = project.lower()
+bug_tag = ''
+
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-# language = None
+language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -121,7 +135,7 @@ html_theme = 'openstackdocs'
 # html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = [openstackdocstheme.get_html_theme_path()]
+# html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
@@ -151,7 +165,7 @@ html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
diff --git a/test-requirements.txt b/test-requirements.txt
index 36dfb0c..a4923af 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,7 +10,6 @@ ndg-httpsclient>=0.4.2;python_version<'3.0' # BSD
 
 # this is required for the docs build jobs
 sphinx>=1.6.2 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
 openstackdocstheme>=1.11.0 # Apache-2.0
 doc8 # Apache-2.0
 reno!=2.3.1,>=1.8.0 # Apache-2.0