diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml
index bc691578..1e386682 100644
--- a/roles/docker-compose/tasks/main.yml
+++ b/roles/docker-compose/tasks/main.yml
@@ -20,12 +20,11 @@
   include_tasks: "02_repository.yml"
   when: docker_pull_git_repository | bool
 
-- name: "Include routines file management routines for '{{application_id}}'."
-  include_tasks: "03_files.yml"
-  when: not docker_compose_skipp_file_creation | bool
-
-- name: "Ensure that {{ docker_compose.directories.instance }} is up"
-  include_tasks: "04_ensure_up.yml"
+- block:
+    - name: "Include file management routines for '{{application_id}}'."
+      include_tasks: "03_files.yml"
+    - name: "Ensure that {{ docker_compose.directories.instance }} is up"
+      include_tasks: "04_ensure_up.yml"
   when: not docker_compose_skipp_file_creation | bool
 
 - name: "flush database, docker and proxy for '{{ application_id }}'"