diff --git a/README.rst b/README.rst
index 180cc6df4..0df6c62e4 100644
--- a/README.rst
+++ b/README.rst
@@ -5,8 +5,8 @@ Hardware introspection for OpenStack Bare Metal
Introduction
============
-.. image:: http://governance.openstack.org/badges/ironic-inspector.svg
- :target: http://governance.openstack.org/reference/tags/index.html
+.. image:: https://governance.openstack.org/tc/badges/ironic-inspector.svg
+ :target: https://governance.openstack.org/tc/reference/tags/index.html
This is an auxiliary service for discovering hardware properties for a
node managed by `Ironic`_. Hardware introspection or hardware
@@ -34,4 +34,4 @@ Release Notes
For information on any current or prior version, see `the release notes`_.
-.. _the release notes: http://docs.openstack.org/releasenotes/ironic-inspector/
+.. _the release notes: https://docs.openstack.org/releasenotes/ironic-inspector/
diff --git a/doc/source/admin/upgrade.rst b/doc/source/admin/upgrade.rst
index 8bdba7c1a..3ad72aff4 100644
--- a/doc/source/admin/upgrade.rst
+++ b/doc/source/admin/upgrade.rst
@@ -1,7 +1,7 @@
Upgrade Guide
-------------
-The `release notes `_
+The `release notes `_
should always be read carefully when upgrading the ironic-inspector service.
Starting with the Mitaka series, specific upgrade steps and considerations are
well-documented in the release notes.
diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst
index 6269623ad..96fc413e8 100644
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@@ -15,8 +15,8 @@ packaged, some of them - under its old name *ironic-discoverd*.
There are several projects you can use to set up **ironic-inspector** in
production. `puppet-ironic
-`_ provides Puppet
-manifests, while `bifrost `_
+`_ provides Puppet
+manifests, while `bifrost `_
provides an Ansible-based standalone installer. Refer to Configuration_
if you plan on installing **ironic-inspector** manually.
diff --git a/doc/source/user/http-api.rst b/doc/source/user/http-api.rst
index 4010f9261..e031d104a 100644
--- a/doc/source/user/http-api.rst
+++ b/doc/source/user/http-api.rst
@@ -288,7 +288,7 @@ Response body: JSON dictionary with ``uuid`` key.
.. _hardware inventory: https://docs.openstack.org/ironic-python-agent/latest/admin/how_it_works.html#hardware-inventory
.. _Specifying the disk for deployment root device hints:
- http://docs.openstack.org/project-install-guide/baremetal/draft/advanced.html#specifying-the-disk-for-deployment-root-device-hints
+ https://docs.openstack.org/ironic/latest/install/advanced.html#specifying-the-disk-for-deployment-root-device-hints
Error Response
~~~~~~~~~~~~~~