diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
index 71525ded99..6c993b9636 100644
--- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
@@ -125,8 +125,10 @@
 
 - name: Disable nova using UCA in OpenStack-CI
   set_fact:
-    nova_uca_enable: False
-  when: nodepool_dir.stat.exists
+    uca_apt_repo_url: "{{ bootstrap_host_ubuntu_repo | netorigin }}/ubuntu-cloud-archive"
+  when:
+    - nodepool_dir.stat.exists
+    - bootstrap_host_ubuntu_repo is defined
 
 - name: Determine if the host has a global pip config file
   stat:
diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
index 137c202eba..3e256c6407 100644
--- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
@@ -100,7 +100,7 @@ repo_build_pip_extra_indexes:
 {{ repo_build_pip_extra_indexes | to_nice_yaml }}
 {% endif %}
 
-{% if nova_uca_enable is defined %}
-## TODO(odyssey4me) Remove this once OpenStack-Infra has UCA mirrors
-nova_uca_enable: {{ nova_uca_enable }}
+{% if uca_apt_repo_url is defined %}
+## Ubuntu Cloud Archive mirror to use
+uca_apt_repo_url: {{ uca_apt_repo_url }}
 {% endif %}