diff --git a/.travis.yml b/.travis.yml
index 0fb6f5b..f94ce3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,8 @@ sudo: required
 services:
   - docker
 env:
-  - DOCKER_TEMP_TAG=bindle
+  global:
+    - DOCKER_TEMP_TAG=bindle
 install:
   - source cfg4dev
   # installing ndg-httpsclient eliminates a TLS warning
@@ -23,15 +24,15 @@ script:
   - python setup.py bdist_wheel sdist --formats=gztar
   - travis_fold end "build.python.packages"
   - travis_fold start "build.docker.image"
-  - ./dockerfiles/build-docker-images.sh $DOCKERHUB_USERNAME $DOCKER_TEMP_TAG ./dist/clair-cicd-*.*.*.tar.gz
+  - ./dockerfiles/build-docker-images.sh ${DOCKERHUB_USERNAME} ${DOCKER_TEMP_TAG} ./dist/clair-cicd-*.*.*.tar.gz
   - travis_fold start "build.docker.image"
   # :TODO: add integration/sanity tests on the docker images we just built
 deploy:
   - provider: script
-    script: ./dockerfiles/tag-and-push-docker-images.sh $DOCKER_USERNAME $DOCKER_PASSWORD $DOCKER_TEMP_TAG latest
+    script: ./dockerfiles/tag-and-push-docker-images.sh ${DOCKER_USERNAME} ${DOCKER_PASSWORD} ${DOCKER_TEMP_TAG} latest
     on:
       branch: master
   - provider: script
-    script: ./dockerfiles/tag-and-push-docker-images.sh $DOCKER_USERNAME $DOCKER_PASSWORD $DOCKER_TEMP_TAG $TRAVIS_TAG
+    script: ./dockerfiles/tag-and-push-docker-images.sh ${DOCKER_USERNAME} ${DOCKER_PASSWORD} ${DOCKER_TEMP_TAG} ${TRAVIS_TAG}
     on:
       tags: true
diff --git a/dockerfiles/tag-and-push-docker-images.sh b/dockerfiles/tag-and-push-docker-images.sh
index f2cada5..532e935 100755
--- a/dockerfiles/tag-and-push-docker-images.sh
+++ b/dockerfiles/tag-and-push-docker-images.sh
@@ -4,6 +4,9 @@ set -e
 
 SCRIPT_DIR_NAME="$( cd "$( dirname "$0" )" && pwd )"
 
+echo "$#"
+echo "$@"
+
 if [ $# != 4 ]; then
     echo "usage: $(basename "$0") <username> <password> <current tag> <new tag>" >&2
     exit 1
@@ -15,15 +18,15 @@ CURRENT_TAG=${3:-}
 NEW_TAG=${4:-}
 
 "$SCRIPT_DIR_NAME/cicd-tools/tag-and-push-docker-image.sh" \
-    "$USERNAME" \
-    "$PASSWORD" \
-    "$CURRENT_TAG" \
-    "$NEW_TAG"
+    "${USERNAME}" \
+    "${PASSWORD}" \
+    "${CURRENT_TAG}" \
+    "${NEW_TAG}"
 
 "$SCRIPT_DIR_NAME/database/tag-and-push-docker-image.sh" \
-    "$USERNAME" \
-    "$PASSWORD" \
-    "$CURRENT_TAG" \
-    "$NEW_TAG"
+    "${USERNAME}" \
+    "${PASSWORD}" \
+    "${CURRENT_TAG}" \
+    "${NEW_TAG}"
 
 exit 0