diff --git a/roles/web-app-bigbluebutton/tasks/01_docker-compose.yml b/roles/web-app-bigbluebutton/tasks/01_docker-compose.yml
index 97a7e1ac..95d7a490 100644
--- a/roles/web-app-bigbluebutton/tasks/01_docker-compose.yml
+++ b/roles/web-app-bigbluebutton/tasks/01_docker-compose.yml
@@ -3,8 +3,8 @@
     cmd: bash ./scripts/generate-compose
     chdir: "{{ docker_repository_path }}"
   environment:
-    COMPOSE_HTTP_TIMEOUT: 600
-    DOCKER_CLIENT_TIMEOUT: 600
+    COMPOSE_HTTP_TIMEOUT: "600"
+    DOCKER_CLIENT_TIMEOUT: "600"
 
 - name: Slurp docker-compose.yml from remote host
   slurp:
diff --git a/roles/web-app-bigbluebutton/tasks/main.yml b/roles/web-app-bigbluebutton/tasks/main.yml
index b36aa622..dcc59dc9 100644
--- a/roles/web-app-bigbluebutton/tasks/main.yml
+++ b/roles/web-app-bigbluebutton/tasks/main.yml
@@ -70,7 +70,7 @@
   include_tasks: "01_docker-compose.yml"
 
 - name: Ensure all containers in instance are running
-  include_tasks: "{{ [ playbook_dir , 'roles/docker-compose/tasks/05_ensure_up.yml' ] | path_join }}"
+  include_tasks: "{{ [ playbook_dir , 'roles/docker-compose/tasks/utils/up.yml' ] | path_join }}"
 
 - name: flush docker service
   meta: flush_handlers