diff --git a/deploy/supervisor/cloudbeaver.conf b/deploy/supervisor/cloudbeaver.conf
index b0aa0e5f20..222c440a1e 100644
--- a/deploy/supervisor/cloudbeaver.conf
+++ b/deploy/supervisor/cloudbeaver.conf
@@ -1,6 +1,7 @@
 [program:cloudbeaver_demo]
 directory=/opt/cloudbeaver/deploy/cloudbeaver/
 command=/opt/cloudbeaver/deploy/cloudbeaver/run-server.sh
+stopasgroup=true
 autostart=true
 autorestart=true
 redirect_stderr=true
diff --git a/webapp/packages/basic-connection-plugin/src/BasicConnectionPluginBootstrap.ts b/webapp/packages/basic-connection-plugin/src/BasicConnectionPluginBootstrap.ts
index a43147339f..d705f48115 100644
--- a/webapp/packages/basic-connection-plugin/src/BasicConnectionPluginBootstrap.ts
+++ b/webapp/packages/basic-connection-plugin/src/BasicConnectionPluginBootstrap.ts
@@ -7,7 +7,7 @@
  */
 
 import { MainMenuService, ConnectionDialogsService } from '@dbeaver/core/app';
-import { injectable } from '@dbeaver/core/di';
+import { injectable, Bootstrap } from '@dbeaver/core/di';
 import { CommonDialogService } from '@dbeaver/core/dialogs';
 import { NotificationService } from '@dbeaver/core/eventsLog';
 import { PermissionsService, EPermission, SessionService } from '@dbeaver/core/root';
@@ -16,7 +16,7 @@ import { BasicConnectionService } from './BasicConnectionService';
 import { ConnectionDialog } from './ConnectionDialog/ConnectionDialog';
 
 @injectable()
-export class BasicConnectionPluginBootstrap {
+export class BasicConnectionPluginBootstrap extends Bootstrap {
 
   constructor(
     private connectionDialogsService: ConnectionDialogsService,
@@ -27,6 +27,7 @@ export class BasicConnectionPluginBootstrap {
     private permissionsService: PermissionsService,
     private sessionService: SessionService
   ) {
+    super();
   }
 
   bootstrap() {
diff --git a/webapp/packages/basic-connection-plugin/src/manifest.ts b/webapp/packages/basic-connection-plugin/src/manifest.ts
index 8a41c4f742..28e34227b7 100644
--- a/webapp/packages/basic-connection-plugin/src/manifest.ts
+++ b/webapp/packages/basic-connection-plugin/src/manifest.ts
@@ -8,7 +8,6 @@
 
 import { PluginManifest } from '@dbeaver/core/di';
 
-import { BasicConnectionPluginBootstrap } from './BasicConnectionPluginBootstrap';
 import { BasicConnectionService } from './BasicConnectionService';
 
 export const basicConnectionPluginManifest: PluginManifest = {
@@ -19,10 +18,4 @@ export const basicConnectionPluginManifest: PluginManifest = {
   providers: [
     BasicConnectionService,
   ],
-
-  initialize(services): void {
-    services
-      .resolveServiceByClass(BasicConnectionPluginBootstrap)
-      .bootstrap();
-  },
 };