diff --git a/global.yml b/global.yml
index b30f101..7f2fe39 100644
--- a/global.yml
+++ b/global.yml
@@ -2,34 +2,42 @@
 
 all:
   hosts:
+    iodine:
+      ansible_host: iodine.int.finallycoffee.eu
+      ansible_user: jdreichmann
+      ansible_become_user: jdreichmann
+      ansible_become: true
     carbon:
       ansible_host: carbon.int.finallycoffee.eu
-    iron:
-      ansible_host: iron.int.finallycoffee.eu
-    platinum:
-      ansible_host: platinum.int.finallycoffee.eu
-    xenon:
-      ansible_host: xenon.int.finallycoffee.eu
-    yttrium:
-      ansible_host: yttrium.int.finallycoffee.eu
+#    iron:
+#      ansible_host: iron.int.finallycoffee.eu
+#    platinum:
+#      ansible_host: platinum.int.finallycoffee.eu
+#    xenon:
+#      ansible_host: xenon.int.finallycoffee.eu
+#    yttrium:
+#      ansible_host: yttrium.int.finallycoffee.eu
+  
+    munich:
+      ansible_host: munich.finallycoffee.eu
+      ansible_user: jdreichmann
+      ansible_become_user: jdreichmann
+      ansible_become: true
   vars:
     ansible_user: transcaffeine
     ansible_become_user: transcaffeine
     ansible_become: true
 
-gnupg:
-  hosts:
-    all:
 
-redshift:
+servers:
   hosts:
-    all:
+    iodine:
+    munich:
+#    iron:
+#    platinum:
 
-tmux:
+clients:
   hosts:
-    all:
-
-vim:
-  hosts:
-    all:
+#    carbon:
+#    xenon:
 
diff --git a/gnupg.yml b/gnupg.yml
index cd2ae7a..5696855 100644
--- a/gnupg.yml
+++ b/gnupg.yml
@@ -1,8 +1,7 @@
 ---
 
 - name: Sets up gpg and the configs for using it as a ssh-agent
-  #connection: local
-  hosts: gnupg
+  hosts: all
   become: true
   roles:
     - gnupg
diff --git a/redshift.yml b/redshift.yml
index 21ef9f3..aaf462c 100644
--- a/redshift.yml
+++ b/redshift.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Sets up redshift and creates an autostart file
-  hosts: redshift
+  hosts: clients
   become: true
   roles:
     - redshift
diff --git a/roles/gnupg/tasks/main.yml b/roles/gnupg/tasks/main.yml
index 872b566..1fb1d1b 100644
--- a/roles/gnupg/tasks/main.yml
+++ b/roles/gnupg/tasks/main.yml
@@ -5,6 +5,9 @@
   package:
     name: gnupg2
     state: latest
+  become: yes
+  become_user: root
+  become_method: sudo
   when: ansible_os_family == "RedHat"
   ignore_errors: true
 
diff --git a/roles/tmux/tasks/.main.yml.swp b/roles/tmux/tasks/.main.yml.swp
deleted file mode 100644
index da76f11..0000000
Binary files a/roles/tmux/tasks/.main.yml.swp and /dev/null differ
diff --git a/roles/tmux/tasks/main.yml b/roles/tmux/tasks/main.yml
index 1d75f9b..3a1ba68 100644
--- a/roles/tmux/tasks/main.yml
+++ b/roles/tmux/tasks/main.yml
@@ -4,6 +4,9 @@
   package:
     name: tmux
     state: present
+  become: yes
+  become_user: root
+  become_method: sudo
   ignore_errors: true
 
 - name: Template config file into home folder
diff --git a/tmux.yml b/tmux.yml
index 4a91874..d782211 100644
--- a/tmux.yml
+++ b/tmux.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Set up tmux
-  hosts: tmux
+  hosts: all
   become: true
   roles:
     - tmux
diff --git a/vim.yml b/vim.yml
index a339248..3d4b5f6 100644
--- a/vim.yml
+++ b/vim.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Install vim and copy color scheme and template its config
-  hosts: vim
+  hosts: all
   become: true
   roles:
     - vim