diff --git a/.ansible-lint b/.ansible-lint
index 7e0172a..b04781e 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -1,4 +1,5 @@
 ---
 warn_list:
   - role-name
+  - name[play]
   - name[casing]
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index fbb7120..8841165 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -8,7 +8,9 @@ platforms:
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+      - /var/lib/containerd
+    cgroupns_mode: host
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/tasks/main.yml b/tasks/main.yml
index a8a42eb..b585cd9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,30 +1,35 @@
 # tasks file
 ---
-- ansible.builtin.include: repository.yml
+- name: repository
+  ansible.builtin.import_tasks: repository.yml
   tags:
     - configuration
     - percona-toolkit
     - percona-toolkit-repository
 
-- ansible.builtin.include: install.yml
+- name: install
+  ansible.builtin.import_tasks: install.yml
   tags:
     - configuration
     - percona-toolkit
     - percona-toolkit-install
 
-- ansible.builtin.include: configure.yml
+- name: configure
+  ansible.builtin.import_tasks: configure.yml
   tags:
     - configuration
     - percona-toolkit
     - percona-toolkit-configure
 
-- ansible.builtin.include: scripts.yml
+- name: scripts
+  ansible.builtin.import_tasks: scripts.yml
   tags:
     - configuration
     - percona-toolkit
     - percona-toolkit-scripts
 
-- ansible.builtin.include: jobs.yml
+- name: jobs
+  ansible.builtin.import_tasks: jobs.yml
   tags:
     - configuration
     - percona-toolkit