diff --git a/roles/abrt/faf-local/tasks/main.yml b/roles/abrt/faf-local/tasks/main.yml
index b6ef9d81f9..5252a9406a 100644
--- a/roles/abrt/faf-local/tasks/main.yml
+++ b/roles/abrt/faf-local/tasks/main.yml
@@ -1,12 +1,12 @@
 ---
 # Install additional packages
-- include: install.yml
+- include_tasks: install.yml
 
 # Create database for faf
-- include: setup_db.yml
+- include_tasks: setup_db.yml
 
 # Allow https and start httpd
-- include: services.yml
+- include_tasks: services.yml
 
 # landing page
 - name: install abrt-server-info-page
@@ -79,5 +79,5 @@
   tags: add_repo
   with_items: "{{ faf_repos }}"
 
-- include: cron.yml
+- include_tasks: cron.yml
   tags: cron
diff --git a/roles/abrt/faf/tasks/main.yml b/roles/abrt/faf/tasks/main.yml
index ef3114b5f0..28c2ed28a6 100644
--- a/roles/abrt/faf/tasks/main.yml
+++ b/roles/abrt/faf/tasks/main.yml
@@ -1,32 +1,32 @@
-- include: install.yml
+- include_tasks: install.yml
   tags: [faf, faf_install, packages]
 
-- include: update.yml
+- include_tasks: update.yml
   when: faf_update
   tags: [faf, faf_update, packages]
 
-- include: first_time_setup.yml
+- include_tasks: first_time_setup.yml
   tags: [faf, faf_fist_time_setup, config]
 
-- include: config.yml
+- include_tasks: config.yml
   tags: [faf, faf_config, config]
 
-- include: migrate_db.yml
+- include_tasks: migrate_db.yml
   when: faf_migrate_db
   tags: [faf, faf_migrate_db]
 
-- include: cron.yml
+- include_tasks: cron.yml
   when: faf_cron_jobs
   tags: [faf, config]
 
-- include: web.yml
+- include_tasks: web.yml
   when: faf_with_web
   tags: [faf, faf_web]
 
-- include: check.yml
+- include_tasks: check.yml
   when: faf_check
   tags: [faf, faf_check]
 
-- include: check_web.yml
+- include_tasks: check_web.yml
   when: faf_check_web
   tags: [faf, faf_check_web]
diff --git a/roles/abrt/faf/tasks/web.yml b/roles/abrt/faf/tasks/web.yml
index f721c0e8cc..175bd2068b 100644
--- a/roles/abrt/faf/tasks/web.yml
+++ b/roles/abrt/faf/tasks/web.yml
@@ -11,7 +11,7 @@
   yum : name={{ item }} state=latest
   with_items: "{{ faf_web_packages }}"
 
-- include: celery.yml
+- include_tasks: celery.yml
   when: faf_with_celery
 
 - name: install faf web symboltransfer packages
diff --git a/roles/abrt/retrace-local/tasks/main.yml b/roles/abrt/retrace-local/tasks/main.yml
index e6e02ab262..55a97c19c1 100644
--- a/roles/abrt/retrace-local/tasks/main.yml
+++ b/roles/abrt/retrace-local/tasks/main.yml
@@ -1,8 +1,8 @@
 ---
 
 # Setup retrace-server
-- include: retrace_setup.yml
+- include_tasks: retrace_setup.yml
 
 # Set up cron jobs for retrace-server
-- include: cron.yml
+- include_tasks: cron.yml
   tags: cron
diff --git a/roles/abrt/retrace/tasks/main.yml b/roles/abrt/retrace/tasks/main.yml
index 5ba2d601d3..1656a0917f 100644
--- a/roles/abrt/retrace/tasks/main.yml
+++ b/roles/abrt/retrace/tasks/main.yml
@@ -1,18 +1,18 @@
 ---
 # Install retrace-server packages
-- include: install.yml
+- include_tasks: install.yml
   tags: [rs, packages]
 
 # Set up use of FAF packages
-- include: usefafpkgs.yml
+- include_tasks: usefafpkgs.yml
   when: rs_use_faf_packages
   tags: [rs, use_faf_packages]
 
 # Configure retrace-server
-- include: config.yml
+- include_tasks: config.yml
   tags: [rs, config]
 
 # Check functionality of the retrace-server
-- include: check.yml
+- include_tasks: check.yml
   when: rs_check_health
   tags: [rs, check]
diff --git a/roles/beaker/server/tasks/main.yml b/roles/beaker/server/tasks/main.yml
index 05805334e8..e9f7b5b6c6 100644
--- a/roles/beaker/server/tasks/main.yml
+++ b/roles/beaker/server/tasks/main.yml
@@ -119,7 +119,7 @@
   tags:
     - beaker-server
 
-- include: client.yml
+- include_tasks: client.yml
 
 - name: ensure beaker server has all relevant virthost ssh signatures in known_hosts
   lineinfile: dest=/root/.ssh/known_hosts regexp='{{ item.hostname }}' line='{{ item.hostname }} {{ item.signature }}' create=yes owner=root group=root
diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml
index 264934d139..2de3ba516c 100644
--- a/roles/copr/backend/tasks/main.yml
+++ b/roles/copr/backend/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 - name: mount fs
-  include: "mount_fs.yml"
+  include_tasks: "mount_fs.yml"
 
 - name: setup networking
-  include: "network.yml"
+  include_tasks: "network.yml"
 
 # pre-create copr user and group with predefined uid and gid
 - group: name=copr gid=986
@@ -82,7 +82,7 @@
 
 - name: install certificates for production
   when: not devel
-  include: "install_certs.yml"
+  include_tasks: "install_certs.yml"
 
 - name: allow lighttpd set fds limit
   seboolean: name=httpd_setrlimit state=yes persistent=yes
@@ -167,7 +167,7 @@
 
 - name: install cert to access fed-cloud09
   # TODO: remove this when fed-cloud09 receives external cert
-  include: install_cloud_cert.yml
+  include_tasks: install_cloud_cert.yml
 
 - name: enable and run copr-backend services
   service: name="{{ item }}" enabled=yes state=started
@@ -184,8 +184,8 @@
   copy: src="logrotate/lighttpd" dest=/etc/logrotate.d/lighttpd owner=root group=root mode=644
 
 - name: setup monitoring
-  include: "monitoring.yml"
+  include_tasks: "monitoring.yml"
 
 - name: setup fedmsg for MBS
-  include: "fedmsg.yml"
+  include_tasks: "fedmsg.yml"
   when: env == "staging"
diff --git a/roles/copr/base/handlers/main.yml b/roles/copr/base/handlers/main.yml
index af3d17a9dd..f0c5926d91 100644
--- a/roles/copr/base/handlers/main.yml
+++ b/roles/copr/base/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
-- include: "{{ handlers_path }}/restart_services.yml"
+- include_tasks: "{{ handlers_path }}/restart_services.yml"
 
 - name: restart postgresql
   service: name=postgresql state=restarted
diff --git a/roles/copr/base/tasks/main.yml b/roles/copr/base/tasks/main.yml
index e05971e1e2..ef43446e9e 100644
--- a/roles/copr/base/tasks/main.yml
+++ b/roles/copr/base/tasks/main.yml
@@ -4,9 +4,9 @@
 
 
 # again to late to do it here
-# - include: "{{ tasks_path }}/cloud_setup_basic.yml"
+# - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
 # already included into the `base` role
-#- include: "{{ tasks_path }}/postfix_basic.yml"
+#- include_tasks: "{{ tasks_path }}/postfix_basic.yml"
 
 # To late to do it here (
 #- name: setup correct hostname for copr machine
diff --git a/roles/copr/dist_git/tasks/main.yml b/roles/copr/dist_git/tasks/main.yml
index c1195042c6..e0b65be087 100644
--- a/roles/copr/dist_git/tasks/main.yml
+++ b/roles/copr/dist_git/tasks/main.yml
@@ -1,4 +1,4 @@
-- include: "mount_fs.yml"
+- include_tasks: "mount_fs.yml"
 
 # pre-create users/groups and copy uids/gids from the current prod copr-dist-git
 - group: name="packager" state=present gid=987
diff --git a/roles/copr/frontend/handlers/main.yml b/roles/copr/frontend/handlers/main.yml
index 5c632fe1b7..c17d344764 100644
--- a/roles/copr/frontend/handlers/main.yml
+++ b/roles/copr/frontend/handlers/main.yml
@@ -1,4 +1,4 @@
-- include: "{{ handlers_path }}/restart_services.yml"
+- include_tasks: "{{ handlers_path }}/restart_services.yml"
 
 - name: restart postgresql
   service: name=postgresql
diff --git a/roles/copr/frontend/tasks/main.yml b/roles/copr/frontend/tasks/main.yml
index 2824515f80..7129630567 100644
--- a/roles/copr/frontend/tasks/main.yml
+++ b/roles/copr/frontend/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- include: "mount_fs.yml"
+- include_tasks: "mount_fs.yml"
 
 - command: "ls -dZ /var/lib/pgsql"
   register: pgsql_ls
@@ -58,7 +58,7 @@
   tags:
   - config
 
-- include: "psql_setup.yml"
+- include_tasks: "psql_setup.yml"
 
 - name: upgrade db to head
   command: alembic upgrade head
@@ -89,7 +89,7 @@
     chdir: /usr/share/copr/coprs_frontend/
 
 - name: install ssl certificates for production
-  include: "install_certs.yml"
+  include_tasks: "install_certs.yml"
   when: not devel
   tags:
   - config
diff --git a/roles/copr/keygen/tasks/main.yml b/roles/copr/keygen/tasks/main.yml
index ffb71732d9..391213fbf0 100644
--- a/roles/copr/keygen/tasks/main.yml
+++ b/roles/copr/keygen/tasks/main.yml
@@ -56,4 +56,4 @@
 
 - name: setup backup
   when: not devel
-  include: "setup_backup.yml"
+  include_tasks: "setup_backup.yml"
diff --git a/roles/copr/mbs/handlers/main.yml b/roles/copr/mbs/handlers/main.yml
index c60aec5ae9..b0765a8229 100644
--- a/roles/copr/mbs/handlers/main.yml
+++ b/roles/copr/mbs/handlers/main.yml
@@ -1,4 +1,4 @@
-- include: "{{ handlers_path }}/restart_services.yml"
+- include_tasks: "{{ handlers_path }}/restart_services.yml"
 
 - name: daemon reload
   command: systemctl daemon-reload
diff --git a/roles/hubs/handlers/main.yml b/roles/hubs/handlers/main.yml
index e87c34549f..870ea50752 100644
--- a/roles/hubs/handlers/main.yml
+++ b/roles/hubs/handlers/main.yml
@@ -18,4 +18,4 @@
   listen: "hubs configuration change"
 
 # Webserver
-- include: webserver.yml
+- include_tasks: webserver.yml
diff --git a/roles/hubs/tasks/main.yml b/roles/hubs/tasks/main.yml
index b2de8bdd27..4ea2dc7456 100644
--- a/roles/hubs/tasks/main.yml
+++ b/roles/hubs/tasks/main.yml
@@ -145,7 +145,7 @@
 
 
 # Set up, create, and populate the database.
-- include: db-{{ hubs_db_type }}.yml
+- include_tasks: db-{{ hubs_db_type }}.yml
 
 
 # Set up JavaScript requirements
@@ -196,5 +196,5 @@
 
 
 # Webserver
-- include: webserver.yml
+- include_tasks: webserver.yml
   when: not hubs_dev_mode
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index 83f24cdee5..fe0ce523de 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- include: nginx.yml
+- include_tasks: nginx.yml
 
-- include: ssl-setup.yml
+- include_tasks: ssl-setup.yml
   when: not httpd_no_ssl
diff --git a/roles/openqa/worker/tasks/main.yml b/roles/openqa/worker/tasks/main.yml
index dc8e70a841..831ff77e81 100644
--- a/roles/openqa/worker/tasks/main.yml
+++ b/roles/openqa/worker/tasks/main.yml
@@ -50,10 +50,10 @@
   service: name=openqa-ppc64-prep enabled=yes state=started
   when: "ansible_architecture is defined and ansible_architecture == 'ppc64le'"
 
-- include: nfs-client.yml
+- include_tasks: nfs-client.yml
   when: openqa_hostname is defined and openqa_hostname != "localhost"
 
-- include: tap-setup.yml
+- include_tasks: tap-setup.yml
   when: openqa_tap is defined and openqa_tap
 
 - name: openQA client config
@@ -66,7 +66,7 @@
   tags:
   - config
 
-- include: createhdds.yml
+- include_tasks: createhdds.yml
   when: "inventory_hostname in groups['openqa-hdds-workers']"
 
 - name: Enable and start worker services
diff --git a/roles/osbs-atomic-reactor/tasks/main.yml b/roles/osbs-atomic-reactor/tasks/main.yml
index 3b5cd32da8..8d035cdc97 100644
--- a/roles/osbs-atomic-reactor/tasks/main.yml
+++ b/roles/osbs-atomic-reactor/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- include: source_{{ atomic_reactor_source }}.yml
+- include_tasks: source_{{ atomic_reactor_source }}.yml
diff --git a/roles/osbs-namespace/tasks/main.yml b/roles/osbs-namespace/tasks/main.yml
index e5670bda0a..0f66f1a21c 100644
--- a/roles/osbs-namespace/tasks/main.yml
+++ b/roles/osbs-namespace/tasks/main.yml
@@ -188,5 +188,5 @@
   tags:
   - oc
 
-- include: orchestrator.yml
+- include_tasks: orchestrator.yml
   when: osbs_orchestrator
diff --git a/roles/osbs-on-openshift/tasks/main.yml b/roles/osbs-on-openshift/tasks/main.yml
index 06edc3457d..cf2482fa62 100644
--- a/roles/osbs-on-openshift/tasks/main.yml
+++ b/roles/osbs-on-openshift/tasks/main.yml
@@ -134,8 +134,8 @@
   tags:
   - oc
 
-- include: yum_proxy.yml
+- include_tasks: yum_proxy.yml
   when: osbs_yum_proxy_image is defined
 
-- include: registry.yml
+- include_tasks: registry.yml
   when: osbs_docker_registry is defined and osbs_docker_registry
diff --git a/roles/waiverdb/tasks/main.yml b/roles/waiverdb/tasks/main.yml
index 6d8bead148..bf4eee39df 100644
--- a/roles/waiverdb/tasks/main.yml
+++ b/roles/waiverdb/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- include: psql_setup.yml
+- include_tasks: psql_setup.yml
 
 # Need to set selinux to permissive for now due to https://bugzilla.redhat.com/show_bug.cgi?id=1291940
 - name: switch selinux to permissive
@@ -61,4 +61,4 @@
     mode: 0640
   notify:
   - restart nginx
- 
\ No newline at end of file
+