diff --git a/group_vars/all.yml b/group_vars/all.yml
index ffb8775d..475a4762 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -150,6 +150,15 @@
       use_sudo_nopass: yes
       user_state: present
       groups: root, docker
+      servers:
+        - docker
+    - username: munin
+      password: "{{ lookup('keepass', 'munin_linux_password_hash', 'password') }}"
+      update_password: always
+      use_sudo: yes
+      use_sudo_nopass: yes
+      user_state: present
+      groups: root
       servers:
         - production
         - test
diff --git a/group_vars/gitea.yml b/group_vars/gitea.yml
index 0e7cef26..ab73e366 100644
--- a/group_vars/gitea.yml
+++ b/group_vars/gitea.yml
@@ -75,6 +75,6 @@
   gitea_disable_registration: true
 
   gitea_fail2ban_enabled: true
-  gitea_fail2ban_jail_maxretry: 10
+  gitea_fail2ban_jail_maxretry: 3
   gitea_fail2ban_jail_findtime: 300
-  gitea_fail2ban_jail_bantime: 300
+  gitea_fail2ban_jail_bantime: 600
diff --git a/playbooks/0_setup.yml b/playbooks/0_setup.yml
index c7739b0c..56ae8fa8 100644
--- a/playbooks/0_setup.yml
+++ b/playbooks/0_setup.yml
@@ -1,4 +1,4 @@
 ---
   - import_playbook: 1_bootstrap.yml
-  - import_playbook: 2_all.yml
   - import_playbook: 4_update_packages.yml
+  - import_playbook: 2_all.yml