diff --git a/playbooks/inventory/group_vars/hosts.yml b/playbooks/inventory/group_vars/hosts.yml
index 98422039b9..5fb8ca11f8 100644
--- a/playbooks/inventory/group_vars/hosts.yml
+++ b/playbooks/inventory/group_vars/hosts.yml
@@ -59,11 +59,14 @@ galera_wsrep_address: "{{ ansible_ssh_host }}"
 
 
 ## Pip install
-# Lock down pip to only a specific version of pip
+# Ensure that the pip_install role tries the local repo before looking
+# for pip in alternative locations
 pip_get_pip_options: >
   --no-index
-  --find-links="{{ openstack_repo_url }}/os-releases/{{ openstack_release }}"
-  --trusted-host {{ openstack_repo_url | netloc_no_port }}
+  --find-links "{{ openstack_repo_url }}/os-releases/{{ openstack_release }}"
+  --find-links "{{ repo_pip_default_index | netorigin }}/os-releases/{{ openstack_release }}"
+  --trusted-host "{{ openstack_repo_url | netloc_no_port }}"
+  --trusted-host "{{ repo_pip_default_index | netorigin }}"
 
 pip_links:
   - { name: "openstack_release", link: "{{ openstack_repo_url }}/os-releases/{{ openstack_release }}/" }