diff --git a/ansible/roles/common/defaults/main.yaml b/ansible/roles/common/defaults/main.yaml
index 62a3448..8279808 100644
--- a/ansible/roles/common/defaults/main.yaml
+++ b/ansible/roles/common/defaults/main.yaml
@@ -1,4 +1,4 @@
 ---
-target_path: /tmp/conductor_stack_postgres_cluster_replacement
+target_path: /tmp/conductor_stack
 conductor_network: conductor-network
 init_db: True
diff --git a/ansible/roles/conductor/tasks/main.yaml b/ansible/roles/conductor/tasks/main.yaml
index 89efe90..e4ec547 100644
--- a/ansible/roles/conductor/tasks/main.yaml
+++ b/ansible/roles/conductor/tasks/main.yaml
@@ -29,6 +29,6 @@
 - name: Copy conductor SQL schema init for JDBC DB
   when: use_jdbc and init_db
   template:
-    src: "templates/conductor-db-init-{{ conductor_db }}.sql"
+    src: "templates/conductor-db-init-{{ conductor_db }}.sql.j2"
     dest: "{{ target_path }}/conductor-db-init.sql"
 
diff --git a/ansible/roles/conductor/templates/conductor-db-init-mysql.sql b/ansible/roles/conductor/templates/conductor-db-init-mysql.sql.j2
similarity index 98%
rename from ansible/roles/conductor/templates/conductor-db-init-mysql.sql
rename to ansible/roles/conductor/templates/conductor-db-init-mysql.sql.j2
index 9884820..0fe9bb6 100644
--- a/ansible/roles/conductor/templates/conductor-db-init-mysql.sql
+++ b/ansible/roles/conductor/templates/conductor-db-init-mysql.sql.j2
@@ -1,3 +1,8 @@
+CREATE DATABASE IF NOT EXISTS {{ jdbc_db }};
+GRANT ALL PRIVILEGES ON {{ jdbc_db }}.* TO {{ jdbc_user}};
+FLUSH PRIVILEGES;
+USE {{ jdbc_db }};
+
 -- V1__initial_schema.sql --
 -- --------------------------------------------------------------------------------------------------------------
 -- SCHEMA FOR METADATA DAO
diff --git a/ansible/roles/conductor/templates/conductor-db-init-postgres.sql b/ansible/roles/conductor/templates/conductor-db-init-postgres.sql.j2
similarity index 100%
rename from ansible/roles/conductor/templates/conductor-db-init-postgres.sql
rename to ansible/roles/conductor/templates/conductor-db-init-postgres.sql.j2
diff --git a/ansible/roles/conductor/templates/conductor-swarm-config.properties.j2 b/ansible/roles/conductor/templates/conductor-swarm-config.properties.j2
index afbcb0b..0566388 100644
--- a/ansible/roles/conductor/templates/conductor-swarm-config.properties.j2
+++ b/ansible/roles/conductor/templates/conductor-swarm-config.properties.j2
@@ -13,8 +13,8 @@ db={{ conductor_db }}
 jdbc.url={{ jdbc_url }}
 jdbc.username={{ jdbc_user }}
 jdbc.password={{ jdbc_pass }}
-conductor.postgres.connection.pool.size.max=10
-conductor.postgres.connection.pool.idle.min=2
+conductor.{{ conductor_db }}.connection.pool.size.max=10
+conductor.{{ conductor_db }}.connection.pool.idle.min=2
 flyway.enabled=false
 
 {% else %}
diff --git a/ansible/roles/mysql/defaults/main.yml b/ansible/roles/mysql/defaults/main.yml
index fe78fbe..546f130 100644
--- a/ansible/roles/mysql/defaults/main.yml
+++ b/ansible/roles/mysql/defaults/main.yml
@@ -7,4 +7,4 @@ conductor_db: mysql
 jdbc_user: conductor
 jdbc_pass: password
 jdbc_db: conductor
-jdbc_url: jdbc:mysql://{{ mysql_service_name }}:3306/{{ jdbc_db }}
+jdbc_url: jdbc:mysql://{{ mysql_service_name }}:3306/{{ jdbc_db }}?useSSL=false&allowPublicKeyRetrieval=true
diff --git a/ansible/roles/mysql/templates/mysql-swarm.yaml.j2 b/ansible/roles/mysql/templates/mysql-swarm.yaml.j2
index 8cbdddf..8e2add5 100644
--- a/ansible/roles/mysql/templates/mysql-swarm.yaml.j2
+++ b/ansible/roles/mysql/templates/mysql-swarm.yaml.j2
@@ -4,12 +4,11 @@ services:
 
   {{ mysql_service_name }}:
     image: {{ mysql_image_name }}
-    ports:
-    - "3306:3306"
     environment:
-      MYSQL_USER: "{{ jdbc_user }}"
-      MYSQL_PASSWORD: "{{ jdbc_pass }}"
-      MYSQL_DB: "{{ jdbc_db }}"
+      MYSQL_USER: {{ jdbc_user }}
+      MYSQL_PASSWORD: {{ jdbc_pass }}
+      MYSQL_ROOT_PASSWORD: {{ jdbc_pass }}
+      MYSQL_DB: {{ jdbc_db }}
 {% if init_db %}
     configs:
       - source: db-init
diff --git a/ansible/roles/workers/defaults/main.yaml b/ansible/roles/workers/defaults/main.yaml
index f7716f5..e4bc40f 100644
--- a/ansible/roles/workers/defaults/main.yaml
+++ b/ansible/roles/workers/defaults/main.yaml
@@ -1,5 +1,5 @@
 ---
 conductor_workers_server: http://conductor-dev.int.d4science.net/api
 
-conductor_workers: [{service: 'base', image: 'nubisware/nubisware-conductor-worker-py-base', replicas: 2}, {service: 'provisioning', image: 'nubisware/nubisware-conductor-worker-py-provisioning', replicas: 2 } ] 
+conductor_workers: [ { service: 'base', image: 'nubisware/nubisware-conductor-worker-py-base', replicas: 2, threads: 1, pollrate: 1 }, { service: 'provisioning', image: 'nubisware/nubisware-conductor-worker-py-provisioning', replicas: 2, threads: 1, pollrate: 1 } ] 
 
diff --git a/ansible/site-with-mysql-cluster-replacement.yaml b/ansible/site-with-mysql-cluster-replacement.yaml
index a5e37b3..b3c1401 100644
--- a/ansible/site-with-mysql-cluster-replacement.yaml
+++ b/ansible/site-with-mysql-cluster-replacement.yaml
@@ -7,16 +7,16 @@
     - elasticsearch
     - conductor
   tasks:
-    - name: Start mysql and es
+    - name: "Start {{ mysql_image_name }} and es"
       docker_stack:
         name: conductor
         state: present
         compose:
           - "{{ target_path }}/mysql-swarm.yaml"
           - "{{ target_path }}/elasticsearch-swarm.yaml"
-    - name: Waiting for mysql and es DBs
+    - name: "Waiting for {{ mysql_image_name }} and es DBs"
       pause:
-        seconds: 10
+        seconds: 60
 
     - name: Start conductor
       docker_stack:
@@ -27,7 +27,7 @@
     
     - name: Start haproxy
       docker_stack:
-        name: haproxy
+        name: conductor
         state: present
         compose:
           - "{{ target_path }}/haproxy-swarm.yaml"
diff --git a/ansible/site-with-mysql.yaml b/ansible/site-with-mysql.yaml
index f6bfd0d..ad4c291 100644
--- a/ansible/site-with-mysql.yaml
+++ b/ansible/site-with-mysql.yaml
@@ -6,16 +6,16 @@
     - elasticsearch
     - conductor
   tasks:
-    - name: Start {{ mysql_image }} and es
+    - name: "Start {{ mysql_image_name }} and es"
       docker_stack:
         name: conductor
         state: present
         compose:
           - "{{ target_path }}/mysql-swarm.yaml"
           - "{{ target_path }}/elasticsearch-swarm.yaml"
-    - name: Waiting for {{ mysql_image }} and es DBs
+    - name: "Waiting for {{ mysql_image_name }} and es DBs"
       pause:
-        seconds: 10
+        seconds: 60
 
     - name: Start conductor
       docker_stack:
diff --git a/ansible/site-with-postgres-cluster-replacement.yaml b/ansible/site-with-postgres-cluster-replacement.yaml
index f79cce6..39b411f 100644
--- a/ansible/site-with-postgres-cluster-replacement.yaml
+++ b/ansible/site-with-postgres-cluster-replacement.yaml
@@ -27,7 +27,7 @@
     
     - name: Start haproxy
       docker_stack:
-        name: haproxy
+        name: conductor
         state: present
         compose:
           - "{{ target_path }}/haproxy-swarm.yaml"