diff --git a/deploy/scripts/run-server.bat b/deploy/scripts/run-server.bat
index 7a1f726d43..32367aa93c 100644
--- a/deploy/scripts/run-server.bat
+++ b/deploy/scripts/run-server.bat
@@ -1,5 +1,5 @@
 @echo off
-for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do SET launcherJar="%%a"
+for /f %%a in ('dir /B /S server\plugins\org.jkiss.dbeaver.launcher*.jar') do SET launcherJar="%%a"
 
 echo "Starting Cloudbeaver Server"
 
diff --git a/deploy/scripts/run-server.sh b/deploy/scripts/run-server.sh
index c0308fb005..17ddf088f7 100755
--- a/deploy/scripts/run-server.sh
+++ b/deploy/scripts/run-server.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-launcherJar=( server/plugins/org.eclipse.equinox.launcher*.jar )
+launcherJar=( server/plugins/org.jkiss.dbeaver.launcher*.jar )
 
 echo "Starting Cloudbeaver Server"
 
diff --git a/server/features/io.cloudbeaver.server.feature/feature.xml b/server/features/io.cloudbeaver.server.feature/feature.xml
index 87807228e5..032c9d5737 100644
--- a/server/features/io.cloudbeaver.server.feature/feature.xml
+++ b/server/features/io.cloudbeaver.server.feature/feature.xml
@@ -18,7 +18,6 @@
         <import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
         <import plugin="org.eclipse.core.runtime" version="3.7" match="greaterOrEqual"/>
         <!-- Equinox -->
-        <import plugin="org.eclipse.equinox.launcher" version="0.0.0" match="greaterOrEqual"/>
         <import plugin="org.eclipse.equinox.common" version="0.0.0" match="greaterOrEqual"/>
         <import plugin="org.eclipse.equinox.event" version="0.0.0" match="greaterOrEqual"/>
         <import plugin="org.eclipse.equinox.preferences" version="0.0.0" match="greaterOrEqual"/>
@@ -31,6 +30,7 @@
     <includes id="io.cloudbeaver.ws.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.db.feature" version="0.0.0"/>
 
+    <plugin id="org.jkiss.dbeaver.launcher" version="0.0.0"/>
     <plugin id="io.cloudbeaver.server" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="io.cloudbeaver.service.admin" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="io.cloudbeaver.service.auth" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
diff --git a/server/features/io.cloudbeaver.ws.feature/feature.xml b/server/features/io.cloudbeaver.ws.feature/feature.xml
index 9f8f30909e..76217dfcbf 100644
--- a/server/features/io.cloudbeaver.ws.feature/feature.xml
+++ b/server/features/io.cloudbeaver.ws.feature/feature.xml
@@ -18,7 +18,7 @@
         <import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
         <import plugin="org.eclipse.core.runtime" version="3.7" match="greaterOrEqual"/>
         <!-- Equinox -->
-        <import plugin="org.eclipse.equinox.launcher" version="0.0.0" match="greaterOrEqual"/>
+        <import plugin="org.jkiss.dbeaver.launcher" version="0.0.0" match="greaterOrEqual"/>
         <import plugin="org.eclipse.equinox.common" version="0.0.0" match="greaterOrEqual"/>
         <import plugin="org.eclipse.equinox.event" version="0.0.0" match="greaterOrEqual"/>
         <import plugin="org.eclipse.equinox.preferences" version="0.0.0" match="greaterOrEqual"/>
diff --git a/server/product/web-server/run.cmd b/server/product/web-server/run.cmd
deleted file mode 100644
index 289ed27939..0000000000
--- a/server/product/web-server/run.cmd
+++ /dev/null
@@ -1 +0,0 @@
-java -jar plugins/org.eclipse.equinox.launcher_1.5.600.v20191014-2022.jar -product io.cloudbeaver.server.product  -data C:/data/cloudbeaver/workspace