diff --git a/group_vars/desktop.yaml b/group_vars/desktop.yaml
index 0e19c90..260f336 100644
--- a/group_vars/desktop.yaml
+++ b/group_vars/desktop.yaml
@@ -15,6 +15,5 @@ packages_de:
 packages_gui:
   - gimp
   - qutebrowser
-  - python3-adblock # dependency for qutebrowser adblocking
   - sioyek
   - wdisplays
diff --git a/group_vars/headless.yaml b/group_vars/headless.yaml
index c4272cf..7b938dc 100644
--- a/group_vars/headless.yaml
+++ b/group_vars/headless.yaml
@@ -70,10 +70,3 @@ packages_terminal:
   - zoxide
   - zr # zsh plugin manager
   - zsh
-
-packages_custom:
-  - bemoji
-  - dotter
-  - filtile-bin
-  - localsend-go
-  - ripgrep-all
diff --git a/roles/base/tasks/main.yaml b/roles/base/tasks/main.yaml
index 28f99d0..b51f445 100644
--- a/roles/base/tasks/main.yaml
+++ b/roles/base/tasks/main.yaml
@@ -138,6 +138,6 @@
 
     - name: Put user in socklog group
       ansible.builtin.user:
-        name: "{{ user_name | default('root') }}"
+        name: "{{ user_name }}"
         groups: [socklog]
         append: true
diff --git a/roles/base/vars/main.yaml b/roles/base/vars/main.yaml
index a75088a..01f3915 100644
--- a/roles/base/vars/main.yaml
+++ b/roles/base/vars/main.yaml
@@ -1,5 +1,5 @@
 ---
-booster_initramfs_name: /boot/initramfs
+booster_initramfs_name: /boot/booster-void
 host_name: voider
 timezone: Europe/Berlin
 locales_enabled:
diff --git a/roles/gnupg/tasks/main.yaml b/roles/gnupg/tasks/main.yaml
index e1bec46..98b5a2b 100644
--- a/roles/gnupg/tasks/main.yaml
+++ b/roles/gnupg/tasks/main.yaml
@@ -14,6 +14,6 @@
 
 - name: Put user in plugdev group
   ansible.builtin.user:
-    name: "{{ user_name | default('root') }}"
+    name: "{{ user_name }}"
     groups: [plugdev]
     append: true
diff --git a/roles/packages/defaults/main.yaml b/roles/packages/defaults/main.yaml
deleted file mode 100644
index f6c640f..0000000
--- a/roles/packages/defaults/main.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-custom_repositories:
-  - https://marty-oehme.github.io/void-templates
diff --git a/roles/packages/tasks/main.yaml b/roles/packages/tasks/main.yaml
index 75784cc..d74b51e 100644
--- a/roles/packages/tasks/main.yaml
+++ b/roles/packages/tasks/main.yaml
@@ -1,12 +1,3 @@
----
-- name: Add custom repositories
-  ansible.builtin.template:
-    src: custom-repos.conf.j2
-    dest: /etc/xbps.d/20-custom-repositories.conf
-  tags:
-    - repositories
-    - custom_packages
-
 - name: Install all my used void packages
   community.general.xbps:
     name: "{{ lookup('community.general.merge_variables', '^packages_.*') }}"
diff --git a/roles/packages/templates/custom-repos.conf.j2 b/roles/packages/templates/custom-repos.conf.j2
deleted file mode 100644
index 702648e..0000000
--- a/roles/packages/templates/custom-repos.conf.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for item in custom_repositories %}
-repository={{ item }}
-{% endfor %}
diff --git a/roles/pipewire/tasks/main.yaml b/roles/pipewire/tasks/main.yaml
index e60fe20..b2ce769 100644
--- a/roles/pipewire/tasks/main.yaml
+++ b/roles/pipewire/tasks/main.yaml
@@ -6,7 +6,7 @@
 
 - name: Put user in audio group
   ansible.builtin.user:
-    name: "{{ user_name | default('root') }}"
+    name: "{{ user_name }}"
     groups: "{{ audio_groups }}"
     append: true
 
diff --git a/roles/power/tasks/main.yaml b/roles/power/tasks/main.yaml
index b6f1c15..d55f4a5 100644
--- a/roles/power/tasks/main.yaml
+++ b/roles/power/tasks/main.yaml
@@ -6,7 +6,7 @@
 
 - name: Put user in power group
   ansible.builtin.user:
-    name: "{{ user_name | default('root') }}"
+    name: "{{ user_name }}"
     groups: [power]
     append: true
 
diff --git a/roles/user/tasks/main.yaml b/roles/user/tasks/main.yaml
index 3f8e48e..bcba9bb 100644
--- a/roles/user/tasks/main.yaml
+++ b/roles/user/tasks/main.yaml
@@ -16,11 +16,11 @@
 
 - name: Add primary user
   ansible.builtin.user:
-    name: "{{ user_name | default('root') }}"
+    name: "{{ user_name }}"
     password: "{{ user_pass | password_hash('sha512', '{{ user_pass_salt}}') }}"
     create_home: true
     shell: "/bin/{{ user_shell }}"
-    group: "{{ user_name | default('root') }}"
+    group: "{{ user_name }}"
     groups: "{{ user_groups }}"
     generate_ssh_key: true
   tags: