diff --git a/src/test/robot/SanityK8POD.robot b/src/test/robot/SanityK8POD.robot
index f21455a..6f422ba 100644
--- a/src/test/robot/SanityK8POD.robot
+++ b/src/test/robot/SanityK8POD.robot
@@ -229,6 +229,7 @@
     \    ${name}=    Get From Dictionary    ${metadata}    name
     \    Continue For Loop If    '${component}' not in '''${name}'''
     \    Continue For Loop If    'tosca-loader' in '''${name}'''
+    \    Continue For Loop If    '-test' not in '''${name}'''
     \    ${status}=    Get From Dictionary    ${item}    status
     \    ${containerStatuses}=    Get From Dictionary    ${status}    containerStatuses
     \    Log    ${containerStatuses}
diff --git a/src/test/robot/data/k8resources.json b/src/test/robot/data/k8resources.json
index de2c69d..f02012c 100644
--- a/src/test/robot/data/k8resources.json
+++ b/src/test/robot/data/k8resources.json
@@ -5,7 +5,9 @@
         "xos-core",
         "xos-db",
         "xos-redis",
-        "xos-tosca"
+        "xos-tosca",
+        "xos-gui",
+        "xos-ws"
     ],
     "xos-core-deployments":
     [
@@ -13,7 +15,9 @@
         "xos-core",
         "xos-db",
         "xos-redis",
-        "xos-tosca"
+        "xos-tosca",
+        "xos-gui",
+        "xos-ws"
     ],
     "rcord-lite-containers":
     [
@@ -59,8 +63,6 @@
     ],
     "voltha-containers":
     [
-        "kafka-broker",
-        "zookeeper-server",
         "etcd-restore-operator",
         "voltha-etcd-operator-etcd-operator",
         "etcd-backup-operator"
@@ -73,9 +75,8 @@
     ],
     "voltha-services":
     [
-        "voltha-kafka",
-        "voltha-kafka-headless",
-        "voltha-zookeeper",
-        "voltha-zookeeper-headless"
+        "etcd-cluster",
+        "etcd-cluster-client",
+        "etcd-restore-operator"
     ]
 }