diff --git a/ci/build_alpine_container/Makefile b/ci/build_alpine_container/Makefile
index 828d1d334c477..62b10edea02e0 100644
--- a/ci/build_alpine_container/Makefile
+++ b/ci/build_alpine_container/Makefile
@@ -13,11 +13,11 @@ binary:
 	mkdir -p ./bin/debug
 	mkdir -p ./bin/configs
 	docker run -t -i --name build-envoy-alpine-ct -v ${ROOT_DIR}/../../:/source -v $(ENVOY_BUILD_DIR):/build lyft/envoy-build:latest /bin/bash -c \
-		"set -x && cd /source &&
+		"set -x && cd /source && \
 		cp /build/envoy/source/exe/envoy /tmp/envoy && \
 		cd /tmp/ && strip envoy && \
 		mv /tmp/envoy /source/ci/build_alpine_container/bin/stripped/ && \
-		cp /source/build_normal/source/exe/envoy /source/ci/build_alpine_container/bin/debug/ && \
+		cp /build/envoy/source/exe/envoy /source/ci/build_alpine_container/bin/debug/ && \
 		cp /source/configs/google_com_proxy.json /source/ci/build_alpine_container/bin/configs/"
 	docker rm -f build-envoy-alpine-ct
 	# Fail build if a core file gets generated during the build.
diff --git a/ci/docker_push.sh b/ci/docker_push.sh
index 7aad176cc292f..338390bd7261d 100755
--- a/ci/docker_push.sh
+++ b/ci/docker_push.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 
+# Do not ever set -x here, it is a security hazard as it will place the credentials below in the
+# Travis logs.
 set -e
-set -x
 
 # this is needed to verify the example images
 docker build -f ci/Dockerfile-envoy-image -t lyft/envoy:latest .
+# verify the Alpine build even when we're not pushing it
+make -C ci/build_alpine_container
 
 # push the envoy image on merge to master
 want_push='false'
@@ -17,11 +20,10 @@ do
 done
 if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$want_push" == "true" ]
 then
-    docker login -e $DOCKER_EMAIL -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+    docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
     docker push lyft/envoy:latest
     docker tag lyft/envoy:latest lyft/envoy:$TRAVIS_COMMIT
     docker push lyft/envoy:$TRAVIS_COMMIT
-    make -C ci/build_alpine_container
     docker tag lyft/envoy-alpine:latest lyft/envoy-alpine:$TRAVIS_COMMIT
     docker push lyft/envoy-alpine:$TRAVIS_COMMIT
     docker push lyft/envoy-alpine:latest