diff --git a/bindep.txt b/bindep.txt
index fe589259..02d792c3 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
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 14c3eb2e..a83d33b4 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -10,7 +10,7 @@ OpenStack-Ansible role for Bare Metal (ironic) service
 This is an OpenStack-Ansible role to deploy the Bare Metal (ironic)
 service. See the `role-ironic spec`_ for more information.
 
-.. _role-ironic spec: https://github.com/openstack/openstack-ansible-specs/blob/master/specs/mitaka/role-ironic.rst
+.. _role-ironic spec: http://specs.openstack.org/openstack/openstack-ansible-specs/specs/mitaka/role-ironic.html
 
 
 Default variables
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index 8c934120..0d69afa2 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -39,7 +39,7 @@
   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: os_swift