diff --git a/.automation/cleanup-docker.sh b/.automation/cleanup-docker.sh
index 04c1d662..594b8230 100644
--- a/.automation/cleanup-docker.sh
+++ b/.automation/cleanup-docker.sh
@@ -202,7 +202,7 @@ RemoveImage()
   TOKEN=$(curl -s -k \
     -H "Content-Type: application/json" \
     -X POST \
-    -d '{"username": "'$DOCKER_USERNAME'", "password": "'$DOCKER_PASSWORD'"}' \
+    -d "{\"username\": \"$DOCKER_USERNAME\", \"password\": \"$DOCKER_PASSWORD\"}" \
     "https://hub.docker.com/v2/users/login/" | jq -r .token 2>&1)
 
     #######################
@@ -245,7 +245,7 @@ RemoveImage()
     exit 1
   else
     # SUCCESS
-    echo "Successfully [removed] Docker image tag from DockerHub!"
+    echo "Successfully [removed] Docker image tag:[$IMAGE_VERSION] from DockerHub!"
   fi
 }
 ################################################################################
diff --git a/.automation/upload-docker.sh b/.automation/upload-docker.sh
index 6df046b0..36c8dd02 100755
--- a/.automation/upload-docker.sh
+++ b/.automation/upload-docker.sh
@@ -128,6 +128,7 @@ ValidateInput()
     # Set the IMAGE_VERSION to the BRANCH_NAME #
     ############################################
     IMAGE_VERSION="$BRANCH_NAME"
+    echo "Tag:[$IMAGE_VERSION]"
   else
     echo "Successfully found:[IMAGE_VERSION], value:[$IMAGE_VERSION]"
   fi