diff --git a/deploy/build.bat b/deploy/build.bat
index 178c613b0c..8c63c4de4d 100644
--- a/deploy/build.bat
+++ b/deploy/build.bat
@@ -26,8 +26,10 @@ 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
-mkdir cloudbeaver\workspace\GlobalConfiguration
-xcopy /E /Q ..\samples\sample-databases\GlobalConfiguration cloudbeaver\workspace\GlobalConfiguration >NUL
+mkdir cloudbeaver\samples
+mkdir cloudbeaver\samples\db
+xcopy /E /Q ..\samples\sample-databases\db cloudbeaver\samples\db >NUL
+copy ..\samples\sample-databases\GlobalConfiguration\.dbeaver\data-sources.json cloudbeaver\conf\initial-data-sources.conf >NUL
 copy ..\samples\sample-databases\*.conf cloudbeaver\conf >NUL
 move drivers cloudbeaver >NUL
 
diff --git a/deploy/build.sh b/deploy/build.sh
index 794fef0ce8..35ae804ae1 100755
--- a/deploy/build.sh
+++ b/deploy/build.sh
@@ -27,7 +27,10 @@ echo "Copy server packages"
 
 cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/all/all/* ./cloudbeaver/server
 cp -p ./scripts/* ./cloudbeaver
-cp -rp ../samples/sample-databases/GlobalConfiguration cloudbeaver/workspace
+mkdir cloudbeaver/samples
+mkdir cloudbeaver/samples/db
+cp -rp ../samples/sample-databases/db cloudbeaver/samples/db
+cp -rp ../samples/sample-databases/GlobalConfiguration/.dbeaver/data-sources.json cloudbeaver/conf/initial-data-sources.conf
 cp -p ../samples/sample-databases/*.conf cloudbeaver/conf/
 mv drivers cloudbeaver
 
diff --git a/deploy/scripts/run-server.bat b/deploy/scripts/run-server.bat
index 7dad71ac6e..82e3e40600 100644
--- a/deploy/scripts/run-server.bat
+++ b/deploy/scripts/run-server.bat
@@ -3,4 +3,9 @@ for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do
 
 echo "Starting Cloudbeaver Server"
 
+IF NOT EXIST workspace\.metadata (
+    mkdir workspace\GlobalConfiguration\.dbeaver\
+    copy conf\initial-data-sources.conf workspace\GlobalConfiguration\.dbeaver\data-sources.json
+)
+
 java -jar %launcherJar% -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs -Xmx2048M
diff --git a/deploy/scripts/run-server.sh b/deploy/scripts/run-server.sh
index 0b881cde58..4251345a6e 100755
--- a/deploy/scripts/run-server.sh
+++ b/deploy/scripts/run-server.sh
@@ -3,4 +3,6 @@ launcherJar=( server/plugins/org.eclipse.equinox.launcher*.jar )
 
 echo "Starting Cloudbeaver Server"
 
+[ ! -d "workspace/.metadata" ] && mkdir workspace/GlobalConfiguration/.dbeaver && cp conf/initial-data-sources.conf workspace/GlobalConfiguration/.dbeaver/data-sources.json
+
 java -jar ${launcherJar} -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs -Xmx2048M
diff --git a/samples/sample-databases/GlobalConfiguration/.dbeaver/data-sources.json b/samples/sample-databases/GlobalConfiguration/.dbeaver/data-sources.json
index 3a0d803cee..f26226c0c8 100644
--- a/samples/sample-databases/GlobalConfiguration/.dbeaver/data-sources.json
+++ b/samples/sample-databases/GlobalConfiguration/.dbeaver/data-sources.json
@@ -11,7 +11,7 @@
 			"read-only": false,
 			"template": false,
 			"configuration": {
-				"database": "${project.path}/db/Chinook.sqlitedb",
+				"database": "${application.path}/samples/db/Chinook.sqlitedb",
 				"type": "dev",
 				"auth-model": "native"
 			}
diff --git a/samples/sample-databases/GlobalConfiguration/db/Chinook.sqlitedb b/samples/sample-databases/db/Chinook.sqlitedb
similarity index 100%
rename from samples/sample-databases/GlobalConfiguration/db/Chinook.sqlitedb
rename to samples/sample-databases/db/Chinook.sqlitedb
diff --git a/samples/sample-databases/GlobalConfiguration/db/README b/samples/sample-databases/db/README
similarity index 100%
rename from samples/sample-databases/GlobalConfiguration/db/README
rename to samples/sample-databases/db/README