diff --git a/HACKING.rst b/HACKING.rst
index e6c8d07827..61803e9a4d 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -2,7 +2,7 @@ OpenStack 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
 
 General
diff --git a/README.rst b/README.rst
index b030efd1d0..6c2c2401d1 100644
--- a/README.rst
+++ b/README.rst
@@ -39,14 +39,14 @@ language to describe operations in OpenStack.
 * License: Apache 2.0
 
 .. _PyPi: https://pypi.python.org/pypi/python-openstackclient
-.. _Online Documentation: http://docs.openstack.org/python-openstackclient/
+.. _Online Documentation: https://docs.openstack.org/python-openstackclient/latest/
 .. _Launchpad project: https://launchpad.net/python-openstackclient
 .. _Blueprints: https://blueprints.launchpad.net/python-openstackclient
 .. _Bugs: https://bugs.launchpad.net/python-openstackclient
 .. _Source: https://git.openstack.org/cgit/openstack/python-openstackclient
-.. _Developer: http://docs.openstack.org/project-team-guide/project-setup/python.html
-.. _Contributing: http://docs.openstack.org/infra/manual/developers.html
-.. _Testing: http://docs.openstack.org/python-openstackclient/developing.html#testing
+.. _Developer: https://docs.openstack.org/project-team-guide/project-setup/python.html
+.. _Contributing: https://docs.openstack.org/infra/manual/developers.html
+.. _Testing: https://docs.openstack.org/python-openstackclient/latest/contributor/developing.html#testing
 
 Getting Started
 ===============
@@ -79,7 +79,7 @@ Configuration
 =============
 
 The CLI is configured via environment variables and command-line
-options as listed in  http://docs.openstack.org/python-openstackclient/authentication.html.
+options as listed in  https://docs.openstack.org/python-openstackclient/latest/cli/authentication.html.
 
 Authentication using username/password is most commonly used::
 
diff --git a/doc/source/cli/man/openstack.rst b/doc/source/cli/man/openstack.rst
index ab990979fc..632ba4be0a 100644
--- a/doc/source/cli/man/openstack.rst
+++ b/doc/source/cli/man/openstack.rst
@@ -502,7 +502,7 @@ http://www.apache.org/licenses/LICENSE-2.0
 SEE ALSO
 ========
 
-The `OpenStackClient page <http://docs.openstack.org/developer/python-openstackclient/>`_
+The `OpenStackClient page <https://docs.openstack.org/python-openstackclient/latest/>`_
 in the `OpenStack Docs <https://docs.openstack.org/>`_ contains further
 documentation.
 
diff --git a/doc/source/contributor/command-logs.rst b/doc/source/contributor/command-logs.rst
index 6212651067..c203d02aee 100644
--- a/doc/source/contributor/command-logs.rst
+++ b/doc/source/contributor/command-logs.rst
@@ -10,7 +10,7 @@ OpenStack projects. The following basic rules should be followed.
 
 2. All logs except debug log need to be translated. The log message strings
    that need to be translated should follow the rule of i18n guidelines:
-   http://docs.openstack.org/developer/oslo.i18n/guidelines.html
+   https://docs.openstack.org/oslo.i18n/latest/user/guidelines.html
 
 3. There are mainly two kinds of logs in OpenStackClient: command specific
    log and general log. Use different logger to record them. The examples
diff --git a/doc/source/contributor/developing.rst b/doc/source/contributor/developing.rst
index 2981ba4d16..721a016a03 100644
--- a/doc/source/contributor/developing.rst
+++ b/doc/source/contributor/developing.rst
@@ -177,7 +177,7 @@ or
 Standardize Import Format
 =========================
 
-.. _`Import Order Guide`: http://docs.openstack.org/developer/hacking/#imports
+.. _`Import Order Guide`: https://docs.openstack.org/hacking/latest/user/hacking.html#imports
 
 The import order shows below:
 
diff --git a/doc/source/contributor/plugins.rst b/doc/source/contributor/plugins.rst
index fb21a0795a..8bdfe484f0 100644
--- a/doc/source/contributor/plugins.rst
+++ b/doc/source/contributor/plugins.rst
@@ -243,4 +243,4 @@ Changes to python-openstackclient
 #. Update ``test-requirements.txt`` to include fooclient. This is necessary
    to auto-document the commands in the previous step.
 
-.. _sphinxext: http://docs.openstack.org/developer/stevedore/sphinxext.html
+.. _sphinxext: https://docs.openstack.org/stevedore/latest/user/sphinxext.html