diff --git a/deploy/kubernetes/helm/dashboard-test.md b/deploy/kubernetes/helm/dashboard-test.md
deleted file mode 100644
index f8333b6fe312..000000000000
--- a/deploy/kubernetes/helm/dashboard-test.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Multi-host Single User
-```sh
-export CHART_DIR=/home/sleshche/projects/che/deploy/kubernetes/helm/che
-helm upgrade --install che \
-  --force \
-  --namespace che \
-  --set global.cheDomain=192.168.99.100.nip.io \
-  --set global.ingressDomain=192.168.99.100.nip.io \
-  --set cheImage=sleshchenko/che-server:cut-dashboard \
-  --set che.disableProbes=false \
-  --set global.serverStrategy=single-host \
-  --set global.tls.useSelfSignedCerts=true \
-  -f ${CHART_DIR}/values/tls.yaml \
-  -f ${CHART_DIR}/values/multi-user.yaml \
-  ${CHART_DIR}
-```
-
-```sh
-export CHART_DIR=/home/sleshche/projects/che/deploy/kubernetes/helm/che
-helm upgrade --install che \
-  --force \
-  --namespace che \
-  --set global.cheDomain=192.168.99.100.nip.io \
-  --set global.ingressDomain=192.168.99.100.nip.io \
-  --set cheImage=sleshchenko/che-server:cut-dashboard \
-  --set che.disableProbes=false \
-  --set global.tls.useSelfSignedCerts=true \
-  --set global.serverStrategy=single-host \
-  --set cheSinglehostGateway.deploy=true \
-  --set global.singleHostExposure=gateway \
-  --set global.multiuser=true \
-  -f ${CHART_DIR}/values/tls.yaml \
-  ${CHART_DIR}
-```
\ No newline at end of file
diff --git a/dockerfiles/che/Dockerfile b/dockerfiles/che/Dockerfile
index 8e475961becb..d5c275f13b2c 100644
--- a/dockerfiles/che/Dockerfile
+++ b/dockerfiles/che/Dockerfile
@@ -8,16 +8,14 @@
 
 # Variables in `COPY --from=` is not supported see https://github.com/moby/moby/issues/34482
 # this is workaround to handle that.
-# TODO it's here just for testing. Uncomment before merging
-#ARG CHE_DASHBOARD_ORGANIZATION=quay.io/eclipse
+ARG CHE_DASHBOARD_ORGANIZATION=quay.io/eclipse
 ARG CHE_DASHBOARD_NEXT_ORGANIZATION=quay.io/che-incubator
-# TODO it's here just for testing. Uncomment before merging
-#ARG CHE_DASHBOARD_VERSION=next
+ARG CHE_DASHBOARD_VERSION=next
 ARG CHE_DASHBOARD_NEXT_VERSION=next
 ARG CHE_WORKSPACE_LOADER_ORGANIZATION=quay.io/eclipse
 ARG CHE_WORKSPACE_LOADER_VERSION=next
 
-# FROM ${CHE_DASHBOARD_ORGANIZATION}/che-dashboard:${CHE_DASHBOARD_VERSION} as che_dashboard_base
+FROM ${CHE_DASHBOARD_ORGANIZATION}/che-dashboard:${CHE_DASHBOARD_VERSION} as che_dashboard_base
 FROM ${CHE_DASHBOARD_NEXT_ORGANIZATION}/che-dashboard-next:${CHE_DASHBOARD_NEXT_VERSION} as che_dashboard_next
 FROM ${CHE_WORKSPACE_LOADER_ORGANIZATION}/che-workspace-loader:${CHE_WORKSPACE_LOADER_VERSION} as che_workspace_loader_base
 
@@ -29,8 +27,7 @@ COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 RUN mkdir /logs /data && \
     chmod 0777 /logs /data
-# TODO it's here just for testing. Uncomment before merging
-#COPY --from=che_dashboard_base /usr/local/apache2/htdocs/dashboard /home/user/eclipse-che/tomcat/webapps/dashboard
+COPY --from=che_dashboard_base /usr/local/apache2/htdocs/dashboard /home/user/eclipse-che/tomcat/webapps/dashboard
 COPY --from=che_dashboard_next /usr/local/apache2/htdocs/dashboard /home/user/eclipse-che/tomcat/webapps/dashboard/next
 COPY --from=che_workspace_loader_base /usr/local/apache2/htdocs/workspace-loader/ /home/user/eclipse-che/tomcat/webapps/workspace-loader
 ADD eclipse-che /home/user/eclipse-che