diff --git a/bundles/mailman/items.py b/bundles/mailman/items.py
index deae9a6..c539b9e 100644
--- a/bundles/mailman/items.py
+++ b/bundles/mailman/items.py
@@ -1,3 +1,18 @@
+directories = {
+    '/var/lib/mailman3': {
+        'owner': 'list',
+        'group': 'list',
+        'needs': {
+            'zfs_dataset:tank/mailman',
+            'pkg_apt:mailman3-full',
+        },
+        'needed_by': {
+            'svc_systemd:mailman3.service',
+            'svc_systemd:mailman3-web.service',
+        },
+    },
+}
+
 files = {
     '/etc/postfix/main.cf': {
         'source': 'postfix.cf',
diff --git a/bundles/mailman/metadata.py b/bundles/mailman/metadata.py
index cf223c4..1b2c57b 100644
--- a/bundles/mailman/metadata.py
+++ b/bundles/mailman/metadata.py
@@ -11,6 +11,13 @@ defaults = {
             },
         },
     },
+    'zfs': {
+        'datasets': {
+            'tank/mailman': {
+                'mountpoint': '/var/lib/mailman3',
+            },
+        },
+    },
 }
 
 
diff --git a/groups/applications/dnsserver.py b/groups/applications/dnsserver.py
index 68c889c..3e4edf8 100644
--- a/groups/applications/dnsserver.py
+++ b/groups/applications/dnsserver.py
@@ -1,5 +1,5 @@
 {
-    'bundles': [
+    'bundles': {
         'bind',
-    ],
+    },
 }
diff --git a/nodes/home.router.py b/nodes/home.router.py
index b4ec4fc..4cd2bb2 100644
--- a/nodes/home.router.py
+++ b/nodes/home.router.py
@@ -83,6 +83,8 @@
                         '10.0.10.0/24',
                         #'192.168.179.0/24', # while raspi at home
                         '10.0.227.0/24', # mseibert.freescout
+                        '10.0.228.0/24', # mseibert.yourls
+                        '10.0.229.0/24', # mseibert.mailsman
                     ],
                 },
             },
diff --git a/nodes/mseibert.mailman.py b/nodes/mseibert.mailman.py
index ef9cd1b..6ea4d44 100644
--- a/nodes/mseibert.mailman.py
+++ b/nodes/mseibert.mailman.py
@@ -13,8 +13,8 @@
     ],
     'bundles': [
         'mailman',
-        #'wireguard',
-        #'zfs',
+        'wireguard',
+        'zfs',
     ],
     'metadata': {
         'id': '854cb39f-d964-4cc7-9051-ba6574708820',