diff --git a/tasks/configure_nfs_mounts.yml b/tasks/configure_nfs_mounts.yml
index 25be70052048ed2c8c6cadd06d5e45525a1f7825..08122edaa6d3bd17fcbc0aef64ba8687649fe872 100644
--- a/tasks/configure_nfs_mounts.yml
+++ b/tasks/configure_nfs_mounts.yml
@@ -5,7 +5,7 @@
     state: directory
 
 - name: NFS-Shares für Logging mounten (/var/log/rossanity/)
-  mount:
+  ansible.posix.mount:
     name: "{{ vault_log_nfs_mounts.log.mountpoint }}{{ ansible_hostname }}/"
     src: "{{ vault_log_nfs_mounts.log.share }}{{ ansible_hostname }}/"
     state: mounted
@@ -32,10 +32,10 @@
 
 ### PERMANENT STORAGE MOUNTEN ###
 - name: NFS-Shares für Permanent Storage mounten
-  mount:
+  ansible.posix.mount:
     name: "{{ item.mountpoint }}"
     src: "{{ item.share }}"
-    state: mounted
+    state: "{{ item.state | default('mounted') }}"
     fstype: "nfs"
     opts: "ro,{{ item.opts | default('ro,defaults,nodev,nosuid,rsize=8192,wsize=8192,vers=3') }}"
   loop: "{{ vault_permanent_nfs_mounts }}"