diff --git a/.travis.yml b/.travis.yml
index 8caec939..e78358f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,9 @@ env:
       BASE_IMAGE=arm64v8/alpine
       TARGET_IMAGE=${DOCKER_BUILD}:${ARCH}
 script:
+  - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
   - 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" ] && docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" || false'
+  - 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" ] && docker push ${DOCKER_BUILD} || false'
 after_script:
   - "curl -X POST https://hooks.microbadger.com/images/${DOCKER_BUILD}/${MICROBADGER_CODE}"
\ No newline at end of file