diff --git a/tasks/container_create.yml b/tasks/container_create.yml
index f4bd436..1463a6a 100644
--- a/tasks/container_create.yml
+++ b/tasks/container_create.yml
@@ -299,8 +299,8 @@
 - name: Wait for ssh to be available
   local_action:
     module: wait_for
-    port: "{{ ansible_ssh_port | default('22') }}"
-    host: "{{ ansible_ssh_host | default(inventory_hostname) }}"
+    port: "{{ ansible_port | default('22') }}"
+    host: "{{ ansible_host | default(inventory_hostname) }}"
     search_regex: OpenSSH
     delay: "{{ lxc_container_ssh_delay }}"
   register: ssh_wait_check
diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml
index 38f17f5..488700e 100644
--- a/tests/group_vars/all_containers.yml
+++ b/tests/group_vars/all_containers.yml
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible_ssh_host: "{{ ansible_host }}"
 container_name: "{{ inventory_hostname }}"
 
 container_networks: