diff --git a/roles/batman/tasks/from_source.yml b/roles/batman/tasks/from_source.yml
index 7ff79f1..8de3377 100644
--- a/roles/batman/tasks/from_source.yml
+++ b/roles/batman/tasks/from_source.yml
@@ -94,3 +94,8 @@
   ansible.builtin.file:
     path: /opt/batctl-{{ batman_version }}
     state: absent
+
+- name: Remove old batman-adv versions
+  ansible.builtin.script: files/cleanup.py {{ batman_version }}
+  args:
+    executable: python3
\ No newline at end of file
diff --git a/roles/batman/tasks/main.yml b/roles/batman/tasks/main.yml
index 0a26612..d055e65 100644
--- a/roles/batman/tasks/main.yml
+++ b/roles/batman/tasks/main.yml
@@ -13,7 +13,7 @@
 
 - name: Print batman version and target
   ansible.builtin.debug:
-    msg: "Currently installed batman {{ installed_batman_version.stdout }} target is {{ batman_version }}"
+    msg: "Currently installed batman: {{ installed_batman_version.stdout }} ,target is: {{ batman_version }}"
 
 - name: Check if batman-adv needs to be installed or upgraded
   ansible.builtin.include_tasks: from_source.yml
diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml
index 1f6209f..6441ac7 100644
--- a/roles/ssh/tasks/main.yml
+++ b/roles/ssh/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: Set up public ssh keys for root
   ansible.posix.authorized_key:
-    user: '{{ login_user }}'
+    user: "{{ users[0]['username'] }}"
     state: present
     key: '{{ item }}'
   with_file:
diff --git a/setup.yml b/setup.yml
index f0fee67..b106278 100644
--- a/setup.yml
+++ b/setup.yml
@@ -3,6 +3,9 @@
   vars:
     users:
       - username: root
+    batman_version: "2024.0"
+    node_exporter_version: "1.7.0"
+    bootstrap_version: "5.3.2"
   pre_tasks:
     - name: Update apt cache
       ansible.builtin.apt:
@@ -12,18 +15,18 @@
     - { role: wireguardexit, tags: "wireguard, exit"}
     - { role: hostname, tags: "hostname"}
     - { role: fail2ban, tags: "fail2ban"}
-    - { role: batman, tags: "batman-adv", batman_version: "2023.3"}
+    - { role: batman, tags: "batman-adv"}
     - { role: fastd, tags: "fastd"}
     - { role: radvd, tags: "radvd"}
     - { role: dhcp, tags: "isc-dhcp4-server"}
     - { role: bind, tags: "dns"}
     - { role: respondd, tags: "respondd"}
-    - { role: prometheus, tags: "node_exporter", node_exporter_version: "1.7.0"}
+    - { role: prometheus, tags: "node_exporter"}
     - { role: letsencrypt, tags: "letsencrypt"}
-    - { role: nginx, tags: "node_exporter, nginx", bootstrap_version: "5.3.2"}
-    - { role: tools, tags: "admin-tools", batman_version: "2023.3"}
+    - { role: nginx, tags: "node_exporter, nginx", }
+    - { role: tools, tags: "admin-tools"}
     - { role: motd, tags: "motd"}
     - { role: ohmyzsh, tags: "oh-my-zsh", oh_my_zsh_theme: ffsh}
     - { role: ohmyzshtheme, tags: "oh-my-zsh-theme"}
-    - { role: ssh, tags: "ssh keys", login_user: 'root'}
+    - { role: ssh, tags: "ssh keys"}
     - { role: ffshmon, tags: "wireguard, ffshmon"}