diff --git a/libraries/voltha.robot b/libraries/voltha.robot
index dc1628d..1d7ba1e 100644
--- a/libraries/voltha.robot
+++ b/libraries/voltha.robot
@@ -45,7 +45,7 @@
     [Documentation]    Uses a script to restart a kubectl port-forward
     ${cmd}	Catenate
     ...    ps e -ww -A |
-    ...    grep _TAG=${name} |
+    ...    grep -E "_TAG=([a-z_-]+-)?${name}" |
     ...    grep -v grep |
     ...    awk '{printf(\"%s %s\\n\",$1,$5)}' |
     ...    grep -v bash | awk '{print $1}'