diff --git a/bindep.txt b/bindep.txt
index d18f11f7ae..ab85caa3e9 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -3,7 +3,7 @@
 #
 # See the following for details:
 #  - http://docs.openstack.org/infra/bindep/
-#  - https://github.com/openstack-infra/bindep
+#  - https://git.openstack.org/openstack-infra/bindep
 #
 # Even if the role does not make use of this facility, it
 # is better to have this file empty, otherwise OpenStack-CI
diff --git a/doc/source/developer-docs/additional-roles.rst b/doc/source/developer-docs/additional-roles.rst
index 01268668c5..f55ce495ed 100644
--- a/doc/source/developer-docs/additional-roles.rst
+++ b/doc/source/developer-docs/additional-roles.rst
@@ -80,8 +80,8 @@ Steps to writing the role:
       discover a need for them. You can also develop documentation for your
       role at the same time.
 
-.. _(see also the spec template): https://github.com/openstack/openstack-ansible-specs/blob/master/specs/template.rst
-.. _specs repository: https://github.com/openstack/openstack-ansible-specs
+.. _(see also the spec template): https://git.openstack.org/cgit/openstack/openstack-ansible-specs/tree/specs/templates/template.rst
+.. _specs repository: https://git.openstack.org/cgit/openstack/openstack-ansible-specs
 .. _unmerged specs: https://review.openstack.org/#/q/status:+open+project:openstack/openstack-ansible-specs
 .. _Best Practice: https://docs.ansible.com/ansible/playbooks_best_practices.html#directory-layout
 
diff --git a/doc/source/developer-docs/ops-remove-computehost.rst b/doc/source/developer-docs/ops-remove-computehost.rst
index a119552e51..27ac38cab5 100644
--- a/doc/source/developer-docs/ops-remove-computehost.rst
+++ b/doc/source/developer-docs/ops-remove-computehost.rst
@@ -4,7 +4,7 @@
 Removing a compute host
 =======================
 
-The `openstack-ansible-ops <https://github.com/openstack/openstack-ansible-ops>`_
+The `openstack-ansible-ops <https://git.openstack.org/cgit/openstack/openstack-ansible-ops>`_
 repository contains a playbook for removing a compute host from an
 OpenStack-Ansible (OSA) environment.
 To remove a compute host, follow the below procedure.
@@ -34,7 +34,7 @@ To remove a compute host, follow the below procedure.
 
   .. code-block:: console
 
-     $ git clone https://github.com/openstack/openstack-ansible-ops \
+     $ git clone https://git.openstack.org/openstack/openstack-ansible-ops \
        /opt/openstack-ansible-ops
 
 #. Run the ``remove_compute_node.yml`` Ansible playbook with the
diff --git a/doc/source/developer-docs/quickstart-aio.rst b/doc/source/developer-docs/quickstart-aio.rst
index 453dfe01bf..764ba8d1f5 100644
--- a/doc/source/developer-docs/quickstart-aio.rst
+++ b/doc/source/developer-docs/quickstart-aio.rst
@@ -62,7 +62,7 @@ repository root directory:
 
 .. code-block:: shell-session
 
-   # git clone https://github.com/openstack/openstack-ansible \
+   # git clone https://git.openstack.org/openstack/openstack-ansible \
        /opt/openstack-ansible
    # cd /opt/openstack-ansible
 
@@ -95,7 +95,7 @@ host is bootstrapped. This is useful when you wish the AIO to make use of
 a secondary data disk, or when using this role to bootstrap a multi-node
 development environment.
 
-.. _bootstrap-host role defaults: https://github.com/openstack/openstack-ansible/blob/master/tests/roles/bootstrap-host/defaults/main.yml
+.. _bootstrap-host role defaults: https://git.openstack.org/cgit/openstack/openstack-ansible/tree/tests/roles/bootstrap-host/defaults/main.yml
 
 The bootstrap script is pre-set to pass the environment variable
 ``BOOTSTRAP_OPTS`` as an additional option to the bootstrap process. For
@@ -271,7 +271,7 @@ soon as the instance starts. Save this file as ``user_data.yml``:
    runcmd:
      - export ANSIBLE_FORCE_COLOR=true
      - export PYTHONUNBUFFERED=1
-     - export REPO=https://github.com/openstack/openstack-ansible
+     - export REPO=https://git.openstack.org/openstack/openstack-ansible
      - export BRANCH=stable/|previous_release_branch_name|
      - git clone -b ${BRANCH} ${REPO} /opt/openstack-ansible
      - cd /opt/openstack-ansible && scripts/bootstrap-ansible.sh
diff --git a/doc/source/developer-docs/scripts.rst b/doc/source/developer-docs/scripts.rst
index 376e270de2..ff1c5dde27 100644
--- a/doc/source/developer-docs/scripts.rst
+++ b/doc/source/developer-docs/scripts.rst
@@ -162,7 +162,7 @@ A consolidated set of all lint tests may be done locally by executing:
     tox -e linters
 
 .. _PEP8: https://www.python.org/dev/peps/pep-0008/
-.. _Bashate: https://github.com/openstack-dev/bashate
+.. _Bashate: https://git.openstack.org/cgit/openstack-dev/bashate
 .. _ansible-lint: https://github.com/willthames/ansible-lint
 
 Documentation Build
diff --git a/doc/source/install-guide/deploymenthost.rst b/doc/source/install-guide/deploymenthost.rst
index 265ccf0e0d..84c0b80014 100644
--- a/doc/source/install-guide/deploymenthost.rst
+++ b/doc/source/install-guide/deploymenthost.rst
@@ -88,8 +88,7 @@ Install the source and dependencies for the deployment host.
    the ``/opt/openstack-ansible`` directory:
 
    .. parsed-literal::
-
-       # git clone -b TAG https://github.com/openstack/openstack-ansible
+       # git clone -b TAG https://git.openstack.org/openstack/openstack-ansible
        /opt/openstack-ansible
 
 #. Change to the ``/opt/openstack-ansible`` directory, and run the