diff --git a/tasks/configure_nfs_mounts.yml b/tasks/configure_nfs_mounts.yml
index 99f3cd0c3b34517f37a72bc5c4f11808e4f6b4cf..cbaf714132853235cc84d5c84eff1480c7c25730 100644
--- a/tasks/configure_nfs_mounts.yml
+++ b/tasks/configure_nfs_mounts.yml
@@ -15,22 +15,18 @@
   tags: [notest]
 
 ### MOUNTPOINTS PERMANENT ERSTELLEN ###
-- name: Mountpoints für Permanent Storage anlegen
+- name: check if mountpoint directory exists
+  ansible.builtin.stat:
+    path: "{{ item.mountpoint }}"
+  loop: "{{ vault_permanent_nfs_mounts }}"
+  register: stat_result
+- name: Mountpoints für Permanent Storage anlegen, falls sie nicht existieren
   ansible.builtin.file:
     path: "{{ item.mountpoint }}"
     state: directory
     mode: "0400"
-  loop: "{{ vault_permanent_nfs_mounts }}"
-#    - "{{ vault_nfs_mounts.permanent_dev.mountpoint }}"
-#    - "{{ vault_nfs_mounts.permanent_test.mountpoint }}"
-#    - "{{ vault_nfs_mounts.permanent_prod_slub_2015.mountpoint }}"
-#    - "{{ vault_nfs_mounts.permanent_prod_slub_2016.mountpoint }}"
-#    - "{{ vault_nfs_mounts.permanent_prod_slub_2017.mountpoint }}"
-#    - "{{ vault_nfs_mounts.permanent_prod_slub_2018.mountpoint }}"
-#    - "{{ vault_nfs_mounts.permanent_prod_slub_2019.mountpoint }}"
-#    - "{{ vault_nfs_mounts.permanent_prod_slub_2020.mountpoint }}"
-#    - "{{ vault_nfs_mounts.permanent_prod_slub_2021.mountpoint }}"
-#    - "{{ vault_nfs_mounts.permanent_prod_lfulg.mountpoint }}"
+  loop: "{{ stat_result.results }}"
+  when: not item.stat.exists
 
 ### PERMANENT STORAGE MOUNTEN ###
 - name: NFS-Shares für Permanent Storage mounten
@@ -41,33 +37,4 @@
     fstype: "nfs"
     opts: "ro,{{ item.opts | default('ro,defaults,nodev,nosuid,rsize=8192,wsize=8192,vers=3') }}"
   loop: "{{ vault_permanent_nfs_mounts }}"
-#  with_items:
-#    - name: "{{ vault_nfs_mounts.permanent_dev.mountpoint }}"
-#      src: "{{ vault_nfs_mounts.permanent_dev.share }}"
-#    - name: "{{ vault_nfs_mounts.permanent_test.mountpoint }}"
-#      src: "{{ vault_nfs_mounts.permanent_test.share }}"
-#    - name: "{{ vault_nfs_mounts.permanent_prod_slub_2015.mountpoint }}"
-#      src: "{{ vault_nfs_mounts.permanent_prod_slub_2015.share }}"
-#      opts: "auto,nfsvers=4"
-#    - name: "{{ vault_nfs_mounts.permanent_prod_slub_2016.mountpoint }}"
-#      src: "{{ vault_nfs_mounts.permanent_prod_slub_2016.share }}"
-#      opts: "auto,nfsvers=4"
-#    - name: "{{ vault_nfs_mounts.permanent_prod_slub_2017.mountpoint }}"
-#      src: "{{ vault_nfs_mounts.permanent_prod_slub_2017.share }}"
-#      opts: "auto,nfsvers=4"
-#    - name: "{{ vault_nfs_mounts.permanent_prod_slub_2018.mountpoint }}"
-#      src: "{{ vault_nfs_mounts.permanent_prod_slub_2018.share }}"
-#      opts: "auto,nfsvers=4"
-#    - name: "{{ vault_nfs_mounts.permanent_prod_slub_2019.mountpoint }}"
-#      src: "{{ vault_nfs_mounts.permanent_prod_slub_2019.share }}"
-#      opts: "auto,nfsvers=4"
-#    - name: "{{ vault_nfs_mounts.permanent_prod_slub_2020.mountpoint }}"
-#      src: "{{ vault_nfs_mounts.permanent_prod_slub_2020.share }}"
-#      opts: "auto,nfsvers=4"
-#    - name: "{{ vault_nfs_mounts.permanent_prod_slub_2021.mountpoint }}"
-#      src: "{{ vault_nfs_mounts.permanent_prod_slub_2021.share }}"
-#      opts: "auto,nfsvers=4"
-#    - name: "{{ vault_nfs_mounts.permanent_prod_lfulg.mountpoint }}"
-#      src: "{{ vault_nfs_mounts.permanent_prod_lfulg.share }}"
-#      opts: "auto,nfsvers=4"
   tags: [notest]