diff --git a/roles/mgrote.zfs_sanoid/handlers/main.yml b/roles/mgrote.zfs_sanoid/handlers/main.yml
index 510b17fe..53c5b99a 100644
--- a/roles/mgrote.zfs_sanoid/handlers/main.yml
+++ b/roles/mgrote.zfs_sanoid/handlers/main.yml
@@ -11,9 +11,9 @@
       enabled: yes
       masked: no
     with_items:
-      - cv4pve.service
-      - cv4pve_mail.service
-      - cv4pve.timer
+      - sanoid.service
+      - sanoid_mail.service
+      - sanoid.timer
 
   - name: systemctl start units
     become: yes
@@ -22,5 +22,5 @@
       state: restarted
       enabled: yes
     with_items:
-      - cv4pve.timer
+      - sanoid.timer
     notify: systemctl daemon-reload
diff --git a/roles/mgrote.zfs_sanoid/tasks/main.yml b/roles/mgrote.zfs_sanoid/tasks/main.yml
index 7854713e..bc64c7ba 100644
--- a/roles/mgrote.zfs_sanoid/tasks/main.yml
+++ b/roles/mgrote.zfs_sanoid/tasks/main.yml
@@ -55,24 +55,22 @@
       group: "{{ sanoid_user_group }}"
       mode: 0644
 
-
-
-  - name: template cv4pve.service
+  - name: template sanoid.service
     become: yes
     ansible.builtin.template:
-      src: cv4pve.service.j2
-      dest: /etc/systemd/system/cv4pve.service
+      src: sanoid.service.j2
+      dest: /etc/systemd/system/sanoid.service
       owner: root
       group: root
       mode: 0644
     notify:
       - systemctl daemon-reload
 
-  - name: template cv4pve_mail.service
+  - name: template sanoid_mail.service
     become: yes
     ansible.builtin.template:
-      src: cv4pve_mail.service.j2
-      dest: /etc/systemd/system/cv4pve_mail.service
+      src: sanoid_mail.service.j2
+      dest: /etc/systemd/system/sanoid_mail.service
       owner: root
       group: root
       mode: 0644
@@ -80,21 +78,21 @@
       - systemctl daemon-reload
 
 
-  - name: template cv4pve.timer
+  - name: template sanoid.timer
     become: yes
     ansible.builtin.template:
-      src: cv4pve.timer.j2
-      dest: /etc/systemd/system/cv4pve.timer
+      src: sanoid.timer.j2
+      dest: /etc/systemd/system/sanoid.timer
       owner: root
       group: root
       mode: 0644
     notify:
       - systemctl daemon-reload
 
-  - name: systemctl start cv4pve.timer
+  - name: systemctl start sanoid.timer
     become: yes
     ansible.builtin.systemd:
-      name: cv4pve.timer
+      name: sanoid.timer
       state: started
       enabled: yes
 
diff --git a/roles/mgrote.zfs_sanoid/tasks/user.yml b/roles/mgrote.zfs_sanoid/tasks/user.yml
index cc4fa2d7..64f28258 100644
--- a/roles/mgrote.zfs_sanoid/tasks/user.yml
+++ b/roles/mgrote.zfs_sanoid/tasks/user.yml
@@ -18,11 +18,11 @@
       - sanoid_user_group is defined
       - sanoid_user is defined
 
-  - name: add user to sudoers
+  - name: add user to sudoers # ENTRFERNERN!!!!!
     become: true
     ansible.builtin.blockinfile:
       path: /etc/sudoers
-      state: present
+      state: absent
       block:  |
         {{ sanoid_user }} ALL=(ALL) NOPASSWD:ALL
       validate: '/usr/sbin/visudo -cf %s'
diff --git a/roles/mgrote.zfs_sanoid/templates/cv4pve.service.j2 b/roles/mgrote.zfs_sanoid/templates/sanoid.service.j2
similarity index 100%
rename from roles/mgrote.zfs_sanoid/templates/cv4pve.service.j2
rename to roles/mgrote.zfs_sanoid/templates/sanoid.service.j2
diff --git a/roles/mgrote.zfs_sanoid/templates/cv4pve.timer.j2 b/roles/mgrote.zfs_sanoid/templates/sanoid.timer.j2
similarity index 100%
rename from roles/mgrote.zfs_sanoid/templates/cv4pve.timer.j2
rename to roles/mgrote.zfs_sanoid/templates/sanoid.timer.j2
diff --git a/roles/mgrote.zfs_sanoid/templates/cv4pve_mail.service.j2 b/roles/mgrote.zfs_sanoid/templates/sanoid_mail.service.j2
similarity index 100%
rename from roles/mgrote.zfs_sanoid/templates/cv4pve_mail.service.j2
rename to roles/mgrote.zfs_sanoid/templates/sanoid_mail.service.j2