diff --git a/group_vars/blocky.yml b/group_vars/blocky.yml
index f667a14c..d330f2cf 100644
--- a/group_vars/blocky.yml
+++ b/group_vars/blocky.yml
@@ -25,11 +25,6 @@ apt_packages_extra:
 
 ### mgrote_user_setup
 dotfiles_vim_vundle_repo_url: "http://{{ ansible_forgejo_user | urlencode }}:{{ ansible_forgejo_user_pass | urlencode }}@192.168.2.42:3000/mirrors/Vundle.vim.git"
-dotfiles:
-  - user: mg
-    home: /home/mg
-  - user: root
-    home: /root
 dotfiles_repo_url: http://192.168.2.42:3000/mg/dotfiles
 
 ### mgrote_restic
diff --git a/group_vars/docker.yml b/group_vars/docker.yml
index b0ebe4e6..ba96e136 100644
--- a/group_vars/docker.yml
+++ b/group_vars/docker.yml
@@ -29,7 +29,10 @@ users:
   - username: mg
     password: "{{ lookup('viczem.keepass.keepass', 'mg_linux_password_hash', 'password') }}"
     update_password: always
-    groups: ssh, sudo, docker
+    groups:
+      - ssh
+      - sudo
+      - docker
     state: present
     public_ssh_key: "{{ ssh_public_key_mg }}"
     allow_sudo: true
@@ -37,7 +40,10 @@ users:
   - username: docker-user
     password: "{{ lookup('viczem.keepass.keepass', 'docker-user_linux_password_hash', 'password') }}"
     update_password: always
-    groups: ssh, sudo, docker
+    groups:
+      - ssh
+      - sudo
+      - docker
     state: present
     allow_sudo: true
     allow_passwordless_sudo: true
@@ -45,7 +51,9 @@ users:
   - username: ansible-user
     password: "{{ lookup('viczem.keepass.keepass', 'ansible_user_linux_password_hash', 'password') }}"
     update_password: always
-    groups: ssh, sudo
+    groups:
+      - ssh
+      - sudo
     state: present
     public_ssh_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJcBwOjanQV6sFWaTetqpl20SVe3aRzGjKbsp7hKkDCE mg@irantu
     allow_sudo: true
diff --git a/group_vars/pve.yml b/group_vars/pve.yml
index ee839847..b2b56dcc 100644
--- a/group_vars/pve.yml
+++ b/group_vars/pve.yml
@@ -7,14 +7,19 @@ users:
   - username: root
     password: "{{ lookup('viczem.keepass.keepass', 'root_linux_password_hash_proxmox', 'password') }}"
     update_password: always
-    groups: ssh, sudo, root
+    groups:
+      - ssh
+      - sudo
+      - root
     state: present
     allow_sudo: true
     allow_passwordless_sudo: true
   - username: mg
     password: "{{ lookup('viczem.keepass.keepass', 'mg_linux_password_hash', 'password') }}"
     update_password: always
-    groups: ssh, sudo
+    groups:
+      - ssh
+      - sudo
     state: present
     public_ssh_key: "{{ ssh_public_key_mg }}"
     allow_sudo: true
@@ -22,7 +27,9 @@ users:
   - username: ansible-user
     password: "{{ lookup('viczem.keepass.keepass', 'ansible_user_linux_password_hash', 'password') }}"
     update_password: always
-    groups: ssh, sudo
+    groups:
+      - ssh
+      - sudo
     state: present
     public_ssh_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJcBwOjanQV6sFWaTetqpl20SVe3aRzGjKbsp7hKkDCE mg@irantu
     allow_sudo: true