diff --git a/nfs-server/tasks/main.yml b/nfs-server/tasks/main.yml
index 73787781a653fabd80428af5c29830c16892f6de..dd29762106facf77bb6d9ba5693c2fd760d00b4e 100644
--- a/nfs-server/tasks/main.yml
+++ b/nfs-server/tasks/main.yml
@@ -65,25 +65,8 @@
     - service-principal
 
 - block:
-    - name: test if there is a nfs-user account
-      shell: samba-tool user list | grep nfs-user
-      register: nfsuser
-      failed_when: False
-      delegate_to: "{{ hostvars[groups['ad-server'][0]]['ansible_host'] }}"
-      tags:
-        - nfs-server
-        - service-principal
-
-    - name: ensure there is a nfs-user account
-      command: samba-tool user create nfs-user --random-password
-      when: nfsuser.rc == 1
-      delegate_to: "{{ hostvars[groups['ad-server'][0]]['ansible_host'] }}"
-      tags:
-        - nfs-server
-        - service-principal
-
     - name: create service principal
-      command: samba-tool spn add "nfs/{{ ansible_fqdn }}" nfs-user
+      command: samba-tool spn add "nfs/{{ ansible_fqdn }}" "{{ ansible_hostname | upper }}$"
       delegate_to: "{{ hostvars[groups['ad-server'][0]]['ansible_host'] }}"
       tags:
         - nfs-server