diff --git a/tests/roles/bootstrap-host/tasks/install-apt.yml b/tests/roles/bootstrap-host/tasks/install-apt.yml
index ff644c67f3..cc6535651f 100644
--- a/tests/roles/bootstrap-host/tasks/install-apt.yml
+++ b/tests/roles/bootstrap-host/tasks/install-apt.yml
@@ -20,12 +20,6 @@
   tags:
     - apt-install-prerequisites
 
-- name: Determine the list of apt configuration files on the host
-  command: "ls -1 /etc/apt/apt.conf.d"
-  register: apt_conf_files
-  tags:
-    - apt-conf-files
-
 - name: Determine the existing Ubuntu repo configuration
   shell: 'awk "/^deb .*ubuntu\/? {{ ansible_distribution_release }} main/ {print \$2; exit}" /etc/apt/sources.list'
   register: ubuntu_repo
diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
index 3b288e3391..5308c6f430 100644
--- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
@@ -185,14 +185,3 @@
     - pip_conf_file.stat.exists
   tags:
     - container-conf-files
-
-- name: Add the list of dicts for the apt config files into user_conf_files
-  lineinfile:
-    dest: /etc/openstack_deploy/user_conf_files.yml
-    line: " - { src: '/etc/apt/apt.conf.d/{{ item }}', dest: '/etc/apt/apt.conf.d/{{ item }}' }"
-  with_items: apt_conf_files.stdout_lines
-  when:
-    - apt_conf_files is defined
-    - apt_conf_files.stdout_lines | length > 0
-  tags:
-    - container-conf-files
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 558ace0e7b..8b1527ac42 100644
--- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
@@ -90,9 +90,6 @@ lxc_net_dhcp_range: 10.255.255.2,10.255.255.253
 
 ## LXC Container Settings
 lxc_cache_resolvers: {{ lxc_cache_resolvers }}
-lxc_container_template_main_apt_repo: {{ bootstrap_host_ubuntu_repo }}
-lxc_container_template_security_apt_repo: {{ bootstrap_host_ubuntu_security_repo }}
-lxc_container_template_apt_components: {{ bootstrap_host_apt_components }}
 
 ## Security hardening
 apply_security_hardening: true