diff --git a/defaults/main.yml b/defaults/main.yml
index cf006dc..06e40c4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -103,7 +103,8 @@ zun_docker_api_version: false
 # zun_system_group_gid = <GID>
 
 ## Database info
-zun_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}"
+zun_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
+zun_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((zun_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
 zun_galera_address: "{{ galera_address | default('127.0.0.1') }}"
 zun_galera_user: zun
 zun_galera_database: zun
@@ -114,6 +115,7 @@ zun_db_pool_timeout: 30
 zun_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
 # The path where to store the database server CA certificate
 zun_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}"
+zun_galera_port: 3306
 
 ## RabbitMQ info
 
diff --git a/tasks/db_setup.yml b/tasks/db_setup.yml
index 7a0120d..aca206e 100644
--- a/tasks/db_setup.yml
+++ b/tasks/db_setup.yml
@@ -22,12 +22,16 @@
 
 - name: Setup Database Service (MariaDB)
   delegate_to: "{{ _oslodb_setup_host }}"
+  vars:
+    ansible_python_interpreter: "{{ _oslodb_ansible_python_interpreter }}"
   tags:
     - common-mariadb
   block:
     - name: Create database for service
       mysql_db:
         name: "{{ item.name }}"
+        login_host: "{{ _oslodb_setup_endpoint | default(omit) }}"
+        login_port: "{{ _oslodb_setup_port | default(omit) }}"
       loop: "{{ _oslodb_databases }}"
       no_log: true
 
@@ -38,5 +42,7 @@
         host: "{{ item.1.host | default('%') }}"
         priv: "{{ item.0.name }}.*:{{ item.1.priv | default('ALL') }}"
         append_privs: yes
+        login_host: "{{ _oslodb_setup_endpoint | default(omit) }}"
+        login_port: "{{ _oslodb_setup_port | default(omit) }}"
       loop: "{{ _oslodb_databases | subelements('users') }}"
       no_log: true
diff --git a/tasks/main.yml b/tasks/main.yml
index dcc4c04..a6ad33c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -72,6 +72,9 @@
 - import_tasks: db_setup.yml
   vars:
     _oslodb_setup_host: "{{ zun_db_setup_host }}"
+    _oslodb_ansible_python_interpreter: "{{ zun_db_setup_python_interpreter }}"
+    _oslodb_setup_endpoint: "{{ zun_galera_address }}"
+    _oslodb_setup_port: "{{ zun_galera_port }}"
     _oslodb_databases:
       - name: "{{ zun_galera_database }}"
         users: