diff --git a/deploy/build.bat b/deploy/build.bat
index 4257987cbb..a2bda7f2e6 100644
--- a/deploy/build.bat
+++ b/deploy/build.bat
@@ -1,27 +1,29 @@
-echo "Clone and build Cloudbeaver"
+@echo off
+echo Clone and build Cloudbeaver
 
 IF EXIST cloudbeaver rmdir /S /Q cloudbeaver
+mkdir cloudbeaver
 mkdir cloudbeaver\server
 mkdir cloudbeaver\conf
 mkdir cloudbeaver\workspace
 mkdir cloudbeaver\web
 
-echo "Build dbeaver application"
+echo Pull dbeaver platform
 
 cd ../..
 IF NOT EXIST dbeaver git clone --depth 1 https://github.com/dbeaver/dbeaver.git
 cd dbeaver
 git pull
-cd ../cloudbeaver/deploy
+cd ..\cloudbeaver\deploy
 
-echo "Build cloudbeaver server"
+echo Build cloudbeaver server
 
 cd ..\server\product\aggregate
 call mvn clean package -Dheadless-platform
 
 cd ..\..\..\deploy
 
-echo "Copy server packages"
+echo Copy server packages
 
 xcopy /E /Q ..\server\product\web-server\target\products\io.cloudbeaver.product\all\all\all\* cloudbeaver\server >NUL
 copy scripts\* cloudbeaver >NUL
@@ -29,20 +31,20 @@ mkdir cloudbeaver\workspace\GlobalConfiguration
 xcopy /E /Q ..\samples\sample-databases\GlobalConfiguration cloudbeaver\workspace\GlobalConfiguration >NUL
 copy ..\samples\sample-databases\*.conf cloudbeaver\conf >NUL
 
-echo "Build static content"
+echo Build static content
 
 cd ..\webapp
 
-call npm i lerna -g
+rem call npm i lerna -g
 call lerna bootstrap
 call lerna run build --scope @dbeaver/dbeaver -- --pluginsList=../../../../products/default/plugins-list.js
 
 cd ..\deploy
 
-echo "Copy static content"
+echo Copy static content
 
 xcopy /E /Q ..\webapp\packages\dbeaver\dist cloudbeaver\web >NUL
 
-echo "Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server."
+echo Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server.
 
 pause
diff --git a/server/features/io.cloudbeaver.server.feature/build.properties b/server/features/io.cloudbeaver.server.feature/build.properties
index b3a611b5c9..a70024674b 100644
--- a/server/features/io.cloudbeaver.server.feature/build.properties
+++ b/server/features/io.cloudbeaver.server.feature/build.properties
@@ -1,2 +1,3 @@
 bin.includes = feature.xml,\
                feature.properties
+root = target/generated
diff --git a/server/features/io.cloudbeaver.server.feature/pom.xml b/server/features/io.cloudbeaver.server.feature/pom.xml
index bf6f12d761..61657ab6a6 100644
--- a/server/features/io.cloudbeaver.server.feature/pom.xml
+++ b/server/features/io.cloudbeaver.server.feature/pom.xml
@@ -11,4 +11,39 @@
   <artifactId>io.cloudbeaver.server.feature</artifactId>
   <version>1.0.2-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+
+  <build>
+    <plugins>
+      <!-- Generate and copy .eclipseproduct -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <id>process-product-info</id>
+            <phase>generate-resources</phase>
+            <configuration>
+              <outputDirectory>${project.build.directory}/generated</outputDirectory>
+              <overwrite>true</overwrite>
+              <resources>
+                <resource>
+                  <directory>root</directory>
+                  <includes>
+                    <include>.eclipseproduct</include>
+                    <include>readme.txt</include>
+                  </includes>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
+            </configuration>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/server/features/io.cloudbeaver.server.feature/root/.eclipseproduct b/server/features/io.cloudbeaver.server.feature/root/.eclipseproduct
new file mode 100644
index 0000000000..38d4933b7c
--- /dev/null
+++ b/server/features/io.cloudbeaver.server.feature/root/.eclipseproduct
@@ -0,0 +1,3 @@
+name=${dbeaver-product}
+id=io.cloudbeaver.product
+version=${dbeaver-version}
diff --git a/server/features/io.cloudbeaver.server.feature/root/readme.txt b/server/features/io.cloudbeaver.server.feature/root/readme.txt
new file mode 100644
index 0000000000..23d389db61
--- /dev/null
+++ b/server/features/io.cloudbeaver.server.feature/root/readme.txt
@@ -0,0 +1,44 @@
+${dbeaver-product}
+
+${dbeaver-version}
+
+README
+
+Thank you for downloading ${dbeaver-product}!
+
+Running server
+========================
+  1. View and modify server configuration before the first start.
+     Validate init-data.conf - you won't be able to change these parameters after the first server start.
+  2. Execute run-server.sh script in the root directory.
+
+Command line parameters
+========================
+
+  -web-config <conf-file>
+    Set path to the configuration file. It is in the local "conf" folder by default
+
+  -nl locale
+    Use specified locale instead of default one.
+    Example: -nl en (use English locale).
+
+  -vm <java vm path>
+    Use Java VM installed in <java vm path> folder instead of default
+    location.
+
+  -vmargs <jvm parameters>
+    Allows to pass any number of additional parameters to JVM.
+    Additional parameters may be used to customize environment or
+    3-rd party jdbc drivers.
+
+License
+==========================
+  Apache License 2 (http://www.apache.org/licenses/LICENSE-2.0)
+
+Web
+==========
+  Main web site: http://cloudbeaver.io
+  Source code: https://github.com/dbeaver/cloudbeaver
+  Issue tracker: https://github.com/dbeaver/cloudbeaver/issues
+
+  Please use out issue tracker for technical support, feature suggestions and any other questions
diff --git a/server/pom.xml b/server/pom.xml
index c6027f63bb..bb5462aa51 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -18,7 +18,7 @@
     </parent>
 
     <properties>
-        <dbeaver-product>CloudBeaver</dbeaver-product>
+        <dbeaver-product>CloudBeaver CE</dbeaver-product>
         <dbeaver-version>1.0.2</dbeaver-version>
     </properties>