diff --git a/defaults/main.yml b/defaults/main.yml
index fb3c89a..3d3d9a4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -5,4 +5,4 @@ mei_generator_compose_url: 'https://raw.githubusercontent.com/CMCC-Foundation/bl
 #cmmc_mysql_root_password: 'set it in a vault file'
 #cmmc_mysql_password: 'set it in a vault file'
 #mei_generator_db_constraints: '[node.labels.db_data==mei_generator]'
-mei_generator_db_executor: 'docker-exec1.int.d4science.net'
\ No newline at end of file
+#mei_generator_db_executor: 'docker-exec1.int.d4science.net'
diff --git a/tasks/main.yml b/tasks/main.yml
index 1463b62..3c7112b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -34,6 +34,7 @@
         labels:
           mei_generator_db_data: 'bc_mei_generator'
         labels_state: 'merge'
+      when: mei_generator_db_executor is defined
 
     - name: Start the MEI Generator stack
       docker_stack: