diff --git a/bundles/backup-server/metadata.py b/bundles/backup-server/metadata.py
index 9f227b8..4290898 100644
--- a/bundles/backup-server/metadata.py
+++ b/bundles/backup-server/metadata.py
@@ -24,6 +24,16 @@ def zfs(metadata):
                 'mountpoint': f"/mnt/backups/{other_node.metadata.get('id')}",
                 'backup': False,
             }
+            
+            if other_node.has_bundle('zfs'):
+                for path in other_node.metadata.get('backup/paths'):
+                    for dataset, config in other_node.metadata.get('zfs/datasets').items():
+                        if path == config.get('mountpoint'):
+                            datasets[f"tank/{other_node.metadata.get('id')}/{dataset}"] = {
+                                'mountpoint': 'none',
+                                'backup': False,
+                            }
+
 
     return {
         'zfs': {
diff --git a/items/zfs_dataset.py b/items/zfs_dataset.py
index 65097e0..22e93e2 100644
--- a/items/zfs_dataset.py
+++ b/items/zfs_dataset.py
@@ -14,12 +14,8 @@ def create(node, path, options):
             option_list.append("-o {}={}".format(quote(option), quote(value)))
     option_args = " ".join(option_list)
 
-    print("zfs create {} {}".format(
-        option_args,
-        quote(path),
-    ))
     node.run(
-        "zfs create {} {}".format(
+        "zfs create -p {} {}".format(
             option_args,
             quote(path),
         ),