diff --git a/ansible/playbooks/init-nodes.yml b/ansible/playbooks/init-nodes.yml
index 13a9a4c..ec1599a 100644
--- a/ansible/playbooks/init-nodes.yml
+++ b/ansible/playbooks/init-nodes.yml
@@ -86,7 +86,7 @@
         mode: 0744
         owner: 'root'
         group: 'root'
-      when: not aio_install
+      when: aio_install is undefined or not aio_install
       tags:
         - interfaces
 
@@ -95,7 +95,7 @@
       args:
         chdir: /etc/sysconfig/network-scripts/
         creates: /etc/sysconfig/network-scripts/ifcfg-br-mgmt
-      when: not aio_install
+      when: aio_install is undefined or not aio_install
       tags:
         - interfaces
 
@@ -151,7 +151,7 @@
 
 
     - name: Install packages on non-infra hosts
-      when: tag.find("infra") == -1 or aio_install
+      when: tag.find("infra") != -1 or aio_install
       ansible.builtin.dnf:
         name:
           - iputils
diff --git a/ansible/playbooks/role-infra-host.yml b/ansible/playbooks/role-infra-host.yml
index 6e6727c..697b424 100644
--- a/ansible/playbooks/role-infra-host.yml
+++ b/ansible/playbooks/role-infra-host.yml
@@ -47,13 +47,12 @@
           #    - bootstrap
 
     - name: Deploy and setup configuration
-      when: not aio_install | default('true') # bootstrap-AIO script instead does these things.
       block:
         - name: Copy template to etc
           ansible.builtin.copy:
             remote_src: yes
             src: /opt/openstack-ansible/etc/openstack_deploy/
-            dest: /etc/openstack_deploy/
+            dest: /etc/openstack_deploy
             directory_mode: yes
             force: no
 
@@ -73,7 +72,8 @@
           args:
             creates: /etc/openstack_deploy/user_secrets.yml.tar
 
-    - import_tasks: tasks/python3-lxc.yml
+              #- import_tasks: tasks/python3-lxc.yml
+              #  tags: python3-lxc
 
     - name: "[AIO] Deploy and setup configuration / bootstrap"
       when: aio_install | default('false')
@@ -118,7 +118,7 @@
         mode: '0644'
       with_items:
         - lxc_install_dnf
-      tags: config
+      tags: config,patch
 
     - name: manually patch os_nova role to kill powervmtools and futures== requiresments
       ansible.builtin.copy:
@@ -127,7 +127,7 @@
         mode: '0644'
       with_items:
         - os_nova.patch
-      tags: config
+      tags: config,patch
 
     - name: patch the thing
       args: