diff --git a/defaults/main.yml b/defaults/main.yml
index 7a25c2ac..6a3b9547 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -66,8 +66,8 @@ galera_innodb_log_file_size: 1024M
 galera_innodb_log_buffer_size: 128M
 
 ## wsrep configuration
-galera_wsrep_address: "{{ ansible_ssh_host }}"
-galera_wsrep_cluster_address: "{% for host in galera_cluster_members %}{{ hostvars[host]['ansible_ssh_host'] }}{% if not loop.last %},{% endif %}{% endfor %}"
+galera_wsrep_address: "{{ ansible_host }}"
+galera_wsrep_cluster_address: "{% for host in galera_cluster_members %}{{ hostvars[host]['ansible_host'] }}{% if not loop.last %},{% endif %}{% endfor %}"
 galera_wsrep_node_incoming_address: "{{ galera_wsrep_address }}"
 galera_wsrep_slave_threads: "{{ (ansible_processor_vcpus | int > 0) | ternary (ansible_processor_vcpus, 2) }}"
 galera_wsrep_retry_autocommit: 3
diff --git a/tests/inventory b/tests/inventory
index 68acf971..f3b5ea8b 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -1,8 +1,8 @@
 [all]
 localhost ansible_become=True
-container1 ansible_ssh_host=10.100.100.101 ansible_host=10.100.100.101 ansible_become=True ansible_user=root
-container2 ansible_ssh_host=10.100.100.102 ansible_host=10.100.100.102 ansible_become=True ansible_user=root
-container3 ansible_ssh_host=10.100.100.103 ansible_host=10.100.100.103 ansible_become=True ansible_user=root
+container1 ansible_host=10.100.100.101 ansible_become=True ansible_user=root
+container2 ansible_host=10.100.100.102 ansible_become=True ansible_user=root
+container3 ansible_host=10.100.100.103 ansible_become=True ansible_user=root
 
 [galera_all]
 container1
diff --git a/tests/test-galera-server-functional.yml b/tests/test-galera-server-functional.yml
index c08d0071..c304acb8 100644
--- a/tests/test-galera-server-functional.yml
+++ b/tests/test-galera-server-functional.yml
@@ -20,7 +20,7 @@
   tasks:
     - name: Check cluster incoming addresses
       command: |
-        mysql -h {{ ansible_ssh_host }} \
+        mysql -h {{ ansible_host }} \
               -p"{{ galera_root_password }}" \
               -e "show status like 'wsrep_incoming_addresses';" \
               --silent \
@@ -28,7 +28,7 @@
       register: wsrep_incoming_addresses
     - name: Check cluster local state
       command: |
-        mysql -h {{ ansible_ssh_host }} \
+        mysql -h {{ ansible_host }} \
               -p"{{ galera_root_password }}" \
               -e "show status like 'wsrep_local_state_comment';" \
               --silent \
@@ -36,7 +36,7 @@
       register: wsrep_local_state_comment
     - name: Check cluster evs state
       command: |
-        mysql -h {{ ansible_ssh_host }} \
+        mysql -h {{ ansible_host }} \
               -p"{{ galera_root_password }}" \
               -e "show status like 'wsrep_evs_state';" \
               --silent \