diff --git a/example-apps/chatbot-rag-app/README.md b/example-apps/chatbot-rag-app/README.md
index a67c2cc9..42dd303d 100644
--- a/example-apps/chatbot-rag-app/README.md
+++ b/example-apps/chatbot-rag-app/README.md
@@ -116,9 +116,9 @@ to follow logs on this stage:
 kubectl logs deployment.apps/chatbot-rag-app -c create-index -f
 ```
 
-Next, forward the kibana port:
+Next, forward the web UI port:
 ```bash
-kubectl port-forward service/kibana 5601:5601 &
+kubectl port-forward deployment.apps/chatbot-rag-app 4000:4000 &
 ```
 
 Clean up when finished, like this:
diff --git a/k8s/k8s-manifest-elastic.yml b/k8s/k8s-manifest-elastic.yml
index 151192b4..7a23452f 100644
--- a/k8s/k8s-manifest-elastic.yml
+++ b/k8s/k8s-manifest-elastic.yml
@@ -163,6 +163,15 @@ spec:
       labels:
         app: apm-server
     spec:
+      initContainers:
+        - name: await-kibana
+          image: docker.elastic.co/elasticsearch/elasticsearch:8.17.2
+          command:
+            - bash
+            - -xc
+            - |
+              echo "Waiting for kibana to be available";
+              until curl -s http://kibana:5601/api/status | grep -q 'available'; do sleep 5; done;
       containers:
         - name: apm-server
           image: docker.elastic.co/apm/apm-server:8.17.2