diff --git a/ansible/roles/container_kill_start/files/findTagRunning.sh b/ansible/roles/container_kill_start/files/findTagRunning.sh
index 0aa40e02..5f7f98a0 100755
--- a/ansible/roles/container_kill_start/files/findTagRunning.sh
+++ b/ansible/roles/container_kill_start/files/findTagRunning.sh
@@ -7,9 +7,9 @@ if [ "" = "${CONTAINERS}" ] ; then
     exit 0
 else
     for container in ${CONTAINERS} ; do
-        docker inspect ${container} | grep -q ${IMAGE_NAME}
+        docker inspect "${container}" | grep -q '"Image": "'"${IMAGE_NAME}":
         if [ ${?} -eq 0 ] ; then
-            if [ -z ${RUNNING_CONTAINERS} ] ; then
+            if [ -z "${RUNNING_CONTAINERS}" ] ; then
                 RUNNING_CONTAINERS="${container}"
             else
                 RUNNING_CONTAINERS="${RUNNING_CONTAINERS} ${container}"
@@ -18,6 +18,6 @@ else
     done
 fi
 
-if [ ! -z ${RUNNING_CONTAINERS} ] ; then
+if [ ! -z "${RUNNING_CONTAINERS}" ] ; then
     echo "${RUNNING_CONTAINERS}"
 fi
diff --git a/ansible/roles/container_start/files/findTagRunning.sh b/ansible/roles/container_start/files/findTagRunning.sh
index 0aa40e02..5f7f98a0 100755
--- a/ansible/roles/container_start/files/findTagRunning.sh
+++ b/ansible/roles/container_start/files/findTagRunning.sh
@@ -7,9 +7,9 @@ if [ "" = "${CONTAINERS}" ] ; then
     exit 0
 else
     for container in ${CONTAINERS} ; do
-        docker inspect ${container} | grep -q ${IMAGE_NAME}
+        docker inspect "${container}" | grep -q '"Image": "'"${IMAGE_NAME}":
         if [ ${?} -eq 0 ] ; then
-            if [ -z ${RUNNING_CONTAINERS} ] ; then
+            if [ -z "${RUNNING_CONTAINERS}" ] ; then
                 RUNNING_CONTAINERS="${container}"
             else
                 RUNNING_CONTAINERS="${RUNNING_CONTAINERS} ${container}"
@@ -18,6 +18,6 @@ else
     done
 fi
 
-if [ ! -z ${RUNNING_CONTAINERS} ] ; then
+if [ ! -z "${RUNNING_CONTAINERS}" ] ; then
     echo "${RUNNING_CONTAINERS}"
 fi