diff --git a/bundles/backup-server/metadata.py b/bundles/backup-server/metadata.py
index d67be53..3053070 100644
--- a/bundles/backup-server/metadata.py
+++ b/bundles/backup-server/metadata.py
@@ -53,7 +53,6 @@ def dns(metadata):
     }
 
 
-
 @metadata_reactor.provides(
     'users/backup-receiver/authorized_keys'
 )
diff --git a/bundles/oh-my-zsh/items.py b/bundles/oh-my-zsh/items.py
deleted file mode 100644
index 84320ea..0000000
--- a/bundles/oh-my-zsh/items.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from os.path import join
-
-for name, user_config in node.metadata.get('users').items():
-    if user_config.get('shell', None) != '/usr/bin/zsh':
-        continue
-
-    directories = {
-        join(user_config['home'], '.zsh'): {
-            'owner': name,
-        },
-        join(user_config['home'], '.zsh/oh-my-zsh'): {
-            'owner': name,
-        },
-        join(user_config['home'], '.zsh/oh-my-zsh/custom/plugins/zsh-autosuggestions'): {
-            'owner': name,
-        },
-    }
-    
-    
-    git_deploy = {
-        join(user_config['home'], '.zsh/oh-my-zsh'): {
-            'repo': 'git://github.com/ohmyzsh/ohmyzsh.git',
-            'rev': 'master',
-        },
-        join(user_config['home'], '.zsh/oh-my-zsh/custom/plugins/zsh-autosuggestions'): {
-            'repo': 'git://github.com/zsh-users/zsh-autosuggestions.git',
-            'rev': 'master',
-        },
-    }
-
-    files = {
-        join(user_config['home'], '.zshrc'): {
-            'owner': name,
-            'source': 'zshrc',
-        },
-        join(user_config['home'], '.zsh/oh-my-zsh/themes/bw.zsh-theme'): {
-            'owner': name,
-            'needs': [
-                f"git_deploy:{join(user_config['home'], '.zsh/oh-my-zsh')}",
-            ]
-        },
-    }
-    
diff --git a/bundles/oh-my-zsh/files/bw.zsh-theme b/bundles/zsh/files/bw.zsh-theme
similarity index 100%
rename from bundles/oh-my-zsh/files/bw.zsh-theme
rename to bundles/zsh/files/bw.zsh-theme
diff --git a/bundles/oh-my-zsh/files/zshrc b/bundles/zsh/files/zshrc
similarity index 100%
rename from bundles/oh-my-zsh/files/zshrc
rename to bundles/zsh/files/zshrc
diff --git a/bundles/zsh/items.py b/bundles/zsh/items.py
index fa85dda..84320ea 100644
--- a/bundles/zsh/items.py
+++ b/bundles/zsh/items.py
@@ -1,14 +1,43 @@
 from os.path import join
 
 for name, user_config in node.metadata.get('users').items():
-    print(user_config)
-    if 'oh_my_zsh' in user_config:
-        directories = {
-            join(user_config['home'], '.zsh'): {},
-            join(user_config['home'], '.zsh/oh-my-zsh'): {},
-        }
-        
-        git_deploy[join(user_config['home'], '.zsh/oh-my-zsh')] = {
+    if user_config.get('shell', None) != '/usr/bin/zsh':
+        continue
+
+    directories = {
+        join(user_config['home'], '.zsh'): {
+            'owner': name,
+        },
+        join(user_config['home'], '.zsh/oh-my-zsh'): {
+            'owner': name,
+        },
+        join(user_config['home'], '.zsh/oh-my-zsh/custom/plugins/zsh-autosuggestions'): {
+            'owner': name,
+        },
+    }
+    
+    
+    git_deploy = {
+        join(user_config['home'], '.zsh/oh-my-zsh'): {
             'repo': 'git://github.com/ohmyzsh/ohmyzsh.git',
             'rev': 'master',
-        }
+        },
+        join(user_config['home'], '.zsh/oh-my-zsh/custom/plugins/zsh-autosuggestions'): {
+            'repo': 'git://github.com/zsh-users/zsh-autosuggestions.git',
+            'rev': 'master',
+        },
+    }
+
+    files = {
+        join(user_config['home'], '.zshrc'): {
+            'owner': name,
+            'source': 'zshrc',
+        },
+        join(user_config['home'], '.zsh/oh-my-zsh/themes/bw.zsh-theme'): {
+            'owner': name,
+            'needs': [
+                f"git_deploy:{join(user_config['home'], '.zsh/oh-my-zsh')}",
+            ]
+        },
+    }
+    
diff --git a/bundles/zsh/metadata.py b/bundles/zsh/metadata.py
index 314d52a..7aa3349 100644
--- a/bundles/zsh/metadata.py
+++ b/bundles/zsh/metadata.py
@@ -5,13 +5,3 @@ defaults = {
         }
     }
 }
-
-@metadata_reactor.provides(
-    'users'
-)
-def users(metadata):
-    return {
-        'users': {
-            'user'
-        }
-    }
diff --git a/groups/all.py b/groups/all.py
index c2e5292..294c47c 100644
--- a/groups/all.py
+++ b/groups/all.py
@@ -1,6 +1,7 @@
 {
     'bundles': [
         'users',
+        'zsh',
     ],
     'metadata': {
         'dns': {},
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index 593951d..69e0dfc 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -12,7 +12,6 @@
     ],
     'bundles': [
         'nextcloud',
-        'oh-my-zsh',
         'wireguard',
         'zfs',
     ],