diff --git a/.travis.yml b/.travis.yml
index 4cea0045..a96ff5ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,11 @@ before_install:
   # see https://docs.travis-ci.com/user/environment-variables/#Defining-Variables-in-Repository-Settings
   - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
 script:
-  - docker build -t "zopanix/factorio:${TRAVIS_TAG}" .
+  - |
+    if [ -z "$TRAVIS_TAG" ]; then
+      TRAVIS_TAG="latest"
+    fi
+    docker build -t "zopanix/factorio:${TRAVIS_TAG}" .
 deploy:
   provider: script
   script: docker tag "zopanix/factorio:${TRAVIS_TAG}" "zopanix/factorio:latest" && docker push "zopanix/factorio:${TRAVIS_TAG}" && docker push "zopanix/factorio:latest"