diff --git a/.travis.yml b/.travis.yml
index 72f8ea16..8caec939 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ branches:
 env:
   global:
     - DOCKER_BUILD=qmcgaw/private-internet-access
+    - MICROBADGER_CODE=tQFy7AxtSUNANPe6aoVChYdsI_I=
   matrix:
     - ARCH=armhf
       BASE_IMAGE=arm32v6/alpine
@@ -17,7 +18,7 @@ env:
 script:
   - docker run --rm --privileged multiarch/qemu-user-static:register --reset
   - docker build -t ${TARGET_IMAGE} --build-arg BASE_IMAGE=${BASE_IMAGE} --build-arg VCF=${TRAVIS_COMMIT} --build-arg BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") .
-  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin || false'
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" || false'
   - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && docker push ${DOCKER_BUILD} || false'
 after_script:
-  - "curl -X POST https://hooks.microbadger.com/images/qmcgaw/private-internet-access/tQFy7AxtSUNANPe6aoVChYdsI_I="
\ No newline at end of file
+  - "curl -X POST https://hooks.microbadger.com/images/${DOCKER_BUILD}/${MICROBADGER_CODE}"
\ No newline at end of file