diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 35564c59..b5c7c425 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,13 +1,13 @@
 If you would like to contribute to the development of OpenStack,
 you must follow the steps documented at:
 
-   http://docs.openstack.org/infra/manual/developers.html#development-workflow
+   https://docs.openstack.org/infra/manual/developers.html#development-workflow
 
 Once those steps have been completed, changes to OpenStack
 should be submitted for review via the Gerrit tool, following
 the workflow documented at:
 
-   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/HACKING.rst b/HACKING.rst
index fa8a64a6..16b4a18c 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -2,7 +2,7 @@ Glance Style Commandments
 =========================
 
 - Step 1: Read the OpenStack Style Commandments
-  http://docs.openstack.org/developer/hacking/
+  https://docs.openstack.org/hacking/latest/
 - Step 2: Read on
 
 
diff --git a/README.rst b/README.rst
index e43a00a0..a438d6db 100644
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,8 @@
 Team and repository tags
 ========================
 
-.. image:: http://governance.openstack.org/badges/python-glanceclient.svg
-    :target: http://governance.openstack.org/reference/tags/index.html
+.. image:: https://governance.openstack.org/tc/badges/python-glanceclient.svg
+    :target: https://governance.openstack.org/tc/reference/tags/index.html
     :alt: The following tags have been asserted for Python bindings to the
           OpenStack Images API:
           "project:official",
@@ -46,11 +46,11 @@ See release notes and more at `<http://docs.openstack.org/python-glanceclient/>`
 * `How to Contribute`_
 
 .. _PyPi: https://pypi.python.org/pypi/python-glanceclient
-.. _Online Documentation: http://docs.openstack.org/python-glanceclient
+.. _Online Documentation: https://docs.openstack.org/python-glanceclient/latest/
 .. _Launchpad project: https://launchpad.net/python-glanceclient
 .. _Blueprints: https://blueprints.launchpad.net/python-glanceclient
 .. _Bugs: https://bugs.launchpad.net/python-glanceclient
 .. _Source: https://git.openstack.org/cgit/openstack/python-glanceclient
-.. _How to Contribute: http://docs.openstack.org/infra/manual/developers.html
-.. _Specs: http://specs.openstack.org/openstack/glance-specs/
+.. _How to Contribute: https://docs.openstack.org/infra/manual/developers.html
+.. _Specs: https://specs.openstack.org/openstack/glance-specs/
 
diff --git a/doc/source/cli/details.rst b/doc/source/cli/details.rst
index f303c09b..cb08755a 100644
--- a/doc/source/cli/details.rst
+++ b/doc/source/cli/details.rst
@@ -174,7 +174,7 @@ Create a new image.
 
 ``--architecture <ARCHITECTURE>``
   Operating system architecture as specified in
-  http://docs.openstack.org/user-guide/common/cli-manage-images.html
+  https://docs.openstack.org/glance/latest/user/common-image-properties.html#architecture
 
 ``--protected [True|False]``
   If true, image will not be deletable.
@@ -213,7 +213,7 @@ Create a new image.
   Common name of operating system distribution as
   specified
   in
-  http://docs.openstack.org/user-guide/common/cli-manage-images.html
+  https://docs.openstack.org/glance/latest/user/common-image-properties.html#os-distro
 
 ``--id <ID>``
   An identifier for the image
@@ -468,7 +468,7 @@ Update an existing image.
 
 ``--architecture <ARCHITECTURE>``
   Operating system architecture as specified in
-  http://docs.openstack.org/user-guide/common/cli-manage-images.html
+  https://docs.openstack.org/glance/latest/user/common-image-properties.html#architecture
 
 ``--protected [True|False]``
   If true, image will not be deletable.
@@ -504,7 +504,7 @@ Update an existing image.
   Common name of operating system distribution as
   specified
   in
-  http://docs.openstack.org/user-guide/common/cli-manage-images.html
+  https://docs.openstack.org/glance/latest/user/common-image-properties.html#os-distro
 
 ``--owner <OWNER>``
   Owner of the image
@@ -1182,8 +1182,8 @@ Associate resource type with a metadata definitions namespace.
 
 ``--name <NAME>``
   Resource type names should be aligned with Heat
-  resource types whenever possible: http://docs.openstac
-  k.org/developer/heat/template_guide/openstack.html
+  resource types whenever possible:
+  https://docs.openstack.org/heat/latest/template_guide/openstack.html
 
 ``--properties-target <PROPERTIES_TARGET>``
   Some resource types allow more than one key / value
diff --git a/doc/source/cli/property-keys.rst b/doc/source/cli/property-keys.rst
index 7996bc72..2763357b 100644
--- a/doc/source/cli/property-keys.rst
+++ b/doc/source/cli/property-keys.rst
@@ -15,7 +15,7 @@ For example:
 
    Behavior set using image properties overrides behavior set using flavors.
    For more information, refer to the `Manage images
-   <https://docs.openstack.org/admin-guide/common/cli-manage-images.html>`_
+   <https://docs.openstack.org/glance/latest/admin/manage-images.html>`_
    in the OpenStack Administrator Guide.
 
 .. list-table:: Image service property keys
diff --git a/setup.cfg b/setup.cfg
index 7699cabf..8cf087e5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ description-file =
 license = Apache License, Version 2.0
 author = OpenStack
 author-email = openstack-dev@lists.openstack.org
-home-page = http://docs.openstack.org/developer/python-glanceclient
+home-page = https://docs.openstack.org/python-glanceclient/latest/
 classifier =
     Development Status :: 5 - Production/Stable
     Environment :: Console