diff --git a/.gitignore b/.gitignore
index 8906c71da1..93b1d9e73b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,9 @@ server/test/io.cloudbeaver.test.platform/workspace/.data/
 .classpath
 .settings/
 
+## Eclipse PDE
+*.product.launch
+
 workspace-dev-ce/
 deploy/cloudbeaver
 server/**/target
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.java
index 516ef29e2a..e9d3887df0 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.java
@@ -19,12 +19,32 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.registry.fs.FileSystemProviderRegistry;
+import org.jkiss.utils.IOUtils;
+
+import java.net.URI;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Path;
 
 /**
  * Abstract class that contains methods for loading configuration with gson.
  */
 public abstract class BaseServerConfigurationController<T extends WebServerConfiguration>
     implements WebServerConfigurationController<T> {
+    private static final Log log = Log.getLog(BaseServerConfigurationController.class);
+    @NotNull
+    private final Path homeDirectory;
+
+    protected Path workspacePath;
+
+    protected BaseServerConfigurationController(@NotNull Path homeDirectory) {
+        this.homeDirectory = homeDirectory;
+        //default workspaceLocation
+        this.workspacePath = homeDirectory.resolve("workspace");
+    }
 
     @NotNull
     public Gson getGson() {
@@ -34,4 +54,50 @@ public Gson getGson() {
     protected abstract GsonBuilder getGsonBuilder();
 
     public abstract T getServerConfiguration();
+
+
+    @NotNull
+    protected synchronized void initWorkspacePath() throws DBException {
+        if (workspacePath != null && !IOUtils.isFileFromDefaultFS(workspacePath)) {
+            log.warn("Workspace directory already initialized: " + workspacePath);
+        }
+        String workspaceLocation = getWorkspaceLocation();
+        URI workspaceUri = URI.create(workspaceLocation);
+        if (workspaceUri.getScheme() == null) {
+            // default filesystem
+            this.workspacePath = getHomeDirectory().resolve(workspaceLocation);
+        } else {
+            var externalFsProvider =
+                FileSystemProviderRegistry.getInstance().getFileSystemProviderBySchema(workspaceUri.getScheme());
+            if (externalFsProvider == null) {
+                throw new DBException("File system not found for scheme: " + workspaceUri.getScheme());
+            }
+            ClassLoader fsClassloader = externalFsProvider.getInstance().getClass().getClassLoader();
+            try (FileSystem externalFileSystem = FileSystems.newFileSystem(workspaceUri,
+                System.getenv(),
+                fsClassloader);) {
+                this.workspacePath = externalFileSystem.provider().getPath(workspaceUri);
+            } catch (Exception e) {
+                throw new DBException("Failed to initialize workspace path: " + workspaceUri, e);
+            }
+        }
+        log.info("Workspace path initialized: " + workspacePath);
+    }
+
+    @NotNull
+    protected abstract String getWorkspaceLocation();
+
+    @NotNull
+    protected Path getHomeDirectory() {
+        return homeDirectory;
+    }
+
+    @NotNull
+    @Override
+    public Path getWorkspacePath() {
+        if (workspacePath == null) {
+            throw new RuntimeException("Workspace path not initialized");
+        }
+        return workspacePath;
+    }
 }
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebApplication.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebApplication.java
index 9483767290..810c387d47 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebApplication.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebApplication.java
@@ -233,6 +233,12 @@ public String getWorkspaceIdProperty() throws DBException {
         return BaseWorkspaceImpl.readWorkspaceIdProperty();
     }
 
+    @Override
+    public Path getWorkspaceDirectory() {
+        return getServerConfigurationController().getWorkspacePath();
+    }
+
+
     public String getApplicationId() {
         try {
             return getApplicationInstanceId();
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebServerConfigurationController.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebServerConfigurationController.java
index c06f137b70..f6823f6dfb 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebServerConfigurationController.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebServerConfigurationController.java
@@ -39,6 +39,11 @@ default Map<String, Object> getOriginalConfigurationProperties() {
         return Map.of();
     }
 
+    @NotNull
+    Path getWorkspacePath();
+
     @NotNull
     Gson getGson();
+
+    void validateFinalServerConfiguration() throws DBException;
 }
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
index 21657250bc..20f3a07378 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
@@ -625,7 +625,7 @@ public String moveResource(
                     throw new DBException("Resource '" + oldTargetPath + "' doesn't exists");
                 }
                 Path newTargetPath = getTargetPath(projectId, normalizedNewResourcePath);
-                validateResourcePath(newTargetPath.toString());
+                validateResourcePath(rootPath.relativize(newTargetPath).toString());
                 if (Files.exists(newTargetPath)) {
                     throw new DBException("Resource with name %s already exists".formatted(newTargetPath.getFileName()));
                 }
@@ -881,7 +881,7 @@ private Path getTargetPath(@NotNull String projectId, @NotNull String resourcePa
             if (!targetPath.startsWith(projectPath)) {
                 throw new DBException("Invalid resource path");
             }
-            return WebAppUtils.getWebApplication().getHomeDirectory().relativize(targetPath);
+            return targetPath;
         } catch (InvalidPathException e) {
             throw new DBException("Resource path contains invalid characters");
         }
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/lock/RMFileLockController.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/lock/RMFileLockController.java
index bf966ea748..b87526cd92 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/lock/RMFileLockController.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/lock/RMFileLockController.java
@@ -23,6 +23,7 @@
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
+import org.jkiss.utils.IOUtils;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -73,18 +74,23 @@ public RMFileLockController(WebApplication application, int maxLockTime) throws
      * @return - lock
      */
     @NotNull
-    public RMLock lockProject(@NotNull String projectId,@NotNull  String operationName) throws DBException {
+    public RMLock lockProject(@NotNull String projectId, @NotNull String operationName) throws DBException {
         synchronized (RMFileLockController.class) {
             try {
-                createLockFolderIfNeeded();
-                createProjectFolder(projectId);
-                Path projectLockFile = getProjectLockFilePath(projectId);
-
                 RMLockInfo lockInfo = new RMLockInfo.Builder(projectId, UUID.randomUUID().toString())
                     .setApplicationId(applicationId)
                     .setOperationName(operationName)
                     .setOperationStartTime(System.currentTimeMillis())
                     .build();
+                Path projectLockFile = getProjectLockFilePath(projectId);
+
+                if (!IOUtils.isFileFromDefaultFS(lockFolderPath)) {
+                    // fake lock for external file system?
+                    return new RMLock(projectLockFile);
+                }
+                createLockFolderIfNeeded();
+                createProjectFolder(projectId);
+
                 createLockFile(projectLockFile, lockInfo);
                 return new RMLock(projectLockFile);
             } catch (Exception e) {
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/BaseGQLPlatform.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/BaseGQLPlatform.java
index ca5d26fd6a..a2ae8040a2 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/BaseGQLPlatform.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/BaseGQLPlatform.java
@@ -17,6 +17,7 @@
 package io.cloudbeaver.server;
 
 import io.cloudbeaver.DBWConstants;
+import io.cloudbeaver.model.app.WebApplication;
 import org.eclipse.core.runtime.Plugin;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.Log;
@@ -33,6 +34,8 @@
 import org.jkiss.dbeaver.runtime.qm.QMLogFileWriter;
 import org.jkiss.dbeaver.runtime.qm.QMRegistryImpl;
 import org.jkiss.dbeaver.utils.ContentUtils;
+import org.jkiss.utils.CommonUtils;
+import org.jkiss.utils.StandardConstants;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -40,7 +43,7 @@
 
 public abstract class BaseGQLPlatform extends BasePlatformImpl {
     private static final Log log = Log.getLog(BaseGQLPlatform.class);
-    public static final String WORK_DATA_FOLDER_NAME = ".work-data";
+    public static final String BASE_TEMP_DIR = "dbeaver";
 
     private Path tempFolder;
 
@@ -55,7 +58,7 @@ protected synchronized void initialize() {
         SecurityProviderUtils.registerSecurityProvider();
 
         // Register properties adapter
-        this.workspace = new WebGlobalWorkspace(this);
+        this.workspace = new WebGlobalWorkspace(this, (WebApplication) getApplication());
         this.workspace.initializeProjects();
         QMUtils.initApplication(this);
 
@@ -92,16 +95,12 @@ public DBPWorkspace getWorkspace() {
 
     @NotNull
     public Path getTempFolder(@NotNull DBRProgressMonitor monitor, @NotNull String name) {
+
         if (tempFolder == null) {
-            // Make temp folder
-            monitor.subTask("Create temp folder");
-            tempFolder = workspace.getAbsolutePath().resolve(DBWConstants.WORK_DATA_FOLDER_NAME);
-        }
-        if (!Files.exists(tempFolder)) {
-            try {
-                Files.createDirectories(tempFolder);
-            } catch (IOException e) {
-                log.error("Can't create temp directory " + tempFolder, e);
+            synchronized (this) {
+                if (tempFolder == null) {
+                    initTempFolder(monitor);
+                }
             }
         }
         Path folder = tempFolder.resolve(name);
@@ -115,6 +114,21 @@ public Path getTempFolder(@NotNull DBRProgressMonitor monitor, @NotNull String n
         return folder;
     }
 
+    private void initTempFolder(@NotNull DBRProgressMonitor monitor) {
+        // Make temp folder
+        monitor.subTask("Create temp folder");
+        String sysTempFolder = System.getProperty(StandardConstants.ENV_TMP_DIR);
+        if (CommonUtils.isNotEmpty(sysTempFolder)) {
+            tempFolder = Path.of(sysTempFolder).resolve(BASE_TEMP_DIR).resolve(DBWConstants.WORK_DATA_FOLDER_NAME);
+        } else {
+            //we do not use workspace because it can be in external file system
+            tempFolder = getApplication().getHomeDirectory().resolve(DBWConstants.WORK_DATA_FOLDER_NAME);
+        }
+    }
+
+    @NotNull
+    public abstract WebApplication getApplication();
+
     @Override
     public synchronized void dispose() {
         super.dispose();
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebGlobalWorkspace.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebGlobalWorkspace.java
index 997c0dcded..a06f682699 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebGlobalWorkspace.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebGlobalWorkspace.java
@@ -19,7 +19,6 @@
 import io.cloudbeaver.WebProjectImpl;
 import io.cloudbeaver.model.app.WebApplication;
 import io.cloudbeaver.utils.WebAppUtils;
-import org.eclipse.core.runtime.Platform;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.Log;
@@ -30,8 +29,6 @@
 import org.jkiss.utils.CommonUtils;
 
 import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -49,21 +46,14 @@ public class WebGlobalWorkspace extends BaseWorkspaceImpl {
     protected final Map<String, WebProjectImpl> projects = new LinkedHashMap<>();
     private WebGlobalProject globalProject;
 
-    public WebGlobalWorkspace(DBPPlatform platform) {
-        super(platform,
-            platform.getApplication().isMultiuser()
-                ? Path.of(getWorkspaceURI())
-                : ((WebApplication) platform.getApplication()).getWorkspaceDirectory());
-    }
+    private final WebApplication application;
 
-    @NotNull
-    private static URI getWorkspaceURI() {
-        String workspacePath = Platform.getInstanceLocation().getURL().toString();
-        try {
-            return new URI(workspacePath);
-        } catch (URISyntaxException e) {
-            throw new IllegalStateException("Workspace path is invalid: " + workspacePath, e);
-        }
+    public WebGlobalWorkspace(
+        @NotNull DBPPlatform platform,
+        @NotNull WebApplication application
+    ) {
+        super(platform, application.getWorkspaceDirectory());
+        this.application = application;
     }
 
     @Override
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java
index 94652dd478..d13eb03bcf 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java
@@ -23,7 +23,6 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
-import java.io.File;
 import java.io.PrintStream;
 
 /**
@@ -33,7 +32,6 @@ public class WebPlatformActivator extends Plugin {
 
     // The shared instance
     private static WebPlatformActivator instance;
-    private static File configDir;
     private PrintStream debugWriter;
     private DBPPreferenceStore preferences;
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
index 0bf84aae33..e25c60673e 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
@@ -59,13 +59,13 @@
 import org.jkiss.utils.StandardConstants;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -201,6 +201,7 @@ protected void startServer() {
             if (!loadServerConfiguration()) {
                 return;
             }
+
             if (CommonUtils.isEmpty(this.getAppConfiguration().getDefaultUserTeam())) {
                 throw new DBException("Default user team must be specified");
             }
@@ -208,6 +209,7 @@ protected void startServer() {
             log.error(e);
             return;
         }
+
         refreshDisabledDriversConfig();
 
         configurationMode = CommonUtils.isEmpty(getServerConfiguration().getServerName());
@@ -303,7 +305,7 @@ protected void startServer() {
 
         if (configurationMode) {
             // Try to configure automatically
-            performAutoConfiguration(getMainConfigurationFilePath().toFile().getParentFile());
+            performAutoConfiguration(getMainConfigurationFilePath().getParent());
         } else if (!isMultiNode()) {
             var appConfiguration = getServerConfigurationController().getAppConfiguration();
             if (appConfiguration.isGrantConnectionsAccessToAnonymousTeam()) {
@@ -331,7 +333,7 @@ protected void initializeAdditionalConfiguration() {
      *
      * @param configPath
      */
-    protected void performAutoConfiguration(File configPath) {
+    protected void performAutoConfiguration(Path configPath) {
         String autoServerName = System.getenv(CBConstants.VAR_AUTO_CB_SERVER_NAME);
         String autoServerURL = System.getenv(CBConstants.VAR_AUTO_CB_SERVER_URL);
         String autoAdminName = System.getenv(CBConstants.VAR_AUTO_CB_ADMIN_NAME);
@@ -340,11 +342,11 @@ protected void performAutoConfiguration(File configPath) {
         if (CommonUtils.isEmpty(autoServerName) || CommonUtils.isEmpty(autoAdminName) || CommonUtils.isEmpty(
             autoAdminPassword)) {
             // Try to load from auto config file
-            if (configPath.exists()) {
-                File autoConfigFile = new File(configPath, CBConstants.AUTO_CONFIG_FILE_NAME);
-                if (autoConfigFile.exists()) {
+            if (Files.exists(configPath)) {
+                Path autoConfigFile = configPath.resolve(CBConstants.AUTO_CONFIG_FILE_NAME);
+                if (Files.exists(autoConfigFile)) {
                     Properties autoProps = new Properties();
-                    try (InputStream is = new FileInputStream(autoConfigFile)) {
+                    try (InputStream is = Files.newInputStream(autoConfigFile)) {
                         autoProps.load(is);
 
                         autoServerName = autoProps.getProperty(CBConstants.VAR_AUTO_CB_SERVER_NAME);
@@ -352,7 +354,7 @@ protected void performAutoConfiguration(File configPath) {
                         autoAdminName = autoProps.getProperty(CBConstants.VAR_AUTO_CB_ADMIN_NAME);
                         autoAdminPassword = autoProps.getProperty(CBConstants.VAR_AUTO_CB_ADMIN_PASSWORD);
                     } catch (IOException e) {
-                        log.error("Error loading auto configuration file '" + autoConfigFile.getAbsolutePath() + "'",
+                        log.error("Error loading auto configuration file '" + autoConfigFile + "'",
                             e);
                     }
                 }
@@ -439,11 +441,6 @@ public Path getDataDirectory(boolean create) {
         return dataDir.toPath();
     }
 
-    @Override
-    public Path getWorkspaceDirectory() {
-        return Path.of(getServerConfiguration().getWorkspaceLocation());
-    }
-
     private void initializeSecurityController() throws DBException {
         securityController = createGlobalSecurityController();
     }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
index 7acde3722b..883e326314 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
@@ -42,6 +42,7 @@
 import org.jkiss.dbeaver.utils.PrefUtils;
 import org.jkiss.dbeaver.utils.SystemVariablesResolver;
 import org.jkiss.utils.CommonUtils;
+import org.jkiss.utils.IOUtils;
 
 import java.io.*;
 import java.net.InetAddress;
@@ -68,6 +69,7 @@ public abstract class CBServerConfigurationController<T extends CBServerConfig>
     private final Map<String, Object> originalConfigurationProperties = new LinkedHashMap<>();
 
     protected CBServerConfigurationController(@NotNull T serverConfiguration, @NotNull Path homeDirectory) {
+        super(homeDirectory);
         this.serverConfiguration = serverConfiguration;
         this.homeDirectory = homeDirectory;
     }
@@ -91,17 +93,25 @@ public void loadServerConfiguration(Path configPath) throws DBException {
             loadConfiguration(configPath);
         }
 
+        initWorkspacePath();
+
         // Try to load configuration from runtime app config file
         Path runtimeConfigPath = getRuntimeAppConfigPath();
         if (Files.exists(runtimeConfigPath)) {
             log.debug("Runtime configuration [" + runtimeConfigPath.toAbsolutePath() + "]");
             loadConfiguration(runtimeConfigPath);
         }
-
         // Set default preferences
         PrefUtils.setDefaultPreferenceValue(DBWorkbench.getPlatform().getPreferenceStore(),
             ModelPreferences.UI_DRIVERS_HOME,
             getServerConfiguration().getDriversLocation());
+        validateFinalServerConfiguration();
+    }
+
+    @NotNull
+    @Override
+    protected String getWorkspaceLocation() {
+        return getServerConfiguration().getWorkspaceLocation();
     }
 
     public void loadConfiguration(Path configPath) throws DBException {
@@ -146,7 +156,7 @@ protected void parseConfiguration(Map<String, Object> configProps) throws DBExce
         );
         // App config
         Map<String, Object> appConfig = JSONUtils.getObject(configProps, "app");
-        validateConfiguration(appConfig);
+        preValidateAppConfiguration(appConfig);
         gson.fromJson(gson.toJson(appConfig), CBAppConfig.class);
         readProductConfiguration(serverConfig, gson);
     }
@@ -169,7 +179,6 @@ public T parseServerConfiguration() {
         config.setContentRoot(WebAppUtils.getRelativePath(config.getContentRoot(), homeDirectory));
         config.setRootURI(readRootUri(config.getRootURI()));
         config.setDriversLocation(WebAppUtils.getRelativePath(config.getDriversLocation(), homeDirectory));
-        config.setWorkspaceLocation(WebAppUtils.getRelativePath(config.getWorkspaceLocation(), homeDirectory));
 
         String staticContentsFile = config.getStaticContent();
         if (!CommonUtils.isEmpty(staticContentsFile)) {
@@ -182,10 +191,11 @@ public T parseServerConfiguration() {
         return config;
     }
 
-    protected void validateConfiguration(Map<String, Object> appConfig) throws DBException {
+    protected void preValidateAppConfiguration(Map<String, Object> appConfig) throws DBException {
 
     }
 
+
     private void readExternalProperties(Map<String, Object> serverConfig) {
         String externalPropertiesFile = JSONUtils.getString(serverConfig, CBConstants.PARAM_EXTERNAL_PROPERTIES);
         if (!CommonUtils.isEmpty(externalPropertiesFile)) {
@@ -248,19 +258,21 @@ protected void readProductConfiguration(Map<String, Object> serverConfig, Gson g
             }
         }
 
-        // Add product config from runtime
-        File rtConfig = getRuntimeProductConfigFilePath().toFile();
-        if (rtConfig.exists()) {
-            log.debug("Load product runtime configuration from '" + rtConfig.getAbsolutePath() + "'");
-            try (Reader reader = new InputStreamReader(new FileInputStream(rtConfig), StandardCharsets.UTF_8)) {
-                var runtimeProductSettings = JSONUtils.parseMap(gson, reader);
-                var productSettings = serverConfiguration.getProductSettings();
-                runtimeProductSettings.putAll(productSettings);
-                Map<String, Object> flattenConfig = WebAppUtils.flattenMap(runtimeProductSettings);
-                productSettings.clear();
-                productSettings.putAll(flattenConfig);
-            } catch (Exception e) {
-                throw new DBException("Error reading product runtime configuration", e);
+        if (workspacePath != null && IOUtils.isFileFromDefaultFS(getWorkspacePath())) {
+            // Add product config from runtime
+            Path rtConfig = getRuntimeProductConfigFilePath();
+            if (Files.exists(rtConfig)) {
+                log.debug("Load product runtime configuration from '" + rtConfig + "'");
+                try (Reader reader = new InputStreamReader(Files.newInputStream(rtConfig), StandardCharsets.UTF_8)) {
+                    var runtimeProductSettings = JSONUtils.parseMap(gson, reader);
+                    var productSettings = serverConfiguration.getProductSettings();
+                    runtimeProductSettings.putAll(productSettings);
+                    Map<String, Object> flattenConfig = WebAppUtils.flattenMap(runtimeProductSettings);
+                    productSettings.clear();
+                    productSettings.putAll(flattenConfig);
+                } catch (Exception e) {
+                    throw new DBException("Error reading product runtime configuration", e);
+                }
             }
         }
     }
@@ -307,7 +319,7 @@ protected Map<String, Object> readConfiguration(Path configPath) throws DBExcept
     }
 
     public Map<String, Object> readConfigurationFile(Path path) throws DBException {
-        try (Reader reader = new InputStreamReader(new FileInputStream(path.toFile()), StandardCharsets.UTF_8)) {
+        try (Reader reader = new InputStreamReader(Files.newInputStream(path), StandardCharsets.UTF_8)) {
             return JSONUtils.parseMap(getGson(), reader);
         } catch (Exception e) {
             throw new DBException("Error parsing server configuration", e);
@@ -358,8 +370,7 @@ private synchronized void writeRuntimeConfig(Path runtimeConfigPath, Map<String,
             ContentUtils.makeFileBackup(runtimeConfigPath);
         }
 
-        try (Writer out = new OutputStreamWriter(new FileOutputStream(runtimeConfigPath.toFile()),
-            StandardCharsets.UTF_8)) {
+        try (Writer out = new OutputStreamWriter(Files.newOutputStream(runtimeConfigPath), StandardCharsets.UTF_8)) {
             Gson gson = new GsonBuilder()
                 .setLenient()
                 .setPrettyPrinting()
@@ -589,13 +600,15 @@ protected Path getRuntimeProductConfigFilePath() {
 
     @NotNull
     public Path getDataDirectory(boolean create) {
-        File dataDir = new File(serverConfiguration.getWorkspaceLocation(), CBConstants.RUNTIME_DATA_DIR_NAME);
-        if (create && !dataDir.exists()) {
-            if (!dataDir.mkdirs()) {
-                log.error("Can't create data directory '" + dataDir.getAbsolutePath() + "'");
+        Path dataDir = getWorkspacePath().resolve(CBConstants.RUNTIME_DATA_DIR_NAME);
+        if (create && !Files.exists(dataDir)) {
+            try {
+                Files.createDirectories(dataDir);
+            } catch (Exception e) {
+                log.error("Can't create data directory '" + dataDir.toAbsolutePath() + "'");
             }
         }
-        return dataDir.toPath();
+        return dataDir;
     }
 
     public void saveProductConfiguration(Map<String, Object> productConfiguration) throws DBException {
@@ -633,4 +646,9 @@ private String readRootUri(String uri) {
     public Map<String, Object> getOriginalConfigurationProperties() {
         return originalConfigurationProperties;
     }
+
+    @Override
+    public void validateFinalServerConfiguration() throws DBException {
+
+    }
 }
\ No newline at end of file
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationControllerEmbedded.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationControllerEmbedded.java
index 7031b941a6..d51c1f7cbd 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationControllerEmbedded.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationControllerEmbedded.java
@@ -100,6 +100,4 @@ protected GsonBuilder getGsonBuilder() {
         return gsonBuilder
             .registerTypeAdapter(WebDatabaseConfig.class, dbConfigCreator);
     }
-
-
 }