diff --git a/roles/bootstrap/tasks/core_installations@podman.yml b/roles/bootstrap/tasks/core_installations@podman.yml
index ef27920..f088645 100644
--- a/roles/bootstrap/tasks/core_installations@podman.yml
+++ b/roles/bootstrap/tasks/core_installations@podman.yml
@@ -5,4 +5,4 @@
     tag: "{{ item.tag }}"
     pull: yes
     state: present
-  loop: "{{ cimages.core_cimages }}"
\ No newline at end of file
+  loop: "{{ core_cimages }}"
\ No newline at end of file
diff --git a/roles/bootstrap/tasks/extra_installations.yml b/roles/bootstrap/tasks/extra_installations.yml
index 1cf5aae..b1ef7ee 100644
--- a/roles/bootstrap/tasks/extra_installations.yml
+++ b/roles/bootstrap/tasks/extra_installations.yml
@@ -3,6 +3,5 @@
   package:
     name: "{{ item.package }}"
     state: present
-  loop: "{{ combine(*extra_packages) }}"
-  register: extra_done
-  tags: ['default', 'extra']
\ No newline at end of file
+  loop: "{{ my_pkgs }}"
+  register: extra_done
\ No newline at end of file
diff --git a/roles/bootstrap/tasks/extra_installations@podman.yml b/roles/bootstrap/tasks/extra_installations@podman.yml
index c30b6a7..848005a 100644
--- a/roles/bootstrap/tasks/extra_installations@podman.yml
+++ b/roles/bootstrap/tasks/extra_installations@podman.yml
@@ -5,4 +5,4 @@
     tag: "{{ item.tag }}"
     pull: yes
     state: present
-  loop: "{{ extra_cimages }}"
\ No newline at end of file
+  loop: "{{ recc_cimages }}"
\ No newline at end of file
diff --git a/roles/bootstrap/tasks/groups.yml b/roles/bootstrap/tasks/groups.yml
index 49244c8..5ca46f4 100644
--- a/roles/bootstrap/tasks/groups.yml
+++ b/roles/bootstrap/tasks/groups.yml
@@ -4,6 +4,6 @@
     name: "{{ item.group_name }}"
     system: yes
     state: present
-  loop: "{{ sysgroups }}"
+  loop: "{{ sys_groups }}"
   register: groups_created
   tags: ['default']
\ No newline at end of file