diff --git a/plugin_source/deployment_scripts/controller_post_deployment.sh b/plugin_source/deployment_scripts/controller_post_deployment.sh
index 257ad34..926ade8 100755
--- a/plugin_source/deployment_scripts/controller_post_deployment.sh
+++ b/plugin_source/deployment_scripts/controller_post_deployment.sh
@@ -14,7 +14,7 @@ function replace_test_image {
 	local image_file
 	image_file="$3"
 
-	image_id=$(glance image-list | grep "$image_name" | awk -F "|" '{print $2}' | grep -v '^$')
+	image_id=$(glance image-list | awk -F "|" '/'$image_name'/ {print $2}')
 
 	if [[ -n "$image_id" ]]; then
 		echo "Delete image $image_name" >> $LOG_FILE