diff --git a/bundles/bind/items.py b/bundles/bind/items.py
index 16714bc..2e1cc87 100644
--- a/bundles/bind/items.py
+++ b/bundles/bind/items.py
@@ -33,6 +33,9 @@ files['/etc/bind/named.conf'] = {
 files['/etc/bind/named.conf.options'] = {
     'owner': 'root',
     'group': 'bind',
+    'needs': [
+        'pkg_apt:bind9',
+    ],
     'needed_by': [
         'svc_systemd:bind9',
     ],
@@ -70,6 +73,9 @@ files['/etc/bind/named.conf.local'] = {
     },
     'owner': 'root',
     'group': 'bind',
+    'needs': [
+        'pkg_apt:bind9',
+    ],
     'needed_by': [
         'svc_systemd:bind9',
     ],
diff --git a/bundles/dovecot/items.py b/bundles/dovecot/items.py
index 1848baa..e976e87 100644
--- a/bundles/dovecot/items.py
+++ b/bundles/dovecot/items.py
@@ -1,13 +1,9 @@
 assert node.has_bundle('mailserver')
 
-groups['vmail'] = {}
-
 users['vmail'] = {
     'home': '/var/vmail',
-    'needs': [
-        'group:vmail',
-    ],
 }
+
 directories = {
     '/etc/dovecot': {
         'purge': True,
diff --git a/bundles/opendkim/items.py b/bundles/opendkim/items.py
index 5d10151..668e97d 100644
--- a/bundles/opendkim/items.py
+++ b/bundles/opendkim/items.py
@@ -7,7 +7,6 @@ file_attributes = {
     ],
 }
 
-groups['opendkim'] = {}
 users['opendkim'] = {}
 
 directories = {
diff --git a/bundles/postfix/items.py b/bundles/postfix/items.py
index 723bb37..8e07cfc 100644
--- a/bundles/postfix/items.py
+++ b/bundles/postfix/items.py
@@ -1,12 +1,15 @@
 assert node.has_bundle('mailserver')
 
 file_options = {
-    'triggers': [
-        'svc_systemd:postfix:restart',
+    'needs': [
+        'pkg_apt:postfix',
     ],
     'needed_by': [
         'svc_systemd:postfix',
     ],
+    'triggers': [
+        'svc_systemd:postfix:restart',
+    ],
 }
 
 files = {
diff --git a/bundles/roundcube/items.py b/bundles/roundcube/items.py
index 8c4d5e3..868bfa1 100644
--- a/bundles/roundcube/items.py
+++ b/bundles/roundcube/items.py
@@ -1,9 +1,30 @@
 assert node.has_bundle('php')
 assert node.has_bundle('mailserver')
 
+directories = {
+    '/opt/roundcube': {
+        'owner': 'www-data',
+    },
+    '/opt/roundcube/logs': {
+        'owner': 'www-data',
+        'needs': [
+            'git_deploy:/opt/roundcube',
+        ],
+    },
+    '/opt/roundcube/temp': {
+        'owner': 'www-data',
+        'needs': [
+            'git_deploy:/opt/roundcube',
+        ],
+    }
+}
+
 git_deploy['/opt/roundcube'] = {
     'repo': "https://github.com/roundcube/roundcubemail.git",
     'rev': node.metadata.get('roundcube/version'),
+    'needs': [
+        'directory:/opt/roundcube',
+    ],
 }
 
 files['/opt/roundcube/config/config.inc.php'] = {
@@ -19,16 +40,3 @@ files['/opt/roundcube/config/config.inc.php'] = {
         'git_deploy:/opt/roundcube',
     ],
 }
-
-directories['/opt/roundcube/logs'] = {
-    'owner': 'www-data',
-    'needs': [
-        'git_deploy:/opt/roundcube',
-    ],
-}
-directories['/opt/roundcube/temp'] = {
-    'owner': 'www-data',
-    'needs': [
-        'git_deploy:/opt/roundcube',
-    ],
-}
diff --git a/bundles/telegraf/metadata.py b/bundles/telegraf/metadata.py
index 622b2c6..41e6743 100644
--- a/bundles/telegraf/metadata.py
+++ b/bundles/telegraf/metadata.py
@@ -4,7 +4,9 @@ defaults = {
             'telegraf': {},
         },
         'sources': [
-            'deb https://repos.influxdata.com/debian {release} stable',
+            # FIXME
+            # 'deb https://repos.influxdata.com/debian {release} stable',
+            'deb https://repos.influxdata.com/debian buster stable',
         ],
     },
     'telegraf': {
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index 8b906e1..4bc5100 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -1,7 +1,7 @@
 {
     'hostname': '162.55.188.157',
     'groups': [
-        'archive',
+#        'archive',
         'backup',
         'hetzner-cloud',
         'debian-10',
@@ -11,21 +11,10 @@
         'dnsserver',
     ],
     'bundles': [
-#        'nextcloud',
         'wireguard',
         'zfs',
     ],
     'metadata': {
-        'systemd-timers': {
-            'test1': {
-                'when': 'weekly',
-                'command': '/bin/ls',
-            },
-        },
-        'nextcloud': {
-            'hostname': 'cloud.sublimity.de',
-            'version': '21.0.0',
-        },
         'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae',
         'bind': {
             'hostname': 'ns.sublimity.de',
@@ -42,14 +31,6 @@
                 'islamicstate.eu': [],
             },
         },
-        'dns': {
-            'islamicstate.eu': {
-                'A': ['1.2.3.4'],
-            },
-            'test.islamicstate.eu': {
-                'AAAA': ['::1337'],
-            },
-        },
         'network': {
             'internal': {
                 'interface': 'ens10',
@@ -67,8 +48,6 @@
             'hostname': 'mail.sublimity.de',
             'admin_email': 'postmaster@sublimity.de',
             'domains': [
-                'mail3.sublimity.de',
-                'islamicstate.eu',
                 # 'sublimity.de',
                 # 'freibrief.net',
                 # 'nadenau.net',
@@ -115,7 +94,6 @@
             'ram': 8096,
         },
         'wireguard': {
-            # ip r add 10.0.0.0/24 via 172.19.136.2 dev wg0
             'my_ip': '172.30.0.1/24',
             'peers': {
                 'home.server': {
@@ -135,7 +113,7 @@
         'zfs': {
             'pools': {
                 'tank': {
-                    'device': '/dev/disk/by-id/scsi-0HC_Volume_11764264',
+                    'device': '/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0-part2',
                 },
             },
         },