diff --git a/sbin/tag_and_push_docker_image.sh b/sbin/tag_and_push_docker_image.sh
index a6c250c0374c80bf1e422a0071f19e2f30c4269f..631413235d4ba9b2f39b9b0e216d31cd21913bdf 100755
--- a/sbin/tag_and_push_docker_image.sh
+++ b/sbin/tag_and_push_docker_image.sh
@@ -1,19 +1,19 @@
 #!/bin/bash -e
 
 function usage {
-    echo "./$(basename $0)
+    echo "./$(basename "$0")
       no arguments, downloads remote images and pushes these to ASTRON registry.
       The versions downloaded are controlled by the docker-compose/.env file"
     echo ""
-    echo "./$(basename $0) -h
+    echo "./$(basename "$0") -h
       displays this help message"
     echo ""
-    echo "./$(basename $0) <docker service name> <tag>
+    echo "./$(basename "$0") <docker service name> <tag>
       downloads latest version of image from the ASTRON registry, builds the
       specified service and pushes the image with the specified tag to the
       ASTRON registry"
     echo ""
-    echo "./$(basename $0) pull <tag>
+    echo "./$(basename "$0") pull <tag>
       downloads all images for the integration test with the specified tag
       falling back to 'latest' if unavailable. Should neither exist on the
       ASTRON registry the script will exit 1. The images are retagged to match