diff --git a/README.md b/README.md
index 5092596c4..a82c056e1 100644
--- a/README.md
+++ b/README.md
@@ -6,3 +6,20 @@
 - [dockerfiles](./dockerfiles) contains Dockerfiles
 - [extensions](./extensions) contains Theia Extensions
 - [plugins](./plugins) contains Theia Plugins
+
+## How to build own che-theia image
+
+First you need to build `che-theia-dev` image:
+
+Run in `dockerfiles/theia-dev` dir:
+```bash
+    ./build.sh
+```
+
+Then in `dockerfiles/theia` run:
+
+```bash
+./build.sh --build-args:THEIA_VERSION=master --branch:master --git-ref:refs\\/heads\\/master
+```
+
+That script will clone Theia from master branch and all Che related extensions from theirs master branches.
diff --git a/build_and_push_docker_images.sh b/build_and_push_docker_images.sh
index c69189ceb..343ca44cb 100755
--- a/build_and_push_docker_images.sh
+++ b/build_and_push_docker_images.sh
@@ -21,7 +21,6 @@ dockerfiles/theia
 IMAGES_LIST=(
 eclipse/che-theia-dev
 eclipse/che-theia
-eclipse/che-theia-master
 )
 
 
@@ -29,8 +28,8 @@ eclipse/che-theia-master
 for image_dir in "${DOCKER_FILES_LOCATIONS[@]}"
     do
         if [ "$image_dir" == "dockerfiles/theia" ]; then
-            THEIA_IMAGE_TAG="$(awk '/ARG THEIA_VERSION=/{print $NF}' dockerfiles/theia/Dockerfile | cut -d '=' -f2)-nightly"
-            bash $(pwd)/$image_dir/build.sh --build-args:GITHUB_TOKEN=${GITHUB_TOKEN},THEIA_VERSION=master --branch:master --git-ref:refs\\/heads\\/master
+            THEIA_IMAGE_TAG="master"
+            bash $(pwd)/$image_dir/build.sh --build-args:GITHUB_TOKEN=${GITHUB_TOKEN},THEIA_VERSION=master --branch:master --git-ref:refs\\/heads\\/master 
         elif [ "$image_dir" == "dockerfiles/theia-dev" ]; then
             bash $(pwd)/$image_dir/build.sh --build-arg:GITHUB_TOKEN=${GITHUB_TOKEN}
         else
@@ -53,6 +52,9 @@ if [ "$TRAVIS_EVENT_TYPE" == "cron" ]; then
             if [ "$image" == "eclipse/che-theia" ]; then
                 docker tag ${image}:nightly ${image}:${THEIA_IMAGE_TAG}
                 echo y | docker push ${image}:${THEIA_IMAGE_TAG}
+            elif ["$image" == "eclipse/che-theia-dev"]; then 
+                docker tag ${image}:nightly ${image}:${THEIA_IMAGE_TAG}
+                echo y | docker push ${image}:${THEIA_IMAGE_TAG}
             else
                 echo y | docker push ${image}:nightly
             fi
diff --git a/extensions/extensions.yml b/extensions/extensions.yml
index 04761a918..ed47e9d8b 100644
--- a/extensions/extensions.yml
+++ b/extensions/extensions.yml
@@ -19,4 +19,4 @@ extensions:
     - extensions/eclipse-che-theia-plugin-ext
     - extensions/eclipse-che-theia-terminal
     - extensions/eclipse-che-theia-remote
-  checkoutTo: 0.0.4
+  checkoutTo: 0.3.19