diff --git a/roles/eda/tasks/deploy_eda.yml b/roles/eda/tasks/deploy_eda.yml
index 5d5def78..d4b3af4b 100644
--- a/roles/eda/tasks/deploy_eda.yml
+++ b/roles/eda/tasks/deploy_eda.yml
@@ -44,6 +44,9 @@
     - "eda_api_pod['resources'] | length"
     - "eda_api_pod['resources'][0]['status']['phase'] == 'Running'"
     - "eda_api_pod['resources'][0]['status']['containerStatuses'][0]['ready'] == true"
+    - "eda_api_pod['resources'][0]['status']['containerStatuses'][1]['ready'] == true"
+  retries: 60
+  delay: 5
 
 - name: Set the resource pod name as a variable.
   set_fact:
diff --git a/roles/eda/templates/eda-api.deployment.yaml.j2 b/roles/eda/templates/eda-api.deployment.yaml.j2
index eb63180e..fae2ee22 100644
--- a/roles/eda/templates/eda-api.deployment.yaml.j2
+++ b/roles/eda/templates/eda-api.deployment.yaml.j2
@@ -208,14 +208,14 @@ spec:
             port: 8000
           failureThreshold: 10
           periodSeconds: 10
-          initialDelaySeconds: 90
+          initialDelaySeconds: 20
         livenessProbe:
           httpGet:
             path: /_healthz
             port: 8000
           failureThreshold: 10
           periodSeconds: 10
-          initialDelaySeconds: 90
+          initialDelaySeconds: 20
 {% if combined_api.resource_requirements is defined %}
         resources: {{ combined_api.resource_requirements }}
 {% endif %}