diff --git a/.travis.yml b/.travis.yml
index e95e1c18f..2659e16bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ jobs:
     before_script: skip
     script:
       - yarn
+      - export BUILD_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
       - travis_retry ./build_and_push_docker_images.sh;
       - ./che-plugins/build.sh
   - stage: deploy
diff --git a/build_and_push_docker_images.sh b/build_and_push_docker_images.sh
index 343ca44cb..9e2e45d9a 100755
--- a/build_and_push_docker_images.sh
+++ b/build_and_push_docker_images.sh
@@ -42,8 +42,8 @@ for image_dir in "${DOCKER_FILES_LOCATIONS[@]}"
         fi
     done
 
-#Push images only if build task scheduled by cron
-if [ "$TRAVIS_EVENT_TYPE" == "cron" ]; then
+
+if [ "$BUILD_BRANCH" == "master" ]; then
     #PUSH IMAGES
     #docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
     echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
diff --git a/che-plugins/che-editor-theia/etc/che-plugin.yaml b/che-plugins/che-editor-theia/etc/che-plugin.yaml
index bd4c35b16..8103a963b 100644
--- a/che-plugins/che-editor-theia/etc/che-plugin.yaml
+++ b/che-plugins/che-editor-theia/etc/che-plugin.yaml
@@ -24,7 +24,7 @@ endpoints:
       discoverable: false
 containers:
  - name: theia-ide
-   image: eclipse/che-theia:0.3.18-nightly
+   image: eclipse/che-theia:0.3.19-nightly
    env:
        - name: THEIA_PLUGINS
          value: local-dir:///plugins
diff --git a/dockerfiles/theia/build.sh b/dockerfiles/theia/build.sh
index b2d3f86df..4b2ad9a5c 100755
--- a/dockerfiles/theia/build.sh
+++ b/dockerfiles/theia/build.sh
@@ -47,7 +47,7 @@ if [ -n "${LABEL_CONTENT}" ]; then
   BUILD_ARGS+="--label che-plugin.cdn.artifacts=$(echo ${LABEL_CONTENT} | sed 's/ //g') "
   echo "Rebuilding with CDN label..."
   build
-  if [ "${TRAVIS_EVENT_TYPE:-}" == "cron" ]; then
+  if [ "${BUILD_BRANCH:-}" == "master" ]; then
     "${base_dir}"/push-cdn-files-to-akamai.sh
   fi
 fi