diff --git a/roles/configure-swap/tasks/main.yaml b/roles/configure-swap/tasks/main.yaml
index 436d5851..7ad26394 100644
--- a/roles/configure-swap/tasks/main.yaml
+++ b/roles/configure-swap/tasks/main.yaml
@@ -30,8 +30,7 @@
 
 # If we have ephemeral storage and we don't appear to have setup swap,
 # we will create a swap and move /opt to a large data partition there.
-- include: ephemeral.yaml
-  static: no
+- include_tasks: ephemeral.yaml
   when:
     - ephemeral_device is defined
     - ansible_memory_mb['swap']['total'] | int + 10 <= configure_swap_size
@@ -39,8 +38,7 @@
 # If no ephemeral device and no swap, then we will setup some swap
 # space on the root device to ensure all hosts a consistent memory
 # environment.
-- include: root.yaml
-  static: no
+- include_tasks: root.yaml
   when:
     - ephemeral_device is undefined
     - ansible_memory_mb['swap']['total'] | int + 10 <= configure_swap_size
diff --git a/roles/prepare-docs-for-afs/tasks/main.yaml b/roles/prepare-docs-for-afs/tasks/main.yaml
index 15f0a988..b75f49d9 100644
--- a/roles/prepare-docs-for-afs/tasks/main.yaml
+++ b/roles/prepare-docs-for-afs/tasks/main.yaml
@@ -8,15 +8,15 @@
     content: "Project: {{ zuul.project.name }} Branch: {{ zuul.branch }} Build: {{ zuul.build }} Revision: {{ zuul.ref }}"
 
 - name: Process tagged build
-  include: tagged.yaml
+  include_tasks: tagged.yaml
   when: "zuul.branch != 'master' and zuul.tag is defined"
 
 - name: Process stable branch build
-  include: stable.yaml
+  include_tasks: stable.yaml
   when: "'stable' in zuul.branch and zuul.tag is not defined"
 
 - name: Process branch build
-  include: branch.yaml
+  include_tasks: branch.yaml
   when: "zuul.branch != 'master' and 'stable' not in zuul.branch and zuul.tag is not defined"
 
 - name: Rearrange publish directories
diff --git a/roles/prepare-infra-docs-for-afs/tasks/main.yaml b/roles/prepare-infra-docs-for-afs/tasks/main.yaml
index 1cf10fd0..5bd4d2a5 100644
--- a/roles/prepare-infra-docs-for-afs/tasks/main.yaml
+++ b/roles/prepare-infra-docs-for-afs/tasks/main.yaml
@@ -15,13 +15,13 @@
   when: "zuul.tag is defined"
 
 - name: Process tagged build
-  include: tagged.yaml
+  include_tasks: tagged.yaml
   when: "zuul.tag is defined"
 
 - name: Process stable branch build
-  include: stable.yaml
+  include_tasks: stable.yaml
   when: "zuul.branch is defined and 'stable' in zuul.branch and zuul.tag is not defined"
 
 - name: Process branch build
-  include: branch.yaml
+  include_tasks: branch.yaml
   when: "zuul.branch is defined and zuul.branch != 'master' and 'stable' not in zuul.branch and zuul.tag is not defined"
diff --git a/tests/extra.yaml b/tests/extra.yaml
index 8fb42670..d5570b26 100644
--- a/tests/extra.yaml
+++ b/tests/extra.yaml
@@ -3,5 +3,5 @@
 # If you add new tests, also update the files section in job
 # extra-integration in zuul.d/jobs.yaml.
 
-- include: prepare-zanata-client.yaml
+- import_playbook: prepare-zanata-client.yaml
   when: ansible_os_family == 'Debian'