diff --git a/dockerfiles/action/Dockerfile b/dockerfiles/action/Dockerfile
index 108ca1889b..fb41f7e329 100644
--- a/dockerfiles/action/Dockerfile
+++ b/dockerfiles/action/Dockerfile
@@ -10,6 +10,6 @@
 # use:
 #    docker run -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-action [command]
 
-FROM eclipse/che-lib:5.1.0
+FROM eclipse/che-lib:nightly
 
 ENTRYPOINT ["node", "/che-lib/index.js", "che-action"]
diff --git a/dockerfiles/cli/Dockerfile b/dockerfiles/cli/Dockerfile
index 6ebde779dc..6c84027ec7 100644
--- a/dockerfiles/cli/Dockerfile
+++ b/dockerfiles/cli/Dockerfile
@@ -9,7 +9,7 @@
 #
 # use:
 #    docker run -v $(pwd):/che eclipse/che-cli [command]
-FROM eclipse/che-base:5.1.0
+FROM eclipse/che-base:nightly
 
 COPY scripts /scripts/
 COPY version /version/
diff --git a/dockerfiles/cli/version/5.2.0/images b/dockerfiles/cli/version/5.2.0/images
new file mode 100644
index 0000000000..18a7ee359d
--- /dev/null
+++ b/dockerfiles/cli/version/5.2.0/images
@@ -0,0 +1,4 @@
+IMAGE_PUPPET=puppet/puppet-agent-alpine:4.6.2
+IMAGE_REGISTRY=registry:2.5.0
+IMAGE_INIT=eclipse/che-init:5.2.0
+IMAGE_CHE=eclipse/che-server:5.2.0
diff --git a/dockerfiles/cli/version/5.2.0/images-stacks b/dockerfiles/cli/version/5.2.0/images-stacks
new file mode 100644
index 0000000000..461e6e98fb
--- /dev/null
+++ b/dockerfiles/cli/version/5.2.0/images-stacks
@@ -0,0 +1,22 @@
+eclipse/alpine_jdk8
+eclipse/aspnet
+eclipse/centos_jdk8
+eclipse/cpp_gcc
+eclipse/debian_jdk8
+eclipse/debian_jdk8_node
+eclipse/debian_jre
+eclipse/dotnet_core
+eclipse/hadoop-dev
+eclipse/meteor
+eclipse/node
+eclipse/php
+eclipse/platformio
+eclipse/ruby_rails
+eclipse/selenium
+eclipse/ubuntu_android
+eclipse/ubuntu_go
+eclipse/ubuntu_gradle
+eclipse/ubuntu_jdk8
+eclipse/ubuntu_jre
+eclipse/ubuntu_python
+eclipse/ubuntu_wildfly8
diff --git a/dockerfiles/dir/Dockerfile b/dockerfiles/dir/Dockerfile
index 8b902879fa..26c1d378df 100644
--- a/dockerfiles/dir/Dockerfile
+++ b/dockerfiles/dir/Dockerfile
@@ -10,6 +10,6 @@
 # use:
 #    docker run -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-dir [command]
 
-FROM eclipse/che-lib:5.1.0
+FROM eclipse/che-lib:nightly
 
 ENTRYPOINT ["node", "/che-lib/index.js", "che-dir"]
diff --git a/dockerfiles/lib/dto-pom.xml b/dockerfiles/lib/dto-pom.xml
index b97692cd3e..d8170994a9 100644
--- a/dockerfiles/lib/dto-pom.xml
+++ b/dockerfiles/lib/dto-pom.xml
@@ -17,13 +17,13 @@
     <parent>
         <artifactId>maven-depmgt-pom</artifactId>
         <groupId>org.eclipse.che.depmgt</groupId>
-        <version>5.1.0</version>
+        <version>5.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>dto-typescript</artifactId>
     <packaging>pom</packaging>
     <name>Che TypeScript DTO</name>
     <properties>
-        <che.version>5.1.0</che.version>
+        <che.version>5.2.0-SNAPSHOT</che.version>
     </properties>
     <repositories>
         <repository>
diff --git a/dockerfiles/test/Dockerfile b/dockerfiles/test/Dockerfile
index 86c150a0a2..260b89138c 100644
--- a/dockerfiles/test/Dockerfile
+++ b/dockerfiles/test/Dockerfile
@@ -10,6 +10,6 @@
 # use:
 #    docker run -v /var/run/docker.sock:/var/run/docker.sock eclipse/che-test [command]
 
-FROM eclipse/che-lib:5.1.0
+FROM eclipse/che-lib:nightly
 
 ENTRYPOINT ["node", "/che-lib/index.js", "che-test"]