diff --git a/handlers/main.yml b/handlers/main.yml
index 0a080f3..1c7467b 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -44,7 +44,7 @@
     --logpriority {{ (debug | bool) | ternary('DEBUG', 'INFO') }}
   delegate_to: "{{ physical_host }}"
   register: container_start
-  until: container_start  is success
+  until: container_start is success
   retries: 3
   listen: Lxc container restart
 
diff --git a/tasks/lxc_container_config.yml b/tasks/lxc_container_config.yml
index ae484f6..026033c 100644
--- a/tasks/lxc_container_config.yml
+++ b/tasks/lxc_container_config.yml
@@ -94,7 +94,7 @@
   args:
     creates: "/var/lib/lxc/{{ inventory_hostname }}/setup.complete"
   register: container_extra_commands
-  until: container_extra_commands  is success
+  until: container_extra_commands is success
   retries: 5
   delay: 2
   delegate_to: "{{ physical_host }}"
diff --git a/tasks/lxc_container_create.yml b/tasks/lxc_container_create.yml
index 1072a78..a73ba46 100644
--- a/tasks/lxc_container_create.yml
+++ b/tasks/lxc_container_create.yml
@@ -41,7 +41,7 @@
   changed_when: false
   delegate_to: "{{ physical_host }}"
   register: _lxc_container_state
-  until: _lxc_container_state  is success
+  until: _lxc_container_state is success
   retries: 3
   delay: 5
 
@@ -57,7 +57,7 @@
     --logpriority {{ (debug | bool) | ternary('DEBUG', 'INFO') }}
   delegate_to: "{{ physical_host }}"
   register: _lxc_container_create
-  until: _lxc_container_create  is success
+  until: _lxc_container_create is success
   retries: 3
   delay: 5
   when:
diff --git a/tests/test-containers-functional.yml b/tests/test-containers-functional.yml
index ace1253..e45cb2b 100644
--- a/tests/test-containers-functional.yml
+++ b/tests/test-containers-functional.yml
@@ -145,7 +145,7 @@
       command: "lxc-start -d -n container3"
       register: container_start
       changed_when: container_start.rc == 0
-      until: container_start  is success
+      until: container_start is success
       retries: 3
       delay: 2