diff --git a/roles/conductor/templates/conductor-swarm-config.properties.j2 b/roles/conductor/templates/conductor-swarm-config.properties.j2
index 280ed85..115896d 100644
--- a/roles/conductor/templates/conductor-swarm-config.properties.j2
+++ b/roles/conductor/templates/conductor-swarm-config.properties.j2
@@ -7,9 +7,10 @@ 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
 {% endif %}
 
-{% if conductor_db == 'imysql' %}
+{% if conductor_db == 'mysql' %}
 conductor.db.type=mysql
 conductor.mysql.jdbcUrl={{ mysql_jdbc_url }}
 conductor.mysql.jdbcUsername={{ mysql_jdbc_user }}