diff --git a/dockerfiles/cli/version/5.18.1/images b/dockerfiles/cli/version/5.18.1/images
new file mode 100644
index 0000000000..a6822ff391
--- /dev/null
+++ b/dockerfiles/cli/version/5.18.1/images
@@ -0,0 +1,4 @@
+IMAGE_INIT=eclipse/che-init:5.18.1
+IMAGE_CHE=eclipse/che-server:5.18.1
+IMAGE_COMPOSE=docker/compose:1.8.1
+IMAGE_TRAEFIK=traefik:v1.3.0-rc3
diff --git a/dockerfiles/cli/version/5.18.1/images-stacks b/dockerfiles/cli/version/5.18.1/images-stacks
new file mode 100644
index 0000000000..4630f02af6
--- /dev/null
+++ b/dockerfiles/cli/version/5.18.1/images-stacks
@@ -0,0 +1,24 @@
+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
+registry.centos.org/che-stacks/vertx
+
diff --git a/dockerfiles/cli/version/5.20.1/images b/dockerfiles/cli/version/5.20.1/images
new file mode 100644
index 0000000000..b434b8e6e7
--- /dev/null
+++ b/dockerfiles/cli/version/5.20.1/images
@@ -0,0 +1,7 @@
+IMAGE_INIT=eclipse/che-init:5.20.1
+IMAGE_CHE=eclipse/che-server:5.20.1
+IMAGE_CHE_MULTIUSER=eclipse/che-server-multiuser:5.20.1
+IMAGE_COMPOSE=docker/compose:1.10.1
+IMAGE_TRAEFIK=traefik:v1.3.0-rc3
+IMAGE_POSTGRES=centos/postgresql-96-centos7:9.6
+IMAGE_KEYCLOACK=jboss/keycloak-openshift:3.3.0.CR2-3
diff --git a/dockerfiles/cli/version/5.20.1/images-stacks b/dockerfiles/cli/version/5.20.1/images-stacks
new file mode 100644
index 0000000000..73398d4dd9
--- /dev/null
+++ b/dockerfiles/cli/version/5.20.1/images-stacks
@@ -0,0 +1,23 @@
+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
+registry.centos.org/che-stacks/vertx