diff --git a/bandit.yaml b/bandit.yaml
index 2e7b18718d..2394d71590 100644
--- a/bandit.yaml
+++ b/bandit.yaml
@@ -120,7 +120,7 @@ blacklist_calls:
             level: "LOW"
 
         # Most of this is based off of Christian Heimes' work on defusedxml:
-        #   https://pypi.python.org/pypi/defusedxml/#defusedxml-sax
+        #   https://pypi.org/project/defusedxml/#defusedxml-sax
 
         # TODO(jaegerandi): Enable once defusedxml is in global requirements.
         #- xml_bad_cElementTree:
@@ -191,7 +191,7 @@ blacklist_imports:
             message: "Consider possible security implications associated with {module} module."
 
         # Most of this is based off of Christian Heimes' work on defusedxml:
-        #   https://pypi.python.org/pypi/defusedxml/#defusedxml-sax
+        #   https://pypi.org/project/defusedxml/#defusedxml-sax
 
         - xml_libs:
             imports: [xml.etree.cElementTree,
diff --git a/doc/source/admin/apache-httpd.rst b/doc/source/admin/apache-httpd.rst
index 20b12b31d8..32d57a8462 100644
--- a/doc/source/admin/apache-httpd.rst
+++ b/doc/source/admin/apache-httpd.rst
@@ -146,7 +146,7 @@ Glossary
 
     https://uwsgi-docs.readthedocs.io/en/latest/index.html
 
-    https://pypi.python.org/pypi/uWSGI
+    https://pypi.org/project/uWSGI/
 
     https://github.com/unbit/uwsgi
 
diff --git a/doc/source/user/glanceclient.rst b/doc/source/user/glanceclient.rst
index ad90b1a7e8..f19706e346 100644
--- a/doc/source/user/glanceclient.rst
+++ b/doc/source/user/glanceclient.rst
@@ -22,5 +22,5 @@ through the python-glanceclient project. Explore the following resources
 for more information:
 
 * `Official Docs <http://docs.openstack.org/developer/python-glanceclient/>`_
-* `Pypi Page <http://pypi.python.org/pypi/python-glanceclient>`_
+* `Pypi Page <https://pypi.org/project/python-glanceclient/>`_
 * `GitHub Project <http://github.com/openstack/python-glanceclient>`_