diff --git a/tasks/main.yml b/tasks/main.yml
index 8bb3c36..b62d307 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -28,6 +28,7 @@
         labels:
           epas_pg_data: 'epas_db'
         labels_state: '{{ docker_label_state_mode }}'
+        when: epas_dockerized_db
 
     - name: Install the docker compose file
       template: src=epas-docker-compose.yml.j2 dest={{ epas_compose_dir }}/docker-epas-stack.yml owner=root group=root mode='0400'
@@ -51,5 +52,5 @@
     #   when: epas_behind_haproxy
 
   run_once: True
-  when: docker_swarm_manager_main_node is defined and docker_swarm_manager_main_node | bool
+  when: docker_swarm_manager_node is defined and docker_swarm_manager_node
   tags: [ 'epas', 'epas_swarm', 'epas_server' ]