diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 96fcdd0661..3fef97a54a 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -55,10 +55,10 @@
       "label": "Build CE",
       "type": "shell",
       "windows": {
-        "command": "./build-sqlite.bat"
+        "command": "./build.bat"
       },
       "osx": {
-        "command": "./build-sqlite.sh"
+        "command": "./build.sh"
       },
       "options": {
         "cwd": "${workspaceFolder}/deploy"
diff --git a/webapp/packages/core-blocks/src/Button.tsx b/webapp/packages/core-blocks/src/Button.tsx
index 91be6997bf..5ba253b03b 100644
--- a/webapp/packages/core-blocks/src/Button.tsx
+++ b/webapp/packages/core-blocks/src/Button.tsx
@@ -72,12 +72,6 @@ export const Button = observer<ButtonProps>(function Button({
     ['click'],
   );
 
-  function handleEnter(event: React.KeyboardEvent<HTMLElement>) {
-    if (event.key === 'Enter') {
-      event.currentTarget.click();
-    }
-  }
-
   loading = state.loading || loading;
 
   if (loading) {
@@ -89,7 +83,6 @@ export const Button = observer<ButtonProps>(function Button({
     <Button
       role="button"
       tabIndex={0}
-      onKeyDown={handleEnter}
       {...rest}
       type={type}
       disabled={disabled}
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx
index c0aa4c56c0..2d6818524d 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx
@@ -7,7 +7,7 @@
  */
 import { observer } from 'mobx-react-lite';
 
-import { type AdministrationItemContentComponent } from '@cloudbeaver/core-administration';
+import { type AdministrationItemContentComponent, ConfigurationWizardService } from '@cloudbeaver/core-administration';
 import {
   ColoredContainer,
   ConfirmationDialog,
@@ -51,6 +51,7 @@ export const ServerConfigurationPage: AdministrationItemContentComponent = obser
   const commonDialogService = useService(CommonDialogService);
   const notificationService = useService(NotificationService);
   const serverConfigurationFormStateManager = useService(ServerConfigurationFormStateManager);
+  const configurationWizardService = useService(ConfigurationWizardService);
 
   const formState = serverConfigurationFormStateManager.formState!;
   const part = getServerConfigurationFormPart(formState);
@@ -71,6 +72,11 @@ export const ServerConfigurationPage: AdministrationItemContentComponent = obser
   const changed = part.isChanged;
 
   async function save() {
+    if (configurationWizard) {
+      configurationWizardService.next();
+      return;
+    }
+
     if (changed) {
       const result = await commonDialogService.open(ConfirmationDialog, {
         title: 'administration_server_configuration_save_confirmation_title',