diff --git a/modules/coordinator/src/main/scala/de/nowchess/coordinator/service/HealthMonitor.scala b/modules/coordinator/src/main/scala/de/nowchess/coordinator/service/HealthMonitor.scala
index 0ddc215..202177d 100644
--- a/modules/coordinator/src/main/scala/de/nowchess/coordinator/service/HealthMonitor.scala
+++ b/modules/coordinator/src/main/scala/de/nowchess/coordinator/service/HealthMonitor.scala
@@ -131,7 +131,7 @@ class HealthMonitor:
 
         pods.exists { pod =>
           val podName = pod.getMetadata.getName
-          podName.endsWith(instanceId) && isPodReady(pod)
+          podName.contains(instanceId) && isPodReady(pod)
         }
       catch
         case ex: Exception =>
@@ -185,7 +185,7 @@ class HealthMonitor:
             .getItems
             .asScala
 
-          pods.find(pod => pod.getMetadata.getName.endsWith(instanceId)) match
+          pods.find(pod => pod.getMetadata.getName.contains(instanceId)) match
             case Some(pod) =>
               val podName = pod.getMetadata.getName
               kube.pods().inNamespace(config.k8sNamespace).withName(podName).withGracePeriod(0L).delete()
@@ -244,4 +244,4 @@ class HealthMonitor:
 
   private def findRegisteredInstance(pod: Pod): Option[InstanceMetadata] =
     val podName = pod.getMetadata.getName
-    instanceRegistry.getAllInstances.find(inst => podName.endsWith(inst.instanceId))
+    instanceRegistry.getAllInstances.find(inst => podName.contains(inst.instanceId))