diff --git a/requirements.txt b/requirements.txt
index 9d8b508313394cbe2ed7381d28ffdd7a6ceb3cf9..597ee48c968f0b11a14284a868c84c76ddc6b2a6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-ansible>=2.4.1.0
+ansible>=2.5.0
diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index 62d9365b9e55199b8ab758999407c11693d57e64..24493633895aeb879cac9155225c0cf24c47f2fb 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -8,8 +8,7 @@
   with_items: "{{ ipaclient_packages }}"
 
 - name: Install - Include Python2/3 import test
-  include: "{{role_path}}/tasks/python_2_3_test.yml"
-  static: yes
+  import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
 
 - name: Install - Set ipaclient_servers
   set_fact:
@@ -76,8 +75,7 @@
         ipaclient_ansible_python_interpreter: "{{ ansible_python_interpreter }}"
 
     - name: Install - Include Python2/3 import test
-      include: "{{role_path}}/tasks/python_2_3_test.yml"
-      static: yes
+      import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
       delegate_to: "{{ ipadiscovery.servers[0] }}"
 
     - name: Install - Get One-Time Password for client enrollment
diff --git a/roles/ipaclient/tasks/main.yml b/roles/ipaclient/tasks/main.yml
index 4682e7cc1b4071efe2336ab2ebc06140694c1c74..541bd0cadbc5eecdd5ad6096b3be8d8c7209dda7 100644
--- a/roles/ipaclient/tasks/main.yml
+++ b/roles/ipaclient/tasks/main.yml
@@ -10,9 +10,9 @@
     - "{{ role_path }}/vars/default.yml"
 
 - name: Install IPA client
-  include: tasks/install.yml
+  include_tasks: tasks/install.yml
   when: state|default('present') == 'present'
 
 - name: Uninstall IPA client
-  include: tasks/uninstall.yml
+  include_tasks: tasks/uninstall.yml
   when: state|default('present') == 'absent'
diff --git a/roles/ipaclient/tasks/uninstall.yml b/roles/ipaclient/tasks/uninstall.yml
index 39deda53a16ffd75567a613c516a50b9dabe4cde..6f0f570bf3c344112d0840c1bb8d7314f3d85dbe 100644
--- a/roles/ipaclient/tasks/uninstall.yml
+++ b/roles/ipaclient/tasks/uninstall.yml
@@ -2,8 +2,7 @@
 # tasks to uninstall IPA client
 
 #- name: Uninstall - Include Python2/3 import test
-#  include: "{{role_path}}/tasks/python_2_3_test.yml"
-#  static: yes
+#  import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
 
 - name: Uninstall - Uninstall IPA client
   command: >
diff --git a/roles/ipareplica/tasks/install.yml b/roles/ipareplica/tasks/install.yml
index 30653d96699b527a924f15d68b0fd53837e3c071..7472964b9409cf705d41d003f46d1a4abd61b2ec 100644
--- a/roles/ipareplica/tasks/install.yml
+++ b/roles/ipareplica/tasks/install.yml
@@ -23,8 +23,7 @@
   when: not ipareplica_no_package_install | bool and ipareplica_setup_adtrust | bool
 
 - name: Install - Include Python2/3 import test
-  include: "{{role_path}}/tasks/python_2_3_test.yml"
-  static: yes
+  inport_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
 
 - name: Install - Set default principal if no keytab is given
   set_fact:
diff --git a/roles/ipareplica/tasks/main.yml b/roles/ipareplica/tasks/main.yml
index 59f337b431be816ffc71a0b15a5dccd222755a57..2cdc6dd4334609446f2ea18a83876ada1594b410 100644
--- a/roles/ipareplica/tasks/main.yml
+++ b/roles/ipareplica/tasks/main.yml
@@ -10,9 +10,9 @@
     - "vars/default.yml"
 
 - name: Install IPA replica
-  include: tasks/install.yml
+  include_tasks: tasks/install.yml
   when: state|default('present') == 'present'
 
 - name: Uninstall IPA replica
-  include: tasks/uninstall.yml
+  include_tasks: tasks/uninstall.yml
   when: state|default('present') == 'absent'
diff --git a/roles/ipareplica/tasks/uninstall.yml b/roles/ipareplica/tasks/uninstall.yml
index 98269f07f7507360d98325ae5e9e09e05bd6358f..b5262ea3901b00854d2ab96b8b260331a30635fd 100644
--- a/roles/ipareplica/tasks/uninstall.yml
+++ b/roles/ipareplica/tasks/uninstall.yml
@@ -2,8 +2,7 @@
 # tasks to uninstall IPA replica
 
 #- name: Uninstall - Include Python2/3 import test
-#  include: "{{role_path}}/tasks/python_2_3_test.yml"
-#  static: yes
+#  import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
 
 - name: Uninstall - Uninstall IPA replica
   command: >
diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml
index c995b4f87f5f454a5635b18dddbe6aed7afe4ac4..e42ee03c1731de16130f441fc18352abc186980e 100644
--- a/roles/ipaserver/tasks/install.yml
+++ b/roles/ipaserver/tasks/install.yml
@@ -22,8 +22,7 @@
   when: ipaserver_setup_adtrust | bool
 
 - name: Install - Include Python2/3 import test
-  include: "{{role_path}}/tasks/python_2_3_test.yml"
-  static: yes
+  import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
 
 - name: Install - Server installation test
   ipaserver_test:
diff --git a/roles/ipaserver/tasks/main.yml b/roles/ipaserver/tasks/main.yml
index e2790be2348c2dd7ee41aa514520b1c92abf117e..a71df7433de4fbdcbeb6ecac24430f04ea6cb091 100644
--- a/roles/ipaserver/tasks/main.yml
+++ b/roles/ipaserver/tasks/main.yml
@@ -10,9 +10,9 @@
     - "vars/default.yml"
 
 - name: Install IPA server
-  include: tasks/install.yml
+  include_tasks: tasks/install.yml
   when: state|default('present') == 'present'
 
 - name: Uninstall IPA server
-  include: tasks/uninstall.yml
+  include_tasks: tasks/uninstall.yml
   when: state|default('present') == 'absent'
diff --git a/roles/ipaserver/tasks/uninstall.yml b/roles/ipaserver/tasks/uninstall.yml
index 373585c5dbfe70b6528787e19dbbee6b5045abc0..78044e0765a141323c0f271b343e6915d8c69789 100644
--- a/roles/ipaserver/tasks/uninstall.yml
+++ b/roles/ipaserver/tasks/uninstall.yml
@@ -2,8 +2,7 @@
 # tasks to uninstall IPA server
 
 #- name: Uninstall - Include Python2/3 import test
-#  include: "{{role_path}}/tasks/python_2_3_test.yml"
-#  static: yes
+#  import: "{{role_path}}/tasks/python_2_3_test.yml"
 
 - name: Uninstall - Uninstall IPA server
   command: >