diff --git a/ansible/roles/baselayout/tasks/main.yml b/ansible/roles/baselayout/tasks/main.yml
index e0beee30b..80a122410 100644
--- a/ansible/roles/baselayout/tasks/main.yml
+++ b/ansible/roles/baselayout/tasks/main.yml
@@ -43,7 +43,7 @@
   lineinfile: state=absent dest="{{ ssh_config }}" regexp=^Subsystem(\s+)sftp
 
 - name: add os-specific repos
-  include: "{{ repos_include }}"
+  include_tasks: "{{ repos_include }}"
   loop_control:
     loop_var: repos_include
   with_first_found:
@@ -167,7 +167,7 @@
     - [ 'curl', 'curl_32', 'curl_64', 'gtar', 'python3' ]
 
 - name: run ccache installer
-  include: "{{ ccache_include }}"
+  include_tasks: "{{ ccache_include }}"
   loop_control:
     loop_var: ccache_include
   with_first_found:
@@ -178,7 +178,7 @@
       skip: true
 
 - name: set up ntp
-  include: "{{ ntp_include }}"
+  include_tasks: "{{ ntp_include }}"
   loop_control:
     loop_var: ntp_include
   with_first_found:
diff --git a/ansible/roles/bootstrap/tasks/main.yml b/ansible/roles/bootstrap/tasks/main.yml
index 32a4fbfb3..98ba2a58e 100644
--- a/ansible/roles/bootstrap/tasks/main.yml
+++ b/ansible/roles/bootstrap/tasks/main.yml
@@ -5,7 +5,7 @@
 #
 
   - name: run os-specific bootstrap
-    include: "{{ bootstrap_include }}"
+    include_tasks: "{{ bootstrap_include }}"
     loop_control:
       loop_var: bootstrap_include
     with_first_found:
diff --git a/ansible/roles/build-test-v8/tasks/main.yml b/ansible/roles/build-test-v8/tasks/main.yml
index 812f45a2c..c7ffb01b7 100644
--- a/ansible/roles/build-test-v8/tasks/main.yml
+++ b/ansible/roles/build-test-v8/tasks/main.yml
@@ -5,7 +5,7 @@
 #
 
 - name: install packages required for V8 builds
-  include: "{{ v8deps_include }}"
+  include_tasks: "{{ v8deps_include }}"
   loop_control:
     loop_var: v8deps_include
   with_first_found:
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index 61e443d50..df5818003 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -19,7 +19,7 @@
     regexp: ^Subsystem(\s+)sftp
 
 - name: add os-specific repos
-  include: "{{ repos_include }}"
+  include_tasks: "{{ repos_include }}"
   loop_control:
     loop_var: repos_include
   with_first_found:
@@ -51,7 +51,7 @@
   with_items: [ '.login', '.profile' ]
 
 - name: set up ntp
-  include: "{{ ntp_include }}"
+  include_tasks: "{{ ntp_include }}"
   loop_control:
     loop_var: ntp_include
   with_first_found:
diff --git a/ansible/roles/jenkins-worker/tasks/main.yml b/ansible/roles/jenkins-worker/tasks/main.yml
index 5a48743ed..abb1d062c 100644
--- a/ansible/roles/jenkins-worker/tasks/main.yml
+++ b/ansible/roles/jenkins-worker/tasks/main.yml
@@ -33,11 +33,11 @@
 
 - name: run scaleway armv7 jenkins-worker setup
   when: "'scaleway-ubuntu1804-armv7l' in inventory_hostname"
-  include: "{{ role_path }}/tasks/partials/scaleway-armv7.yml"
+  include_tasks: "{{ role_path }}/tasks/partials/scaleway-armv7.yml"
 
 - name: prepare installing tap2junit
   when: type != "release"
-  include: "{{ pip_include }}"
+  include_tasks: "{{ pip_include }}"
   loop_control:
     loop_var: pip_include
   with_first_found:
diff --git a/ansible/roles/package-upgrade/handlers/main.yml b/ansible/roles/package-upgrade/handlers/main.yml
index 28928351f..af610cde2 100644
--- a/ansible/roles/package-upgrade/handlers/main.yml
+++ b/ansible/roles/package-upgrade/handlers/main.yml
@@ -3,10 +3,9 @@
 # Package upgrade handler
 
 - name: package updated
-  include: "{{ handler_include }}"
+  include_tasks: "{{ handler_include }}"
   loop_control:
     loop_var: handler_include
-  notify: package updated
   with_first_found:
     - files:
       - "{{ role_path }}/handlers/partials/{{ os }}-{{ arch }}.yml"
diff --git a/ansible/roles/package-upgrade/tasks/main.yml b/ansible/roles/package-upgrade/tasks/main.yml
index c85e4d108..f8cc693a9 100644
--- a/ansible/roles/package-upgrade/tasks/main.yml
+++ b/ansible/roles/package-upgrade/tasks/main.yml
@@ -6,5 +6,4 @@
 
   - name: include package manager tasks
     when: not os|startswith("zos")
-    include: "partials/{{ template }}.yml"
-    failed_when: template is False
+    include_tasks: "partials/{{ template }}.yml"
diff --git a/ansible/roles/read-secrets/tasks/main.yml b/ansible/roles/read-secrets/tasks/main.yml
index 8d4b64003..942abee6b 100644
--- a/ansible/roles/read-secrets/tasks/main.yml
+++ b/ansible/roles/read-secrets/tasks/main.yml
@@ -14,7 +14,7 @@
       skip: true
 
 - name: decrypt additional secrets
-  include: "{{ additional_include }}"
+  include_tasks: "{{ additional_include }}"
   loop_control:
     loop_var: additional_include
   with_first_found:
diff --git a/ansible/www-standalone/ansible-playbook.yaml b/ansible/www-standalone/ansible-playbook.yaml
index a9e67ba1f..dd3b806dc 100644
--- a/ansible/www-standalone/ansible-playbook.yaml
+++ b/ansible/www-standalone/ansible-playbook.yaml
@@ -6,32 +6,32 @@
     - include_vars: ansible-vars.yaml
       tags: vars
 
-    - include: tasks/base.yaml
+    - include_tasks: tasks/base.yaml
       tags: base
 
-    - include: tasks/user.yaml
+    - include_tasks: tasks/user.yaml
       tags: user
 
-    - include: tasks/docker.yaml
+    - include_tasks: tasks/docker.yaml
       tags: docker
 
-    - include: tasks/site-setup.yaml
+    - include_tasks: tasks/site-setup.yaml
       tags: setup
 
-    - include: tasks/webhook.yaml
+    - include_tasks: tasks/webhook.yaml
       tags: webhook
 
-    - include: tasks/nginx.yaml
+    - include_tasks: tasks/nginx.yaml
       tags: nginx
 
-    - include: tasks/promote.yaml
+    - include_tasks: tasks/promote.yaml
       tags: promote
 
-    - include: tasks/tools.yaml
+    - include_tasks: tasks/tools.yaml
       tags: tools
 
-    - include: tasks/metrics.yaml
+    - include_tasks: tasks/metrics.yaml
       tags: metrics
 
-    - include: tasks/cloudflare.yaml
+    - include_tasks: tasks/cloudflare.yaml
       tags: cloudflare