diff --git a/.travis.yml b/.travis.yml
index eec89970c..cd4d45f09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,19 @@
 language: minimal
 
+env:
+    global:
+        # Sanitize git branch name into a valid docker tag name
+        - IMAGE_TAG_NAME=$(echo -n $TRAVIS_BRANCH | tr -c "[a-zA-Z0-9._'" "_")
+
 services:
     - docker
 
 script:
-    - make image
+    - make image -e
+
+deploy:
+    on:
+        branch: master
+        condition: -n "$IMAGE_REPO_USER"
+    provider: script
+    script: echo "$IMAGE_REPO_PASSWORD" | docker login -u "$IMAGE_REPO_USER" --password-stdin quay.io && make push -e