diff --git a/roles/cleanup/tasks/main.yml b/roles/cleanup/tasks/main.yml
index 2192543..5031d08 100644
--- a/roles/cleanup/tasks/main.yml
+++ b/roles/cleanup/tasks/main.yml
@@ -16,6 +16,11 @@
     key: "{{ tmp_pub_key }}"
     manage_dir: true
 
+- name: Disable wheel to sudo without password.
+  file:
+    path: /etc/sudoers.d/00-tmp-sudo-full-access
+    state: absent
+
 - name: Disable ssh server.
   systemd:
     name: sshd
diff --git a/roles/create_user/tasks/main.yml b/roles/create_user/tasks/main.yml
index abae9ce..d6eabcc 100644
--- a/roles/create_user/tasks/main.yml
+++ b/roles/create_user/tasks/main.yml
@@ -1,4 +1,12 @@
 ---
+- name: Allow wheel to execute any command.
+  lineinfile:
+    path: /etc/sudeers
+    state: present
+    regexp: ^%wheel ALL=(ALL) ALL
+    line: "%wheel ALL=(ALL) ALL"
+    validate: visudo -cf %s
+
 - name: Allow wheel to sudo without password.
   copy:
     dest: /etc/sudoers.d/00-tmp-sudo-full-access
diff --git a/roles/disk/egb/partitioning/defaults/main.yml b/roles/disk/egb/partitioning/defaults/main.yml
index 1306f69..0685862 100644
--- a/roles/disk/egb/partitioning/defaults/main.yml
+++ b/roles/disk/egb/partitioning/defaults/main.yml
@@ -9,7 +9,7 @@ disk_egb_esp_size: "{{ 512 * 1024 * 1024 }}"
 #   +-- @home    (to be mmounted at /home)
 #   +-- ...
 #
-disk_egb_btrfs_subvolumes: "{{ disk_egb_core_btrfs_subvolumes + disk_egb_priv_extra_btrfs_subvolumes }}"
+disk_egb_btrfs_subvolumes: "{{ disk_egb_core_btrfs_subvolumes + disk_egb_extra_btrfs_subvolumes }}"
 
 # These subvolumes should always be present. DO NOT OVERRIDE.
 disk_egb_core_btrfs_subvolumes:
diff --git a/roles/disk/egb/partitioning/tasks/format-parts.yml b/roles/disk/egb/partitioning/tasks/format-parts.yml
index 416ca07..5da4705 100644
--- a/roles/disk/egb/partitioning/tasks/format-parts.yml
+++ b/roles/disk/egb/partitioning/tasks/format-parts.yml
@@ -4,12 +4,14 @@
     device: "{{ disk_egb_esp_device_node }}"
     state: present
     type: vfat
+    force: true
 
 - name: Format the root partition with btrfs.
   filesystem:
     device: "{{ disk_egb_root_device_node }}"
     state: present
     type: btrfs
+    force: true
 
 - name: Mount the default subvolume.
   mount:
diff --git a/roles/disk/egbl/partitioning/tasks/format-parts.yml b/roles/disk/egbl/partitioning/tasks/format-parts.yml
index 5706410..3627432 100644
--- a/roles/disk/egbl/partitioning/tasks/format-parts.yml
+++ b/roles/disk/egbl/partitioning/tasks/format-parts.yml
@@ -4,12 +4,14 @@
     device: "{{ disk_egbl_esp_device_node }}"
     state: present
     type: vfat
+    force: true
 
 - name: Format the luks container with btrfs.
   filesystem:
     device: /dev/mapper/{{ disk_egbl_luks_name }}
     state: present
     type: btrfs
+    force: true
 
 - name: Mount the default subvolume.
   mount: