diff --git a/helm/scripts/run_remote_capif_tests.sh b/helm/scripts/run_remote_capif_tests.sh
index 086f2a8ba618543efda903d3e9b63b104c15092b..c1f296147272ad888fd9936b41c76deecd3a92bf 100755
--- a/helm/scripts/run_remote_capif_tests.sh
+++ b/helm/scripts/run_remote_capif_tests.sh
@@ -65,7 +65,7 @@ then
 fi
 
 docker pull $DOCKER_ROBOT_IMAGE:$DOCKER_ROBOT_IMAGE_VERSION || echo "Docker image ($DOCKER_ROBOT_IMAGE:$DOCKER_ROBOT_IMAGE_VERSION) not present on repository"
-docker images|grep -Eq '^'$DOCKER_ROBOT_IMAGE'[ ]+[ ]'$DOCKER_ROBOT_IMAGE_VERSION''
+docker images|grep -Eq '^'$DOCKER_ROBOT_IMAGE'([[:space:]]+|:)'$DOCKER_ROBOT_IMAGE_VERSION''
 if [[ $? -ne 0 ]]
 then
     read -p "Robot image is not present. To continue, Do you want to build it? (y/n)" build_robot_image
diff --git a/services/run_capif_tests.sh b/services/run_capif_tests.sh
index 65c9a45f92783a7be913edc452ac8534b2d6280f..819f299d80895d3ec2b7d66b088917811a0df826 100755
--- a/services/run_capif_tests.sh
+++ b/services/run_capif_tests.sh
@@ -33,7 +33,7 @@ then
 fi
 
 docker pull $DOCKER_ROBOT_IMAGE:$DOCKER_ROBOT_IMAGE_VERSION || echo "Docker image ($DOCKER_ROBOT_IMAGE:$DOCKER_ROBOT_IMAGE_VERSION) not present on repository"
-docker images|grep -Eq '^'$DOCKER_ROBOT_IMAGE'[ ]+[ ]'$DOCKER_ROBOT_IMAGE_VERSION''
+docker images|grep -Eq '^'$DOCKER_ROBOT_IMAGE'([[:space:]]+|:)'$DOCKER_ROBOT_IMAGE_VERSION''
 if [[ $? -ne 0 ]]
 then
     read -p "Robot image is not present. To continue, Do you want to build it? (y/n)" build_robot_image