diff --git a/roles/roundcube/tasks/main.yaml b/roles/roundcube/tasks/main.yaml
index cbe8ea8..995a16c 100644
--- a/roles/roundcube/tasks/main.yaml
+++ b/roles/roundcube/tasks/main.yaml
@@ -38,7 +38,7 @@
 - name: '(FIX REMOVE THIS ACTION) add temporary host record'
   lineinfile:
     dest: /etc/hosts
-    line: "{{ hostvars['mail'].ansible_host }}  {{ mail_server }}"
+    line: "{{ hostvars | ip_from_inventory('mail') }}  {{ mail_server }}"
     regexp: "{{ mail_server }}$"
 
 - name: include my-roundcube.php
diff --git a/roles/ssh_server/tasks/main.yaml b/roles/ssh_server/tasks/main.yaml
index 4818a56..1902679 100644
--- a/roles/ssh_server/tasks/main.yaml
+++ b/roles/ssh_server/tasks/main.yaml
@@ -115,7 +115,7 @@
 
 - name: "waiting for ssh on {{ ansible_docker_extra_args | default(inventory_hostname) }} to start"
   wait_for:
-    host: "{{ hostvars[inventory_hostname]['ansible_host'] }}"
+    host: "{{ hostvars | ip_from_inventory(inventory_hostname) }}"
     port: 22
     timeout: 30
   delegate_to: "{{ inventory_hostname }}"