diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 4108b7f..e4f2470 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,14 +1,14 @@
 If you would like to contribute to the development of OpenStack, you must
 follow the steps in this page:
 
-   http://docs.openstack.org/infra/manual/developers.html
+   https://docs.openstack.org/infra/manual/developers.html
 
 If you already have a good understanding of how the system works and your
 OpenStack accounts are set up, you can skip to the development workflow
 section of this documentation to learn how changes to OpenStack should be
 submitted for review via the Gerrit tool:
 
-   http://docs.openstack.org/infra/manual/developers.html#development-workflow
+   https://docs.openstack.org/infra/manual/developers.html#development-workflow
 
 Pull requests submitted through GitHub will be ignored.
 
diff --git a/README.rst b/README.rst
index e195cc6..d8edf8e 100644
--- a/README.rst
+++ b/README.rst
@@ -71,13 +71,13 @@ Then::
 * Add the project to the OpenStack Infrastructure
 
 
-.. _pbr: http://docs.openstack.org/developer/pbr
+.. _pbr: https://docs.openstack.org/pbr/latest/
 .. _hacking: https://git.openstack.org/cgit/openstack-dev/hacking/plain/HACKING.rst
 .. _eslint: http://eslint.org/
-.. _OpenStack-Infra: http://docs.openstack.org/infra/system-config
+.. _OpenStack-Infra: https://docs.openstack.org/infra/system-config
 .. _testrepository: https://testrepository.readthedocs.org/
 .. _Tox: http://testrun.org/tox/
 .. _karma: https://github.com/karma-runner/karma
 .. _Sphinx: http://sphinx-doc.org/
-.. _reno: http://docs.openstack.org/developer/reno/
+.. _reno: https://docs.openstack.org/reno/latest/
 
diff --git a/{{cookiecutter.repo_name}}/CONTRIBUTING.rst b/{{cookiecutter.repo_name}}/CONTRIBUTING.rst
index 04f140b..5f7920a 100644
--- a/{{cookiecutter.repo_name}}/CONTRIBUTING.rst
+++ b/{{cookiecutter.repo_name}}/CONTRIBUTING.rst
@@ -1,17 +1,14 @@
 If you would like to contribute to the development of OpenStack, you must
 follow the steps in this page:
-
-   http://docs.openstack.org/infra/manual/developers.html
+https://docs.openstack.org/infra/manual/developers.html
 
 If you already have a good understanding of how the system works and your
 OpenStack accounts are set up, you can skip to the development workflow
 section of this documentation to learn how changes to OpenStack should be
 submitted for review via the Gerrit tool:
-
-   http://docs.openstack.org/infra/manual/developers.html#development-workflow
+https://docs.openstack.org/infra/manual/developers.html#development-workflow
 
 Pull requests submitted through GitHub will be ignored.
 
 Bugs should be filed on Launchpad, not GitHub:
-
-   https://bugs.launchpad.net/{{ cookiecutter.repo_name }}
+https://bugs.launchpad.net/{{ cookiecutter.repo_name }}
diff --git a/{{cookiecutter.repo_name}}/HACKING.rst b/{{cookiecutter.repo_name}}/HACKING.rst
index 3e1a575..6667784 100644
--- a/{{cookiecutter.repo_name}}/HACKING.rst
+++ b/{{cookiecutter.repo_name}}/HACKING.rst
@@ -1,4 +1,4 @@
 {{ cookiecutter.repo_name }} Style Commandments
 ===============================================
 
-Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
+Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/