diff --git a/lxc/tasks/main.yml b/lxc/tasks/main.yml
index c606a02c..11d267c5 100644
--- a/lxc/tasks/main.yml
+++ b/lxc/tasks/main.yml
@@ -3,9 +3,9 @@
   apt:
     name: '{{ item }}'
   with_items:
-  - lxc
-  - debootstrap
-  - xz-utils
+    - lxc
+    - debootstrap
+    - xz-utils
 
 - name: Copy LXC default containers configuration
   template:
@@ -21,8 +21,13 @@
 
 - name: Add subuid and subgid ranges to root
   command: usermod -v 100000-199999 -w 100000-109999 root
-  when: lxc_unprivilegied_containers and root_subuids.rc
+  when:
+    - lxc_unprivilegied_containers
+    - root_subuids.rc
 
 - name: Create containers
-  include: "create-container.yml name={{item.name}} release={{item.release}}"
+  include: create-container.yml
+  vars:
+    name: "{{ item.name }}"
+    release: "{{item.release}}"
   with_items: "{{lxc_containers}}"