diff --git a/.drone.yml b/.drone.yml
index 20cc787..86e210b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -18,7 +18,7 @@ steps:
   - packer --version
   - ansible --version
   - ovftool --version
-- name: Ubuntu Server 22.04
+- name: Kubernetes Bootstrap Appliance
   image: bv11-cr01.bessems.eu/library/packer-extended
   pull: always
   commands:
@@ -36,7 +36,7 @@ steps:
   - |
     packer validate \
       -var vm_name=$DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
-      -var vm_guestos=ubuntuserver22.04 \
+      -var vm_guestos=k8sbootstrap \
       -var repo_username=$${REPO_USERNAME} \
       -var repo_password=$${REPO_PASSWORD} \
       -var vsphere_password=$${VSPHERE_PASSWORD} \
@@ -46,7 +46,7 @@ steps:
     packer build \
       -on-error=cleanup -timestamp-ui \
       -var vm_name=$DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
-      -var vm_guestos=ubuntuserver22.04 \
+      -var vm_guestos=k8sbootstrap \
       -var repo_username=$${REPO_USERNAME} \
       -var repo_password=$${REPO_PASSWORD} \
       -var vsphere_password=$${VSPHERE_PASSWORD} \
diff --git a/ansible/playbook.yml b/ansible/playbook.yml
index 4465571..d90e1eb 100644
--- a/ansible/playbook.yml
+++ b/ansible/playbook.yml
@@ -1,7 +1,7 @@
 ---
 - hosts: all
   gather_facts: false
-  group_vars:
+  vars_files:
     - metacluster.yml
   become: true
   roles:
diff --git a/ansible/roles/bootstrap/tasks/main.yml b/ansible/roles/bootstrap/tasks/main.yml
index 36a7c41..97a5cc2 100644
--- a/ansible/roles/bootstrap/tasks/main.yml
+++ b/ansible/roles/bootstrap/tasks/main.yml
@@ -1,2 +1,2 @@
-- name: XYZ
-  import_tasks: foo.yml
+- name: Install & configure dependencies
+  import_tasks: dependencies.yml
diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml
new file mode 100644
index 0000000..832492d
--- /dev/null
+++ b/ansible/roles/metacluster/tasks/components.yml
@@ -0,0 +1,3 @@
+#- name: XYZ
+#  ansible.builtin.get_url:
+
diff --git a/ansible/roles/metacluster/tasks/main.yml b/ansible/roles/metacluster/tasks/main.yml
index 36a7c41..69d44d7 100644
--- a/ansible/roles/metacluster/tasks/main.yml
+++ b/ansible/roles/metacluster/tasks/main.yml
@@ -1,2 +1,4 @@
-- name: XYZ
-  import_tasks: foo.yml
+- name: Pre-stage K3s components
+  import_tasks: k3s.yml
+- name: Pre-stage meta components
+  import_tasks: components.yml