diff --git a/README.rst b/README.rst
index 27015513..f01542ae 100644
--- a/README.rst
+++ b/README.rst
@@ -32,8 +32,8 @@ included playbooks, for example:
 
     - include: common/test-prepare-keys.yml
 
-.. _galera_client repository tox.ini: https://github.com/openstack/openstack-ansible-galera_client/blob/master/tox.ini
-.. _neutron role tox.ini: https://github.com/openstack/openstack-ansible-os_neutron/blob/master/tox.ini
+.. _galera_client repository tox.ini: https://git.openstack.org/cgit/openstack/openstack-ansible-galera_client/tree/tox.ini
+.. _neutron role tox.ini: https://git.openstack.org/cgit/openstack/openstack-ansible-os_neutron/tree/tox.ini
 
 Network Settings
 ~~~~~~~~~~~~~~~~
diff --git a/ansible-role-requirements-gen.sh b/ansible-role-requirements-gen.sh
index d1e034cf..a0c03da3 100755
--- a/ansible-role-requirements-gen.sh
+++ b/ansible-role-requirements-gen.sh
@@ -17,7 +17,7 @@
 
 BRANCH="${BRANCH:-master}"
 CURRENT_DIR="$(pwd)"
-WORKSPACE=${WORKSPACE:-$(mktmp --directory)}
+WORKSPACE=${WORKSPACE:-$(mktemp --directory)}
 
 function role_entry {
     cat >> "${CURRENT_DIR}/ansible-role-requirements.yaml" <<EOF
@@ -30,7 +30,7 @@ EOF
 
 # Create a workspace and clone project-config
 mkdir -p "${WORKSPACE}"
-git clone https://github.com/openstack-infra/project-config "${WORKSPACE}/project-config"
+git clone https://git.openstack.org/openstack-infra/project-config "${WORKSPACE}/project-config"
 
 # Move into the project-config workspace
 pushd "${WORKSPACE}/project-config"
diff --git a/ansible-role-requirements.yaml b/ansible-role-requirements.yaml
index 86d4d6dd..7cfb6379 100644
--- a/ansible-role-requirements.yaml
+++ b/ansible-role-requirements.yaml
@@ -1,169 +1,173 @@
 ---
 - name: "apt_package_pinning"
-  src: "https://github.com/openstack/openstack-ansible-apt_package_pinning"
+  src: "https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning"
   scm: git
   version: "master"
 - name: "ceph_client"
-  src: "https://github.com/openstack/openstack-ansible-ceph_client"
+  src: "https://git.openstack.org/openstack/openstack-ansible-ceph_client"
   scm: git
   version: "master"
 - name: "galera_client"
-  src: "https://github.com/openstack/openstack-ansible-galera_client"
+  src: "https://git.openstack.org/openstack/openstack-ansible-galera_client"
   scm: git
   version: "master"
 - name: "galera_server"
-  src: "https://github.com/openstack/openstack-ansible-galera_server"
+  src: "https://git.openstack.org/openstack/openstack-ansible-galera_server"
   scm: git
   version: "master"
 - name: "haproxy_server"
-  src: "https://github.com/openstack/openstack-ansible-haproxy_server"
+  src: "https://git.openstack.org/openstack/openstack-ansible-haproxy_server"
   scm: git
   version: "master"
 - name: "lxc_container_create"
-  src: "https://github.com/openstack/openstack-ansible-lxc_container_create"
+  src: "https://git.openstack.org/openstack/openstack-ansible-lxc_container_create"
   scm: git
   version: "master"
 - name: "lxc_hosts"
-  src: "https://github.com/openstack/openstack-ansible-lxc_hosts"
+  src: "https://git.openstack.org/openstack/openstack-ansible-lxc_hosts"
   scm: git
   version: "master"
 - name: "memcached_server"
-  src: "https://github.com/openstack/openstack-ansible-memcached_server"
+  src: "https://git.openstack.org/openstack/openstack-ansible-memcached_server"
   scm: git
   version: "master"
 - name: "openstack_hosts"
-  src: "https://github.com/openstack/openstack-ansible-openstack_hosts"
+  src: "https://git.openstack.org/openstack/openstack-ansible-openstack_hosts"
   scm: git
   version: "master"
 - name: "openstack_openrc"
-  src: "https://github.com/openstack/openstack-ansible-openstack_openrc"
+  src: "https://git.openstack.org/openstack/openstack-ansible-openstack_openrc"
+  scm: git
+  version: "master"
+- name: "os_almanach"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_almanach"
   scm: git
   version: "master"
 - name: "os_aodh"
-  src: "https://github.com/openstack/openstack-ansible-os_aodh"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_aodh"
   scm: git
   version: "master"
 - name: "os_barbican"
-  src: "https://github.com/openstack/openstack-ansible-os_barbican"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_barbican"
   scm: git
   version: "master"
 - name: "os_ceilometer"
-  src: "https://github.com/openstack/openstack-ansible-os_ceilometer"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_ceilometer"
   scm: git
   version: "master"
 - name: "os_cinder"
-  src: "https://github.com/openstack/openstack-ansible-os_cinder"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_cinder"
   scm: git
   version: "master"
 - name: "os_cloudkitty"
-  src: "https://github.com/openstack/openstack-ansible-os_cloudkitty"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_cloudkitty"
   scm: git
   version: "master"
 - name: "os_designate"
-  src: "https://github.com/openstack/openstack-ansible-os_designate"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_designate"
   scm: git
   version: "master"
 - name: "os_glance"
-  src: "https://github.com/openstack/openstack-ansible-os_glance"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_glance"
   scm: git
   version: "master"
 - name: "os_gnocchi"
-  src: "https://github.com/openstack/openstack-ansible-os_gnocchi"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_gnocchi"
   scm: git
   version: "master"
 - name: "os_heat"
-  src: "https://github.com/openstack/openstack-ansible-os_heat"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_heat"
   scm: git
   version: "master"
 - name: "os_horizon"
-  src: "https://github.com/openstack/openstack-ansible-os_horizon"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_horizon"
   scm: git
   version: "master"
 - name: "os_ironic"
-  src: "https://github.com/openstack/openstack-ansible-os_ironic"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_ironic"
   scm: git
   version: "master"
 - name: "os_keystone"
-  src: "https://github.com/openstack/openstack-ansible-os_keystone"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_keystone"
   scm: git
   version: "master"
 - name: "os_magnum"
-  src: "https://github.com/openstack/openstack-ansible-os_magnum"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_magnum"
   scm: git
   version: "master"
 - name: "os_monasca"
-  src: "https://github.com/openstack/openstack-ansible-os_monasca"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_monasca"
   scm: git
   version: "master"
 - name: "os_neutron"
-  src: "https://github.com/openstack/openstack-ansible-os_neutron"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_neutron"
   scm: git
   version: "master"
 - name: "os_nova"
-  src: "https://github.com/openstack/openstack-ansible-os_nova"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_nova"
   scm: git
   version: "master"
 - name: "os_rally"
-  src: "https://github.com/openstack/openstack-ansible-os_rally"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_rally"
   scm: git
   version: "master"
 - name: "os_sahara"
-  src: "https://github.com/openstack/openstack-ansible-os_sahara"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_sahara"
   scm: git
   version: "master"
 - name: "os_swift"
-  src: "https://github.com/openstack/openstack-ansible-os_swift"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_swift"
   scm: git
   version: "master"
 - name: "os_tempest"
-  src: "https://github.com/openstack/openstack-ansible-os_tempest"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_tempest"
   scm: git
   version: "master"
 - name: "os_trove"
-  src: "https://github.com/openstack/openstack-ansible-os_trove"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_trove"
   scm: git
   version: "master"
 - name: "os_watcher"
-  src: "https://github.com/openstack/openstack-ansible-os_watcher"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_watcher"
   scm: git
   version: "master"
 - name: "os_zaqar"
-  src: "https://github.com/openstack/openstack-ansible-os_zaqar"
+  src: "https://git.openstack.org/openstack/openstack-ansible-os_zaqar"
   scm: git
   version: "master"
 - name: "pip_install"
-  src: "https://github.com/openstack/openstack-ansible-pip_install"
+  src: "https://git.openstack.org/openstack/openstack-ansible-pip_install"
   scm: git
   version: "master"
 - name: "pip_lock_down"
-  src: "https://github.com/openstack/openstack-ansible-pip_lock_down"
+  src: "https://git.openstack.org/openstack/openstack-ansible-pip_lock_down"
   scm: git
   version: "master"
 - name: "plugins"
-  src: "https://github.com/openstack/openstack-ansible-plugins"
+  src: "https://git.openstack.org/openstack/openstack-ansible-plugins"
   scm: git
   version: "master"
 - name: "rabbitmq_server"
-  src: "https://github.com/openstack/openstack-ansible-rabbitmq_server"
+  src: "https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server"
   scm: git
   version: "master"
 - name: "repo_build"
-  src: "https://github.com/openstack/openstack-ansible-repo_build"
+  src: "https://git.openstack.org/openstack/openstack-ansible-repo_build"
   scm: git
   version: "master"
 - name: "repo_server"
-  src: "https://github.com/openstack/openstack-ansible-repo_server"
+  src: "https://git.openstack.org/openstack/openstack-ansible-repo_server"
   scm: git
   version: "master"
 - name: "rsyslog_client"
-  src: "https://github.com/openstack/openstack-ansible-rsyslog_client"
+  src: "https://git.openstack.org/openstack/openstack-ansible-rsyslog_client"
   scm: git
   version: "master"
 - name: "rsyslog_server"
-  src: "https://github.com/openstack/openstack-ansible-rsyslog_server"
+  src: "https://git.openstack.org/openstack/openstack-ansible-rsyslog_server"
   scm: git
   version: "master"
 - name: "security"
-  src: "https://github.com/openstack/openstack-ansible-security"
+  src: "https://git.openstack.org/openstack/openstack-ansible-security"
   scm: git
   version: "master"
diff --git a/bindep.txt b/bindep.txt
index 763bb12f..5ebc223e 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/cgit/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