diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
index 91a4c70310..1aab101527 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -763,6 +763,7 @@ outputs:
             name: keystone
           register: keystone_infos
           failed_when:
+            - keystone_infos.containers.0.Healthcheck.Status is defined
             - "'healthy' not in keystone_infos.containers.0.Healthcheck.Status"
           retries: 10
           delay: 30
diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml
index 591d57d1c5..d177fa01f2 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -472,6 +472,7 @@ outputs:
             name: nova_api
           register: nova_api_infos
           failed_when:
+            - nova_api_infos.containers.0.Healthcheck.Status is defined
             - "'healthy' not in nova_api_infos.containers.0.Healthcheck.Status"
           retries: 10
           delay: 30
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index 3335ad1535..f63bc8891c 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -1087,6 +1087,7 @@ outputs:
             name: nova_compute
           register: nova_compute_infos
           failed_when:
+            - nova_compute_infos.containers.0.Healthcheck.Status is defined
             - "'healthy' not in nova_compute_infos.containers.0.Healthcheck.Status"
           retries: 10
           delay: 30
diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml
index 571be25748..359b3be6d1 100644
--- a/deployment/nova/nova-conductor-container-puppet.yaml
+++ b/deployment/nova/nova-conductor-container-puppet.yaml
@@ -183,6 +183,7 @@ outputs:
             name: nova_conductor
           register: nova_conductor_infos
           failed_when:
+            - nova_conductor_infos.containers.0.Healthcheck.Status is defined
             - "'healthy' not in nova_conductor_infos.containers.0.Healthcheck.Status"
           retries: 10
           delay: 30
diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml
index 8dd30cd8e1..263b26f5ec 100644
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@@ -799,6 +799,7 @@ outputs:
             name: nova_libvirt
           register: nova_libvirt_infos
           failed_when:
+            - nova_libvirt_infos.containers.0.Healthcheck.Status is defined
             - "'healthy' not in nova_libvirt_infos.containers.0.Healthcheck.Status"
           retries: 10
           delay: 30
diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml
index 3bc4656970..6c45d2e3ce 100644
--- a/deployment/nova/nova-metadata-container-puppet.yaml
+++ b/deployment/nova/nova-metadata-container-puppet.yaml
@@ -241,6 +241,7 @@ outputs:
             name: nova_metadata
           register: nova_metadata_infos
           failed_when:
+            - nova_metadata_infos.containers.0.Healthcheck.Status is defined
             - "'healthy' not in nova_metadata_infos.containers.0.Healthcheck.Status"
           retries: 10
           delay: 30
diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml
index dfaf69f9f7..09c5a00c75 100644
--- a/deployment/nova/nova-migration-target-container-puppet.yaml
+++ b/deployment/nova/nova-migration-target-container-puppet.yaml
@@ -186,6 +186,7 @@ outputs:
             name: nova_migration_target
           register: nova_migration_target_infos
           failed_when:
+            - nova_migration_target_infos.containers.0.Healthcheck.Status is defined
             - "'healthy' not in nova_migration_target_infos.containers.0.Healthcheck.Status"
           retries: 10
           delay: 30
diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml
index 7d642d1ef9..4b116afba5 100644
--- a/deployment/nova/nova-scheduler-container-puppet.yaml
+++ b/deployment/nova/nova-scheduler-container-puppet.yaml
@@ -213,6 +213,7 @@ outputs:
             name: nova_scheduler
           register: nova_scheduler_infos
           failed_when:
+            - nova_scheduler_infos.containers.0.Healthcheck.Status is defined
             - "'healthy' not in nova_scheduler_infos.containers.0.Healthcheck.Status"
           retries: 10
           delay: 30
diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml
index 12a2469dbc..7808e47628 100644
--- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml
+++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml
@@ -305,6 +305,7 @@ outputs:
             name: nova_vnc_proxy
           register: nova_vnc_proxy_infos
           failed_when:
+            - nova_vnc_proxy_infos.containers.0.Healthcheck.Status is defined
             - "'healthy' not in nova_vnc_proxy_infos.containers.0.Healthcheck.Status"
           retries: 10
           delay: 30