diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index b21f7e2..5f5dc16 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -110,6 +110,7 @@ atl_jdbc_ctype: "{{ lookup('env', 'ATL_JDBC_CTYPE') or 'en_US.UTF-8' }}"
 atl_jdbc_template: "{{ lookup('env', 'ATL_JDBC_TEMPLATE') or 'template1' }}"
 atl_jdbc_query_params_for_engine:
   aurora_postgres: "?targetServerType=master"
+  rds_mysql: "?useUnicode=true&characterEncoding=UTF8&sessionVariables=default_storage_engine=InnoDB"
 atl_jdbc_engine_map:
   aurora_postgres: "postgres"
   rds_postgres: "postgres"
diff --git a/roles/database_init/tasks/mysql.yml b/roles/database_init/tasks/mysql.yml
index e7be230..fe63d45 100644
--- a/roles/database_init/tasks/mysql.yml
+++ b/roles/database_init/tasks/mysql.yml
@@ -31,20 +31,18 @@
         login_password: "{{ atl_db_root_password }}"
         login_port: "{{ atl_db_port }}"
         name: "{{ atl_jdbc_db_name }}"
-        encoding: "{{ atl_jdbc_encoding }}"
-        collation: "{{ atl_jdbc_collation }}"
+        encoding: "utf8" # TODO "{{ atl_jdbc_encoding }}"
+        collation: "utf8_bin" # TODO "{{ atl_jdbc_collation }}"
       register: db_created 
 
   tags:
     - new_only
 
-# - name: Assert ownership of public schema
-#   postgresql_query:
-#     login_host: "{{ atl_db_host }}"
-#     login_user: "{{ atl_db_root_user }}"
-#     login_password: "{{ atl_db_root_password }}"
-#     db: "{{ atl_jdbc_db_name }}"
-#     query: "ALTER SCHEMA public OWNER to {{ atl_db_root_user }};"
+- name: Assert ownership of public schema
+  command: >
+    mysql --user={{ atl_jdbc_user }} --password={{ atl_jdbc_password }} {{ atl_jdbc_db_name }}
+    --host={{ atl_db_host }} --port={{ atl_db_port }} --batch --skip-column-names
+    --execute="GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,ALTER,INDEX on {{ atl_jdbc_db_name }}.* TO '{{ atl_jdbc_user }}'@'{{ atl_db_host }}' IDENTIFIED BY '{{ atl_jdbc_password }}'; flush privileges;"
 
 # - name: Grant privs to root user on public schema
 #   postgresql_query:
diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml
index 5064f5d..ac583c3 100644
--- a/roles/jira_config/tasks/main.yml
+++ b/roles/jira_config/tasks/main.yml
@@ -100,11 +100,16 @@
     - "{{ atl_product_installation_versioned }}/work"
   changed_when: false  # For Molecule idempotence check
 
-- name: Assert baseurl to same as atl_proxy_name
+- name: Do something with stuff
+  debug: "{{ item }}"
+  with_items: stuff.stdout_lines
+
+- name: Assert baseurl to same as atl_proxy_name (PostgreSQL)
   postgresql_query:
     login_host: "{{ atl_db_host }}"
     login_user: "{{ atl_jdbc_user }}"
     login_password: "{{ atl_jdbc_password }}"
+    port: "{{ atl_db_port }}"
     db: "{{ atl_jdbc_db_name }}"
     query: >
       update propertystring set propertyvalue=%s
@@ -115,6 +120,23 @@
     - atl_proxy_name is defined
     - atl_tomcat_scheme is defined
     - db_created is undefined or not db_created.changed
+    - atl_jdbc_engine_map[atl_db_engine] = 'postgres'
+  tags:
+    - skip_on_stack_update
+  ignore_errors: yes  # For Molecule as it has no db test framework included
+  
+
+  - name: Assert baseurl to same as atl_proxy_name (MySQL)
+    command: >
+      mysql --user={{ atl_jdbc_user }} --password={{ atl_jdbc_password }} {{ atl_jdbc_db_name }}
+      --host={{ atl_db_host }} --port={{ atl_db_port }} --batch --skip-column-names
+      --execute="update propertystring set propertyvalue="{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}{{ atl_tomcat_contextpath }}"
+        where id=(select id from propertyentry where property_key = 'jira.baseurl')"
+  when:
+    - atl_proxy_name is defined
+    - atl_tomcat_scheme is defined
+    - db_created is undefined or not db_created.changed
+    - atl_jdbc_engine_map[atl_db_engine] = 'mysql'
   tags:
     - skip_on_stack_update
   ignore_errors: yes  # For Molecule as it has no db test framework included