diff --git a/.travis.yml b/.travis.yml
index b8ce3f09bb..ff55abe02d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,14 +65,16 @@ jobs:
         - bash docker_push.sh latest
         - bash docker_push.sh $TRAVIS_BUILD_ID
       on:
-        branch: master AND tags = false
+        branch: master
+        condition: tags = false
     deploy:
       provider: script
       script:
         - bash docker_push.sh latest
         - bash docker_push.sh $TRAVIS_TAG
       on:
-        branch: master AND tags = true
+        branch: master
+        condition: tags = true
 
   - stage: Trigger rebuild of infrastructure image
     sudo: false