diff --git a/scripts/scheduler/entrypoint.sh b/scripts/scheduler/entrypoint.sh
index cb44128..8f1c488 100644
--- a/scripts/scheduler/entrypoint.sh
+++ b/scripts/scheduler/entrypoint.sh
@@ -439,7 +439,7 @@ execute_task() {
 				CONTAINER_NAMES=$(cat $SERVICE | jq -r .containers[].NAME);
 				CONTAINERS="";
 				for CONTAINER_NAME in "$CONTAINER_NAMES"; do 
-					CONTAINERS="$CONTAINERS "$(docker ps --format '{{.Names}}' | grep -v framework-scheduler | grep $CONTAINER_NAME);
+					CONTAINERS="$CONTAINERS "$(docker ps --format '{{.Names}}' | grep -v framework-scheduler | grep "$CONTAINER_NAME");
 				done;
 				#RESULT=$(echo "$CONTAINERS" | base64 -w0);
 				SERVICES=$SERVICES$SEP'"'$SERVICE_NAME'": {"content": "'$CONTENT'", "running": "'$CONTAINERS'"}';