diff --git a/group_vars/proxmox.yml b/group_vars/proxmox.yml
index 1f63b5b1..a7592cce 100644
--- a/group_vars/proxmox.yml
+++ b/group_vars/proxmox.yml
@@ -112,6 +112,46 @@
         [apcupsd_pwr]
         env.ups_model APC-BX950U-GR
 
+  ### mgrote.zfs_sanoid
+  sanoid_templates:
+    - name: '31tage'
+      keep_hourly: '24'                        # Aufheben (Stunde)
+      keep_daily: '31'                         # Aufheben (Tage)
+      keep_monthly: '3'                        # Aufheben (Monate)
+      keep_yearly: '0'                         # Aufheben (Jahre)
+      frequently: '16'                         # Aufheben (Minuten)
+      frequent_period: '15'                    # Intervall (alle 5 Minuten)
+      autosnap: 'yes'                          # Automatisches erstellen von Snapshots
+      autoprune: 'yes'
+    - name: '14tage'
+      keep_hourly: '24'
+      keep_daily: '14'
+      keep_monthly: '0'
+      keep_yearly: '0'
+      frequently: '16'
+      frequent_period: '15'
+      autosnap: 'yes'
+      autoprune: 'yes'
+    - name: '3tage'
+      keep_hourly: '24'
+      keep_daily: '3'
+      keep_monthly: '0'
+      keep_yearly: '0'
+      frequently: '16'
+      frequent_period: '15'
+      autosnap: 'yes'
+      autoprune: 'yes'
+    - name: '3monate'
+      keep_hourly: '24'
+      keep_daily: '3'
+      keep_monthly: '3'
+      keep_yearly: '0'
+      frequently: '16'
+      frequent_period: '15'
+      autosnap: 'yes'
+      autoprune: 'yes'
+
+
 
   ### mgrote.apt_manage_sources
   manage_sources_apt_proxy: ""
diff --git a/host_vars/pve2-test2.grote.lan.yml b/host_vars/pve2-test2.grote.lan.yml
index 3d98b58c..fa0e7211 100644
--- a/host_vars/pve2-test2.grote.lan.yml
+++ b/host_vars/pve2-test2.grote.lan.yml
@@ -52,3 +52,10 @@
   cv4pve_vmid: all,-127,-112,-100,-116,-105
   cv4pve_keep_snapshots: 5
   cv4pve_dl_link: "https://github.com/Corsinvest/cv4pve-autosnap/releases/download/v1.10.0/cv4pve-autosnap-linux-x64.zip"
+
+  ### mgrote.zfs_sanoid
+  sanoid_datasets:
+    - path: 'hdd_data_raidz'
+      template: '14tage'
+      recursive: 'yes'
+      snapshots: true
diff --git a/host_vars/pve2.grote.lan.yml b/host_vars/pve2.grote.lan.yml
index ed3618fe..dfc9cc9e 100644
--- a/host_vars/pve2.grote.lan.yml
+++ b/host_vars/pve2.grote.lan.yml
@@ -244,44 +244,6 @@
       snapshots: true
       template: '3tage'
 
-  sanoid_templates:
-    - name: '31tage'
-      keep_hourly: '24'                        # Aufheben (Stunde)
-      keep_daily: '31'                         # Aufheben (Tage)
-      keep_monthly: '3'                        # Aufheben (Monate)
-      keep_yearly: '0'                         # Aufheben (Jahre)
-      frequently: '16'                         # Aufheben (Minuten)
-      frequent_period: '15'                    # Intervall (alle 5 Minuten)
-      autosnap: 'yes'                          # Automatisches erstellen von Snapshots
-      autoprune: 'yes'
-    - name: '14tage'
-      keep_hourly: '24'
-      keep_daily: '14'
-      keep_monthly: '0'
-      keep_yearly: '0'
-      frequently: '16'
-      frequent_period: '15'
-      autosnap: 'yes'
-      autoprune: 'yes'
-    - name: '3tage'
-      keep_hourly: '24'
-      keep_daily: '3'
-      keep_monthly: '0'
-      keep_yearly: '0'
-      frequently: '16'
-      frequent_period: '15'
-      autosnap: 'yes'
-      autoprune: 'yes'
-    - name: '3monate'
-      keep_hourly: '24'
-      keep_daily: '3'
-      keep_monthly: '3'
-      keep_yearly: '0'
-      frequently: '16'
-      frequent_period: '15'
-      autosnap: 'yes'
-      autoprune: 'yes'
-
   ### mgrote.cv4pve-autosnap
   cv4pve_api_user: root@pam!cv4pve-autosnap
   cv4pve_api_token: "{{ lookup('keepass', 'cv4pve_api_token_pve2', 'password') }}"
diff --git a/playbooks/3_service/proxmox.yml b/playbooks/3_service/proxmox.yml
index 937e8fca..9753c693 100644
--- a/playbooks/3_service/proxmox.yml
+++ b/playbooks/3_service/proxmox.yml
@@ -8,8 +8,7 @@
     - { role: mgrote.zfs_zed, tags: "zfs_zed" }
     - { role: mgrote.zfs_health, tags: "zfs_health" }
     - { role: mgrote.zfs_sanoid,
-        tags: "sanoid",
-        when: "'pve2.grote.lan' in inventory_hostname" }
+        tags: "sanoid" }
     - { role: mgrote.smart, tags: "smart" }
     - { role: mgrote.postfix, tags: "postfix" }
     - { role: mgrote.cv4pve-autosnap,