diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml
index a2d481b..0a0d923 100644
--- a/playbooks/galera-install.yml
+++ b/playbooks/galera-install.yml
@@ -38,6 +38,7 @@
       wait_for:
         port: "22"
         delay: 5
+        search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"
       tags:
diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml
index 7fb4a6c..2016afb 100644
--- a/playbooks/os-ceilometer-install.yml
+++ b/playbooks/os-ceilometer-install.yml
@@ -27,6 +27,7 @@
       wait_for:
         port: "22"
         delay: 5
+        search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"
       tags:
diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml
index a05040b..4273648 100644
--- a/playbooks/os-cinder-install.yml
+++ b/playbooks/os-cinder-install.yml
@@ -73,6 +73,7 @@
       wait_for:
         port: "22"
         delay: 5
+        search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"
       tags:
diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml
index 226d442..747bf12 100644
--- a/playbooks/os-glance-install.yml
+++ b/playbooks/os-glance-install.yml
@@ -38,6 +38,7 @@
       wait_for:
         port: "22"
         delay: 5
+        search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"
       tags:
diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml
index 503ff4a..20c05d6 100644
--- a/playbooks/os-neutron-install.yml
+++ b/playbooks/os-neutron-install.yml
@@ -40,6 +40,7 @@
       wait_for:
         port: "22"
         delay: 5
+        search_regex: "OpenSSH"
         host: "{{ ansible_ssh_host }}"
       delegate_to: "{{ physical_host }}"
       tags:
diff --git a/playbooks/rsyslog-install.yml b/playbooks/rsyslog-install.yml
index 0a51d52..0b9266c 100644
--- a/playbooks/rsyslog-install.yml
+++ b/playbooks/rsyslog-install.yml
@@ -42,6 +42,16 @@
       delegate_to: "{{ physical_host }}"
       tags:
         - flush-net-cache
+    - name: Wait for container ssh
+      wait_for:
+        port: "22"
+        delay: 5
+        search_regex: "OpenSSH"
+        host: "{{ ansible_ssh_host }}"
+      delegate_to: "{{ physical_host }}"
+      tags:
+        - rsyslog-ssh-wait
+
   roles:
     - { role: "rsyslog_server", tags: [ "rsyslog-server" ] }
     - role: "system_crontab_coordination"