diff --git a/defaults/main.yml b/defaults/main.yml
index f5f6159..5557d5f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -11,7 +11,7 @@ docker_restart_handler_state: restarted
 
 # Docker Compose options.
 docker_compose_install: yes
-docker_compose_version: '1.24.0'
+docker_compose_version: '1.24.1'
 docker_compose_path: '/usr/local/bin/docker-compose'
 docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64"
 
@@ -21,6 +21,7 @@ lazydocker_version: '0.4'
 lazydocker_path: '/usr/local/bin/lazydocker'
 lazydocker_url: "https://github.com/jesseduffield/lazydocker/releases/download/v{{ lazydocker_version }}/lazydocker_{{ lazydocker_version }}_Linux_x86_64.tar.gz"
 
+
 # Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed.
 docker_apt_release_channel: stable
 docker_apt_arch: amd64
diff --git a/tasks/main.yml b/tasks/main.yml
index a3084fe..b109fd5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -43,12 +43,12 @@
 
 - include_tasks: docker-compose-install.yml
   when:
-    - docker_compose_install
+    - docker_compose_install | bool
 
 - include_tasks: lazydocker-install.yml
   when:
-    - lazydocker_install
+    - lazydocker_install | bool
 
 - include_tasks: docker-users.yml
   when:
-    - docker_users
+    - docker_users | length > 0