diff --git a/functions/get_secret.yml b/functions/get_secret.yml
index e8b5964e8a911b814182911342400c8e888f5262..6133a8b0827741a23994a71786adc31948bdf326 100644
--- a/functions/get_secret.yml
+++ b/functions/get_secret.yml
@@ -8,7 +8,7 @@
 # 
 # Beispiel: (Auslesen von Passörtern aus /srv/xyz/secret_pw, registrierung als Variable secret_pw, erzeugung mit 24 Zeichen falls nicht vorhanden)
 # 
-# - include: ../functions/get_secret.yml
+# - import_playbook: ../functions/get_secret.yml
 #   with_items:
 #     - { path: /srv/xyz/secret_pw,  length: 24 }
 #     - { path: /srv/xyz/secret2_pw, length: 12 }
diff --git a/site.yml b/site.yml
index ba00dbe441fb293b42a37dbda95a7a6aa687d654..ca70bd1f7712c6f54d437522b7f1be6109013fcc 100644
--- a/site.yml
+++ b/site.yml
@@ -1,13 +1,13 @@
 ---
 # Hauptdatei, includiert lediglich die einzelnen Playbooks 
 
-- include: all/main.yml 
-- include: vorstandspi/main.yml 
-- include: warphab/main.yml 
-- include: warpsrvint/main.yml 
-- include: warpsrvext/main.yml 
-- include: webserver/main.yml 
-- include: webserver-test/main.yml 
+- import_playbook: all/main.yml 
+- import_playbook: vorstandspi/main.yml 
+- import_playbook: warphab/main.yml 
+- import_playbook: warpsrvint/main.yml 
+- import_playbook: warpsrvext/main.yml 
+- import_playbook: webserver/main.yml 
+- import_playbook: webserver-test/main.yml 
 
     
 
diff --git a/warpsrvint/docker_grafana/tasks/main.yml b/warpsrvint/docker_grafana/tasks/main.yml
index c84ff0f2f7eaea6cc939241bb764d27ea048272b..a5b49db97286d2f1c62213c99a82f8c9e17544b5 100644
--- a/warpsrvint/docker_grafana/tasks/main.yml
+++ b/warpsrvint/docker_grafana/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 # Get secrets 
-- include: ../functions/get_secret.yml
+- import_playbook: ../functions/get_secret.yml
   with_items:
     - { path: /srv/ldap/secret/ldap_readonly_pass, length: 24 }
     - { path: /srv/grafana/grafana_admin_pass, length: 12 }
diff --git a/warpsrvint/docker_influx/tasks/main.yml b/warpsrvint/docker_influx/tasks/main.yml
index 204f09e9082e115df82d6a4037a9352642d77e07..e82cb1c6c418853638a0f2d3d0d2d4739a14f0f0 100644
--- a/warpsrvint/docker_influx/tasks/main.yml
+++ b/warpsrvint/docker_influx/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- include: ../functions/get_secret.yml
+- import_playbook: ../functions/get_secret.yml
   with_items:
    - { path: /srv/influx/influx_admin_pw,  length: 24 }
  
diff --git a/warpsrvint/docker_kapacitor/tasks/main.yaml b/warpsrvint/docker_kapacitor/tasks/main.yaml
index d888c731d3eae5b9eea23955c8d7b69d0c3a1e78..0e3abc3a82c6b39c82b03934ee7b900d6b75398c 100644
--- a/warpsrvint/docker_kapacitor/tasks/main.yaml
+++ b/warpsrvint/docker_kapacitor/tasks/main.yaml
@@ -1,5 +1,5 @@
 ---
-- include: ../functions/get_secret.yml
+- import_playbook: ../functions/get_secret.yml
   with_items:
    - { path: /srv/influx/influx_admin_pw,  length: 24 }
    - { path: /srv/kapacitor/alerta_token,  length: -1 }
diff --git a/warpsrvint/docker_l4z0r/tasks/main.yml b/warpsrvint/docker_l4z0r/tasks/main.yml
index 8a59a5d8f36e3fbc7db6890df24c9d87ee2e4133..f338cd4fce9f4c3731f5a9af68e9df2aaed4464e 100644
--- a/warpsrvint/docker_l4z0r/tasks/main.yml
+++ b/warpsrvint/docker_l4z0r/tasks/main.yml
@@ -10,7 +10,7 @@
     - "/srv/l4z0r/db"
 
 # Get secrets 
-- include: ../functions/get_secret.yml
+- import_playbook: ../functions/get_secret.yml
   with_items:
     - { path: /srv/l4z0r/mysql_root_pw, length: 24 }
     - { path: /srv/l4z0r/mysql_user_pw, length: 12 }
diff --git a/warpsrvint/docker_librenms/tasks/main.yml b/warpsrvint/docker_librenms/tasks/main.yml
index 55fcbd29d43533d58e958ae25579a13d98ccd597..d47671a1458590b7bebcee5ae31f2d67d6f447fb 100644
--- a/warpsrvint/docker_librenms/tasks/main.yml
+++ b/warpsrvint/docker_librenms/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 # Get secrets 
-- include: ../functions/get_secret.yml
+- import_playbook: ../functions/get_secret.yml
   with_items:
     - { path: /srv/librenms/mysql_root_pw, length: 24 }
     - { path: /srv/librenms/mysql_user_pw, length: 12 }
diff --git a/warpsrvint/docker_matestatdb/tasks/main.yml b/warpsrvint/docker_matestatdb/tasks/main.yml
index 4f83478f86c4965496f902ad3b8a56d8e05d206a..ad3914b374f0e6a9ff8e31a6d10a0d0e0eb5db5c 100644
--- a/warpsrvint/docker_matestatdb/tasks/main.yml
+++ b/warpsrvint/docker_matestatdb/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 # Get secrets 
-- include: ../functions/get_secret.yml
+- import_playbook: ../functions/get_secret.yml
   with_items:
     - { path: /srv/matestatdb/postgres_admin_pw, length: 24 }
 
diff --git a/webserver/docker_alerta/tasks/main.yml b/webserver/docker_alerta/tasks/main.yml
index 2dda680d86e10d8975ed41b08efabaf43ac1f3fa..3b60c2e4feb9d7cbe7e01107763e9096454f2dd4 100644
--- a/webserver/docker_alerta/tasks/main.yml
+++ b/webserver/docker_alerta/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- include: ../functions/get_secret.yml
+- import_playbook: ../functions/get_secret.yml
   with_items:
    - { path: /srv/alerta/alerta_secret_key,  length: 24 }
    - { path: /srv/alerta/alerta_oauth_client_secret,  length: -1 }
diff --git a/webserver/docker_hackmd/tasks/main.yml b/webserver/docker_hackmd/tasks/main.yml
index f24578eb5b3e8cde1e5cc3d69c9e1072a7b8771f..79c234e710b034e3e9546fdb1b5fab72a9c6eaf0 100644
--- a/webserver/docker_hackmd/tasks/main.yml
+++ b/webserver/docker_hackmd/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- include: ../functions/get_secret.yml
+- import_playbook: ../functions/get_secret.yml
   with_items:
    - { path: /srv/hackmd/mysql_root_pass,  length: 24 }
    - { path: /srv/hackmd/mysql_user_pass,  length: 12 }
diff --git a/webserver/docker_jabber_test/tasks/main.yaml b/webserver/docker_jabber_test/tasks/main.yaml
index 9955ea4f8940c9297281f09ca1a8c819cbcec6dd..de49fc58e36f77e5abcfd843b4e284a54e59ae27 100644
--- a/webserver/docker_jabber_test/tasks/main.yaml
+++ b/webserver/docker_jabber_test/tasks/main.yaml
@@ -20,7 +20,7 @@
     - "/srv/jabber_test/saslauthd"
 
 # Get secrets 
-- include: ../functions/get_secret.yml
+- import_playbook: ../functions/get_secret.yml
   with_items:
     - { path: /srv/ldap/secret/ldap_readonly_pass, length: 24 }
 
diff --git a/webserver/docker_keycloak/tasks/main.yml b/webserver/docker_keycloak/tasks/main.yml
index 7d3b2ed06fff9118649541202e62f323e75c5457..30cd4861c49758c154ac980e9fb79546619ccaff 100644
--- a/webserver/docker_keycloak/tasks/main.yml
+++ b/webserver/docker_keycloak/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- include: ../functions/get_secret.yml
+- import_playbook: ../functions/get_secret.yml
   with_items:
    - { path: /srv/keycloak/keycloak_admin_pass,  length: 24 }
    - { path: /srv/keycloak/postgres_user_pass,  length: 12 }