diff --git a/warpsrvint/docker_grafana/tasks/main.yml b/warpsrvint/docker_grafana/tasks/main.yml
index a5b49db97286d2f1c62213c99a82f8c9e17544b5..d7e53d7ed6df5e30abb33215fab54a77019ee45f 100644
--- a/warpsrvint/docker_grafana/tasks/main.yml
+++ b/warpsrvint/docker_grafana/tasks/main.yml
@@ -1,12 +1,12 @@
 ---
-# Get secrets 
-- import_playbook: ../functions/get_secret.yml
+# Get secrets
+- include: ../functions/get_secret.yml
   with_items:
     - { path: /srv/ldap/secret/ldap_readonly_pass, length: 24 }
     - { path: /srv/grafana/grafana_admin_pass, length: 12 }
 
 - name: create folder struct for grafana
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items:
@@ -16,7 +16,7 @@
 
 - name: create config files
   template: src={{ item }} dest=/srv/grafana/config/{{ item }}
-  with_items: 
+  with_items:
     - grafana.ini
     - ldap.toml
   register: config
@@ -36,4 +36,3 @@
   docker_service:
     project_src: /srv/grafana/
     state: present
-
diff --git a/warpsrvint/docker_influx/tasks/main.yml b/warpsrvint/docker_influx/tasks/main.yml
index e82cb1c6c418853638a0f2d3d0d2d4739a14f0f0..1564e60e0da3458c8deee7d0d28232ee33e44d92 100644
--- a/warpsrvint/docker_influx/tasks/main.yml
+++ b/warpsrvint/docker_influx/tasks/main.yml
@@ -1,12 +1,12 @@
 ---
 
-- import_playbook: ../functions/get_secret.yml
+- include: ../functions/get_secret.yml
   with_items:
    - { path: /srv/influx/influx_admin_pw,  length: 24 }
- 
+
 
 - name: create folder struct for influx
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items:
diff --git a/warpsrvint/docker_kapacitor/tasks/main.yaml b/warpsrvint/docker_kapacitor/tasks/main.yaml
index 0e3abc3a82c6b39c82b03934ee7b900d6b75398c..9f3fb9d829f58b53612c46602e6c642d5c2f972b 100644
--- a/warpsrvint/docker_kapacitor/tasks/main.yaml
+++ b/warpsrvint/docker_kapacitor/tasks/main.yaml
@@ -1,11 +1,11 @@
 ---
-- import_playbook: ../functions/get_secret.yml
+- include: ../functions/get_secret.yml
   with_items:
    - { path: /srv/influx/influx_admin_pw,  length: 24 }
    - { path: /srv/kapacitor/alerta_token,  length: -1 }
 
 - name: create folder struct for kapacitor
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items:
@@ -49,7 +49,7 @@
     - task_mem_used.tick
     - task_notraffic_globe.tick
     - task_notraffic_telekom.tick
-  notify: restart kapacitor docker 
+  notify: restart kapacitor docker
 
 
 - name: start kapacitor docker
diff --git a/warpsrvint/docker_l4z0r/tasks/main.yml b/warpsrvint/docker_l4z0r/tasks/main.yml
index f338cd4fce9f4c3731f5a9af68e9df2aaed4464e..549d9f127ca06b33c0d760090e6c4c2c9617a3b2 100644
--- a/warpsrvint/docker_l4z0r/tasks/main.yml
+++ b/warpsrvint/docker_l4z0r/tasks/main.yml
@@ -1,29 +1,28 @@
 ---
 
-# Create folders 
-- name: create folder struct for l4z0r 
-  file: 
-    path: "{{ item }}" 
+# Create folders
+- name: create folder struct for l4z0r
+  file:
+    path: "{{ item }}"
     state: "directory"
   with_items:
     - "/srv/l4z0r"
     - "/srv/l4z0r/db"
 
-# Get secrets 
-- import_playbook: ../functions/get_secret.yml
+# Get secrets
+- include: ../functions/get_secret.yml
   with_items:
     - { path: /srv/l4z0r/mysql_root_pw, length: 24 }
     - { path: /srv/l4z0r/mysql_user_pw, length: 12 }
 
-# Create docker-compose.yml 
+# Create docker-compose.yml
 - name: Konfig-Datei erstellen
-  template: 
-    src: "docker-compose.yml" 
+  template:
+    src: "docker-compose.yml"
     dest: "/srv/l4z0r/docker-compose.yml"
 
-# Start containers        
+# Start containers
 - name: start l4z0r docker
   docker_service:
     project_src: /srv/l4z0r/
     state: present
-
diff --git a/warpsrvint/docker_librenms/tasks/main.yml b/warpsrvint/docker_librenms/tasks/main.yml
index d47671a1458590b7bebcee5ae31f2d67d6f447fb..d4ac4815a02f622026b67e6669e68cabb91861ff 100644
--- a/warpsrvint/docker_librenms/tasks/main.yml
+++ b/warpsrvint/docker_librenms/tasks/main.yml
@@ -1,13 +1,13 @@
 ---
 
-# Get secrets 
-- import_playbook: ../functions/get_secret.yml
+# Get secrets
+- include: ../functions/get_secret.yml
   with_items:
     - { path: /srv/librenms/mysql_root_pw, length: 24 }
     - { path: /srv/librenms/mysql_user_pw, length: 12 }
 
 - name: create folder struct for librenms
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
     owner: www-data
diff --git a/warpsrvint/docker_matestatdb/tasks/main.yml b/warpsrvint/docker_matestatdb/tasks/main.yml
index ad3914b374f0e6a9ff8e31a6d10a0d0e0eb5db5c..23c5d41a6f871825709d2c7f72a54c7e087dcfa6 100644
--- a/warpsrvint/docker_matestatdb/tasks/main.yml
+++ b/warpsrvint/docker_matestatdb/tasks/main.yml
@@ -1,16 +1,16 @@
 ---
-# Get secrets 
-- import_playbook: ../functions/get_secret.yml
+# Get secrets
+- include: ../functions/get_secret.yml
   with_items:
     - { path: /srv/matestatdb/postgres_admin_pw, length: 24 }
 
 - name: create folder struct for matestatdb
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items:
     - "/srv/matestatdb/"
-    - "/srv/matestatdb/data/"   
+    - "/srv/matestatdb/data/"
 
 - name: Docker Compose Konfig-Datei erstellen
   template:
diff --git a/webserver/docker_alerta/tasks/main.yml b/webserver/docker_alerta/tasks/main.yml
index 3b60c2e4feb9d7cbe7e01107763e9096454f2dd4..c2ff2eb4c1039831ee95cebd76aac95f7d451061 100644
--- a/webserver/docker_alerta/tasks/main.yml
+++ b/webserver/docker_alerta/tasks/main.yml
@@ -1,16 +1,16 @@
 ---
 
-- import_playbook: ../functions/get_secret.yml
+- include: ../functions/get_secret.yml
   with_items:
    - { path: /srv/alerta/alerta_secret_key,  length: 24 }
    - { path: /srv/alerta/alerta_oauth_client_secret,  length: -1 }
    - { path: /srv/alerta/alerta_token,  length: -1 }
    - { path: /srv/alerta/telegram_token,  length: -1 }
    - { path: /srv/alerta/telegram_chatid,  length: -1 }
- 
+
 
 - name: create folder struct for alerta
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items:
diff --git a/webserver/docker_hackmd/tasks/main.yml b/webserver/docker_hackmd/tasks/main.yml
index 79c234e710b034e3e9546fdb1b5fab72a9c6eaf0..c0dee0f59f9f13afa7e04e1db3f54b46d4310526 100644
--- a/webserver/docker_hackmd/tasks/main.yml
+++ b/webserver/docker_hackmd/tasks/main.yml
@@ -1,15 +1,15 @@
 ---
 
-- import_playbook: ../functions/get_secret.yml
+- include: ../functions/get_secret.yml
   with_items:
    - { path: /srv/hackmd/mysql_root_pass,  length: 24 }
    - { path: /srv/hackmd/mysql_user_pass,  length: 12 }
    - { path: /srv/hackmd/hackmd_session_secret,  length: 32 }
    - { path: /srv/ldap/secret/ldap_readonly_pass,  length: -1 }
- 
+
 
 - name: create folder struct for hackmd
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items:
diff --git a/webserver/docker_keycloak/tasks/main.yml b/webserver/docker_keycloak/tasks/main.yml
index 30cd4861c49758c154ac980e9fb79546619ccaff..737fd49988321d4538c5249a6371d2edb33bd3a2 100644
--- a/webserver/docker_keycloak/tasks/main.yml
+++ b/webserver/docker_keycloak/tasks/main.yml
@@ -1,13 +1,13 @@
 ---
 
-- import_playbook: ../functions/get_secret.yml
+- include: ../functions/get_secret.yml
   with_items:
    - { path: /srv/keycloak/keycloak_admin_pass,  length: 24 }
    - { path: /srv/keycloak/postgres_user_pass,  length: 12 }
- 
+
 
 - name: create folder struct for keycloak
-  file: 
+  file:
     path: "{{ item }}"
     state: "directory"
   with_items: