diff --git a/playbooks/containers-lxc-create.yml b/playbooks/containers-lxc-create.yml
index 17f0967905..942abaeccf 100644
--- a/playbooks/containers-lxc-create.yml
+++ b/playbooks/containers-lxc-create.yml
@@ -31,10 +31,13 @@
 
 - name: Create container(s)
   hosts: all_lxc_containers
+  user: root
   gather_facts: false
   vars_files:
     - "defaults/{{ install_method }}_install.yml"
-  user: root
+  environment: "{{ deployment_environment_variables | default({}) }}"
+  tags:
+    - lxc-containers-create
   roles:
     - role: "lxc_container_create"
   post_tasks:
@@ -56,16 +59,17 @@
     - name: Gather facts for new container(s)
       setup:
         gather_subset: "network,hardware,virtual"
-  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - lxc-containers-create
 
 - name: Configure containers default software
   hosts: all_lxc_containers
+  user: root
   gather_facts: true
   vars_files:
+    - defaults/repo_packages/openstack_services.yml
     - "defaults/{{ install_method }}_install.yml"
-  user: root
+  environment: "{{ deployment_environment_variables | default({}) }}"
+  tags:
+    - lxc-containers-create
   pre_tasks:
     - include: common-tasks/package-cache-proxy.yml
       when: install_method == "source"
@@ -74,9 +78,3 @@
   roles:
     - role: "openstack_hosts"
       is_container: true
-  vars_files:
-    - defaults/repo_packages/openstack_services.yml
-    - "defaults/{{ install_method }}_install.yml"
-  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - lxc-containers-create
diff --git a/playbooks/containers-lxc-host.yml b/playbooks/containers-lxc-host.yml
index 4eca2acca2..9e207d8a02 100644
--- a/playbooks/containers-lxc-host.yml
+++ b/playbooks/containers-lxc-host.yml
@@ -15,10 +15,14 @@
 
 - name: Basic lxc host setup
   hosts: "{{ lxc_host_group | default('lxc_hosts')}}"
+  user: root
   gather_facts: "{{ osa_gather_facts | default(True) }}"
   vars_files:
+    - defaults/repo_packages/openstack_services.yml
     - "defaults/{{ install_method }}_install.yml"
-  user: root
+  environment: "{{ deployment_environment_variables | default({}) }}"
+  tags:
+    - lxc-hosts
   pre_tasks:
     - include: common-tasks/set-pip-vars.yml
       when: install_method == "source"
@@ -53,9 +57,3 @@
         rsyslog_client_log_rotate_file: lxc_log_rotate
         rsyslog_client_log_dir: "/var/log/lxc"
         rsyslog_client_config_name: "99-lxc-rsyslog-client.conf"
-
-  vars_files:
-    - defaults/repo_packages/openstack_services.yml
-  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - lxc-hosts