diff --git a/roles/conductor/templates/conductor-swarm-config.properties.j2 b/roles/conductor/templates/conductor-swarm-config.properties.j2
index dfb5437..7dff1fb 100644
--- a/roles/conductor/templates/conductor-swarm-config.properties.j2
+++ b/roles/conductor/templates/conductor-swarm-config.properties.j2
@@ -7,7 +7,8 @@ conductor.db.type=postgres
 conductor.postgres.jdbcUrl={{ postgres_jdbc_url }}
 conductor.postgres.jdbcUsername={{ postgres_jdbc_user }}
 conductor.postgres.jdbcPassword={{ postgres_jdbc_pass }}
-spring.flyway.baseline-on-migrate=true
+flyway.baseline-on-migrate=true
+conductor.flyway.baseline-on-migrate=true
 {% endif %}
 
 {% if conductor_db == 'mysql' %}
@@ -30,3 +31,6 @@ workflow.elasticsearch.index.name=conductor
 
 # Load sample kitchen sink workflow
 loadSample=false
+
+#flyway.baseline-on-migrate=true
+