diff --git a/libs/scenario_execution_kubernetes/scenario_execution_kubernetes/kubernetes_wait_for_pod_status.py b/libs/scenario_execution_kubernetes/scenario_execution_kubernetes/kubernetes_wait_for_pod_status.py
index 9a51e51c..cb00501c 100644
--- a/libs/scenario_execution_kubernetes/scenario_execution_kubernetes/kubernetes_wait_for_pod_status.py
+++ b/libs/scenario_execution_kubernetes/scenario_execution_kubernetes/kubernetes_wait_for_pod_status.py
@@ -32,16 +32,17 @@ class KubernetesWaitForPodStatusState(Enum):
 
 class KubernetesWaitForPodStatus(BaseAction):
 
-    def __init__(self, within_cluster: bool):
+    def __init__(self, within_cluster: bool, namespace: str):
         super().__init__()
         self.target = None
-        self.namespace = None
+        self.namespace = namespace
         self.expected_status = None
         self.within_cluster = within_cluster
         self.regex = None
         self.client = None
         self.update_queue = queue.Queue()
         self.current_state = KubernetesWaitForPodStatusState.IDLE
+        self.last_state = None
 
     def setup(self, **kwargs):
         if self.within_cluster:
@@ -53,44 +54,50 @@ def setup(self, **kwargs):
         self.monitoring_thread = threading.Thread(target=self.watch_pods, daemon=True)
         self.monitoring_thread.start()
 
-    def execute(self, target: str, regex: bool, status: tuple, namespace: str):
+    def execute(self, target: str, regex: bool, status: tuple, ):
         self.target = target
-        self.namespace = namespace
         if not isinstance(status, tuple) or not isinstance(status[0], str):
             raise ValueError("Status expected to be enum.")
         self.expected_status = status[0]
         self.regex = regex
         self.current_state = KubernetesWaitForPodStatusState.MONITORING
+        self.last_state = None
 
     def update(self) -> py_trees.common.Status:
         while not self.update_queue.empty():
             item = self.update_queue.get()
             if len(item) != 2:
                 return py_trees.common.Status.FAILURE
-
-            self.feedback_message = f"waiting for status of pod '{self.target}'."  # pylint: disable= attribute-defined-outside-init
+            if self.last_state is None:
+                self.feedback_message = f"waiting for status of pod '{self.target}'."  # pylint: disable= attribute-defined-outside-init
             if not self.regex:
                 if item[0] != self.target:
                     continue
             else:
                 if not re.search(self.target, item[0]):
                     continue
-            if item[1].lower() == self.expected_status:
+            if item[1].lower() == self.expected_status and self.last_state is not None:
                 self.feedback_message = f"Pod '{item[0]}' changed to expected status '{item[1].lower()}'."  # pylint: disable= attribute-defined-outside-init
+                self.current_state = KubernetesWaitForPodStatusState.IDLE
                 return py_trees.common.Status.SUCCESS
             else:
                 self.feedback_message = f"Pod '{item[0]}' changed to status '{item[1].lower()}', expected '{self.expected_status}'."  # pylint: disable= attribute-defined-outside-init
+                self.last_state = item[1].lower()
         return py_trees.common.Status.RUNNING
 
     def watch_pods(self):
         w = watch.Watch()
         try:
-            # TODO: make use of send_initial_events=false in the future
+            initial_pods = self.client.list_namespaced_pod(namespace=self.namespace).items
+            for pod in initial_pods:
+                pod_name = pod.metadata.name
+                pod_status = pod.status.phase
+                self.update_queue.put((pod_name, pod_status))
             for event in w.stream(self.client.list_namespaced_pod, namespace=self.namespace):
                 pod_name = event['object'].metadata.name
                 pod_status = event['object'].status.phase
                 if self.current_state == KubernetesWaitForPodStatusState.MONITORING:
                     self.update_queue.put((pod_name, pod_status))
         except ApiException as e:
-            self.logger.error(f"Error accessing kubernetes: {e}")
+            self.logger.error(f"Error accessing Kubernetes: {e}")
             self.update_queue.put(())