diff --git a/README.rst b/README.rst
index fdfa38e..98218a5 100644
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,8 @@
 Team and repository tags
 ========================
 
-.. image:: http://governance.openstack.org/badges/installguide-cookiecutter.svg
-    :target: http://governance.openstack.org/reference/tags/index.html
+.. image:: https://governance.openstack.org/badges/installguide-cookiecutter.svg
+    :target: https://governance.openstack.org/reference/tags/index.html
 
 ==========================
 Install Guide Cookiecutter
@@ -16,11 +16,12 @@ cookiecutter.
 Usage
 -----
 
-The usage of this tool is documented in the
-`OpenStack Contributor Guide <https://docs.openstack.org/contributor-guide/project-install-guide.html>`_.
+The usage of this tool is documented in the `OpenStack Contributor Guide
+<https://docs.openstack.org/contributor-guide/project-install-guide.html>`_.
 
 Contribution
 ------------
 
 This repo is part of the OpenStack docs team, see our
-`Contributor Guide <http://docs.openstack.org/contributor-guide/>`_ on how to contribute.
+`Contributor Guide <https://docs.openstack.org/contributor-guide/>`_ on how to
+contribute.
diff --git a/{{cookiecutter.directory_name}}/source/index.rst b/{{cookiecutter.directory_name}}/source/index.rst
index 01d4936..f9d02fb 100644
--- a/{{cookiecutter.directory_name}}/source/index.rst
+++ b/{{cookiecutter.directory_name}}/source/index.rst
@@ -13,4 +13,5 @@
 The {{cookiecutter.service}} service ({{cookiecutter.codename}}) provides...
 
 This chapter assumes a working setup of OpenStack following the
-`OpenStack Installation Tutorial <http://docs.openstack.org/#install-guides>`_.
+`OpenStack Installation Tutorial
+<https://docs.openstack.org/project-install-guide/ocata/>`_.
diff --git a/{{cookiecutter.directory_name}}/source/next-steps.rst b/{{cookiecutter.directory_name}}/source/next-steps.rst
index c50fbe6..a690a4d 100644
--- a/{{cookiecutter.directory_name}}/source/next-steps.rst
+++ b/{{cookiecutter.directory_name}}/source/next-steps.rst
@@ -6,5 +6,4 @@ Next steps
 Your OpenStack environment now includes the {{cookiecutter.codename}} service.
 
 To add additional services, see
-https://docs.openstack.org/project-install-guide/draft/index.html .
-
+https://docs.openstack.org/project-install-guide/ocata/.