diff --git a/bundles/mautrix-telegram/metadata.py b/bundles/mautrix-telegram/metadata.py
index 9f344c0..2ba91fb 100644
--- a/bundles/mautrix-telegram/metadata.py
+++ b/bundles/mautrix-telegram/metadata.py
@@ -40,6 +40,13 @@ defaults = {
             },
         },
     },
+    'zfs': {
+        'datasets': {
+            'tank/mautrix-telegram': {
+                'mountpoint': '/opt/mautrix-telegram',
+            },
+        },
+    },
 }
 
 
diff --git a/bundles/mautrix-whatsapp/metadata.py b/bundles/mautrix-whatsapp/metadata.py
index 651b6b5..708fa81 100644
--- a/bundles/mautrix-whatsapp/metadata.py
+++ b/bundles/mautrix-whatsapp/metadata.py
@@ -47,6 +47,13 @@ defaults = {
             },
         },
     },
+    'zfs': {
+        'datasets': {
+            'tank/mautrix-whatsapp': {
+                'mountpoint': '/opt/mautrix-whatsapp',
+            },
+        },
+    },
 }
 
 
diff --git a/bundles/mx-puppet-discord/metadata.py b/bundles/mx-puppet-discord/metadata.py
index f75841b..30e27bd 100644
--- a/bundles/mx-puppet-discord/metadata.py
+++ b/bundles/mx-puppet-discord/metadata.py
@@ -35,4 +35,11 @@ defaults = {
             },
         },
     },
+    'zfs': {
+        'datasets': {
+            'tank/mx-puppet-discord': {
+                'mountpoint': '/opt/mx-puppet-discord',
+            },
+        },
+    },
 }
diff --git a/bundles/postfix/metadata.py b/bundles/postfix/metadata.py
index b9219f1..f50d872 100644
--- a/bundles/postfix/metadata.py
+++ b/bundles/postfix/metadata.py
@@ -31,12 +31,6 @@ defaults = {
 }
 
 if node.has_bundle('postfixadmin'):
-    defaults['backups'] = {
-        'paths': {
-            '/var/mail',
-        },
-    }
-
     defaults['icinga2_api']['postfix']['services'].update({
         'SMTP CONNECT': {
             'check_command': 'check_smtp',
@@ -52,6 +46,7 @@ if node.has_bundle('postfixadmin'):
             'vars.port': '587',
         },
     })
+
 else:
     defaults['icinga2_api']['postfix']['services'].update({
         'SMTP CONNECT': {
diff --git a/bundles/postfixadmin/metadata.py b/bundles/postfixadmin/metadata.py
index c677fcd..ead4bd4 100644
--- a/bundles/postfixadmin/metadata.py
+++ b/bundles/postfixadmin/metadata.py
@@ -4,6 +4,11 @@ defaults = {
             'postfix-pgsql': {},
         },
     },
+    'backups': {
+        'paths': {
+            '/var/mail',
+        },
+    },
     'postfixadmin': {
         'admin_email': 'hostmaster@kunbox.net',
     },
@@ -19,6 +24,16 @@ defaults = {
             },
         },
     },
+    'zfs': {
+        'datasets': {
+            'tank/mail': {
+                'mountpoint': '/var/mail',
+            },
+            'tank/postfixadmin': {
+                'mountpoint': '/opt/postfixadmin',
+            },
+        },
+    },
 }
 
 
diff --git a/bundles/radicale/metadata.py b/bundles/radicale/metadata.py
index a64cfea..94bf99e 100644
--- a/bundles/radicale/metadata.py
+++ b/bundles/radicale/metadata.py
@@ -9,4 +9,14 @@ defaults = {
             '/var/lib/radicale',
         },
     },
+    'zfs': {
+        'datasets': {
+            'tank/radicale': {
+                'mountpoint': '/var/lib/radicale',
+                'needed_by': {
+                    'pkg_apt:python3-radicale',
+                },
+            },
+        },
+    },
 }
diff --git a/bundles/redis/metadata.py b/bundles/redis/metadata.py
index b360913..9ee677f 100644
--- a/bundles/redis/metadata.py
+++ b/bundles/redis/metadata.py
@@ -18,6 +18,16 @@ defaults = {
             }
         },
     },
+    'zfs': {
+        'datasets': {
+            'tank/redis': {
+                'mountpoint': '/var/lib/redis',
+                'neeeded_by': {
+                    'pkg_apt:redis-server',
+                },
+            },
+        },
+    },
 }
 
 if node.has_bundle('telegraf'):
diff --git a/bundles/rspamd/metadata.py b/bundles/rspamd/metadata.py
index 7896390..feacf8a 100644
--- a/bundles/rspamd/metadata.py
+++ b/bundles/rspamd/metadata.py
@@ -52,6 +52,31 @@ defaults = {
     'rspamd': {
         'dkim': repo.vault.password_for(node.name + ' rspamd dkim key'),
     },
+    'zfs': {
+        'datasets': {
+            'tank/rspamd/rspamd': {
+                'mountpoint': '/var/lib/rspamd',
+                'needed_by': {
+                    'pkg_apt:rspamd',
+                },
+            },
+            'tank/rspamd/clamav': {
+                'mountpoint': '/var/lib/clamav',
+                'needed_by': {
+                    'pkg_apt:clamav',
+                    'pkg_apt:clamav-daemon',
+                    'pkg_apt:clamav-freshclam',
+                },
+            },
+            'tank/rspamd/clamav-unofficial-sigs': {
+                'mountpoint': '/var/lib/clamav-unofficial-sigs',
+                'needed_by': {
+                    'pkg_apt:clamav-unofficial-sigs',
+                    'pkg_apt:clamav-freshclam',
+                },
+            },
+        },
+    },
 }