diff --git a/.travis.yml b/.travis.yml
index ee4866e..6c5b17b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -98,13 +98,13 @@ deploy:
     script: travis/deploy.sh
     on:
       tags: true
-      condition: $TRAVIS_OS_NAME != "linux" || $DESKTOP_ONLY != 1
+      condition: $TRAVIS_BUILD_STAGE_NAME != "Build_docker_images" && ($TRAVIS_OS_NAME != "linux" || $DESKTOP_ONLY != 1)
   - provider: script
     skip_cleanup: true
     script: travis/deploy.sh
     on:
       branch: master
-      condition: $TRAVIS_EVENT_TYPE = cron && ( $TRAVIS_OS_NAME != "linux" || $DESKTOP_ONLY != 1 )
+      condition: $TRAVIS_BUILD_STAGE_NAME != "Build_docker_images" && $TRAVIS_EVENT_TYPE = cron && ( $TRAVIS_OS_NAME != "linux" || $DESKTOP_ONLY != 1 )
 env:
   global:
     - NIGHTLY_DATE=$(date +%Y-%m-%d)