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/config/GlobalConfiguration/.dbeaver/data-sources.json b/config/GlobalConfiguration/.dbeaver/data-sources.json
index c954ec82d9..a5f18e204f 100644
--- a/config/GlobalConfiguration/.dbeaver/data-sources.json
+++ b/config/GlobalConfiguration/.dbeaver/data-sources.json
@@ -1,24 +1,4 @@
 {
-	"folders": {},
-	"connections": {
-		"postgresql-template-1": {
-			"provider": "postgresql",
-			"driver": "postgres-jdbc",
-			"name": "PostgreSQL (Template)",
-			"save-password": false,
-			"show-system-objects": false,
-			"read-only": true,
-			"template": true,
-			"configuration": {
-				"host": "localhost",
-				"port": "5432",
-				"database": "postgres",
-				"url": "jdbc:postgresql://localhost:5432/postgres",
-				"type": "dev",
-				"provider-properties": {
-					"@dbeaver-show-non-default-db@": "false"
-				}
-			}
-		}
-	}
+  "folders": {},
+  "connections": {}
 }
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 a06f682699..d44262923c 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
@@ -99,7 +99,7 @@ public List<BaseProjectImpl> getProjects() {
     @Nullable
     @Override
     public BaseProjectImpl getProject(@NotNull String projectName) {
-        if (globalProject.getId().equals(projectName)) {
+        if (globalProject != null && globalProject.getId().equals(projectName)) {
             return globalProject;
         }
         return null;
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSObjectPermissionUpdatedEventHandler.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSObjectPermissionUpdatedEventHandler.java
index ebc1dfd6e1..7f4ebeb740 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSObjectPermissionUpdatedEventHandler.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/WSObjectPermissionUpdatedEventHandler.java
@@ -19,100 +19,162 @@
 import io.cloudbeaver.WebSessionGlobalProjectImpl;
 import io.cloudbeaver.model.session.BaseWebSession;
 import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.server.CBApplication;
+import io.cloudbeaver.server.CBPlatform;
+import io.cloudbeaver.service.security.SMUtils;
 import io.cloudbeaver.utils.WebAppUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.model.security.SMObjectType;
+import org.jkiss.dbeaver.model.security.SMAdminController;
+import org.jkiss.dbeaver.model.security.SMObjectPermissionsGrant;
 import org.jkiss.dbeaver.model.websocket.event.WSEventType;
 import org.jkiss.dbeaver.model.websocket.event.WSProjectUpdateEvent;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceEvent;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty;
 import org.jkiss.dbeaver.model.websocket.event.permissions.WSObjectPermissionEvent;
 
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 public class WSObjectPermissionUpdatedEventHandler extends WSDefaultEventHandler<WSObjectPermissionEvent> {
     private static final Log log = Log.getLog(WSObjectPermissionUpdatedEventHandler.class);
 
     @Override
-    protected void updateSessionData(@NotNull BaseWebSession activeUserSession, @NotNull WSObjectPermissionEvent event) {
-        try {
+    public void handleEvent(@NotNull WSObjectPermissionEvent event) {
+        String objectId = event.getObjectId();
+        Consumer<BaseWebSession> runnable = switch (event.getSmObjectType()) {
+            case project:
+                yield getUpdateUserProjectsInfoConsumer(event, objectId);
+            case datasource:
+                try {
+                    SMAdminController smController = CBApplication.getInstance().getSecurityController();
+                    Set<String> dataSourcePermissions = smController.getObjectPermissionGrants(event.getObjectId(), event.getSmObjectType())
+                        .stream()
+                        .map(SMObjectPermissionsGrant::getSubjectId).collect(Collectors.toSet());
+                    yield getUpdateUserDataSourcesInfoConsumer(event, objectId, dataSourcePermissions);
+                } catch (DBException e) {
+                    log.error("Error getting permissions for data source " + objectId, e);
+                    yield null;
+                }
+        };
+        if (runnable == null) {
+            return;
+        }
+        log.debug(event.getTopicId() + " event handled");
+        Collection<BaseWebSession> allSessions = CBPlatform.getInstance().getSessionManager().getAllActiveSessions();
+        for (var activeUserSession : allSessions) {
+            if (!isAcceptableInSession(activeUserSession, event)) {
+                log.debug("Cannot handle %s event '%s' in session %s".formatted(
+                    event.getTopicId(),
+                    event.getId(),
+                    activeUserSession.getSessionId()
+                ));
+                continue;
+            }
+            log.debug("%s event '%s' handled".formatted(event.getTopicId(), event.getId()));
+            runnable.accept(activeUserSession);
+        }
+    }
+
+    @NotNull
+    private Consumer<BaseWebSession> getUpdateUserDataSourcesInfoConsumer(
+        @NotNull WSObjectPermissionEvent event,
+        @NotNull String dataSourceId,
+        @NotNull Set<String> dataSourcePermissions
+    ) {
+        return (activeUserSession) -> {
             // we have accessible data sources only in web session
-            if (event.getSmObjectType() == SMObjectType.datasource && !(activeUserSession instanceof WebSession)) {
+            // admins already have access for all shared connections
+            if (!(activeUserSession instanceof WebSession webSession) || SMUtils.isAdmin(webSession)) {
                 return;
             }
-            var objectId = event.getObjectId();
-
-            boolean isAccessibleNow;
-            switch (event.getSmObjectType()) {
-                case project:
-                    if (WSEventType.OBJECT_PERMISSIONS_UPDATED.getEventId().equals(event.getId())) {
-                        var accessibleProjectIds = activeUserSession.getUserContext().getAccessibleProjectIds();
-                        if (accessibleProjectIds.contains(event.getObjectId())) {
-                            return;
-                        }
-                        activeUserSession.addSessionProject(objectId);
-                        activeUserSession.addSessionEvent(
-                            WSProjectUpdateEvent.create(
-                                event.getSessionId(),
-                                event.getUserId(),
-                                objectId
-                            )
-                        );
-                    } else if (WSEventType.OBJECT_PERMISSIONS_DELETED.getEventId().equals(event.getId())) {
-                        activeUserSession.removeSessionProject(objectId);
-                        activeUserSession.addSessionEvent(
-                            WSProjectUpdateEvent.delete(
-                                event.getSessionId(),
-                                event.getUserId(),
-                                objectId
-                            )
-                        );
-                    }
-                    break;
-                case datasource:
-                    var webSession = (WebSession) activeUserSession;
-                    var dataSources = List.of(objectId);
+            if (!isAcceptableInSession(webSession, event)) {
+                return;
+            }
+            var user = activeUserSession.getUserContext().getUser();
+            var userSubjects = new HashSet<>(Set.of(user.getTeams()));
+            userSubjects.add(user.getUserId());
+            boolean shouldBeAccessible = dataSourcePermissions.stream().anyMatch(userSubjects::contains);
+            List<String> dataSources = List.of(dataSourceId);
+            WebSessionGlobalProjectImpl project = webSession.getGlobalProject();
+            if (project == null) {
+                log.error("Project " + WebAppUtils.getGlobalProjectId() +
+                    " is not found in session " + activeUserSession.getSessionId());
+                return;
+            }
+            boolean isAccessibleNow = project.findWebConnectionInfo(dataSourceId) != null;
+            if (WSEventType.OBJECT_PERMISSIONS_UPDATED.getEventId().equals(event.getId())) {
+                if (isAccessibleNow || !shouldBeAccessible) {
+                    return;
+                }
+                project.addAccessibleConnectionToCache(dataSourceId);
+                webSession.addSessionEvent(
+                    WSDataSourceEvent.create(
+                        event.getSessionId(),
+                        event.getUserId(),
+                        project.getId(),
+                        dataSources,
+                        WSDataSourceProperty.CONFIGURATION
+                    )
+                );
+            } else if (WSEventType.OBJECT_PERMISSIONS_DELETED.getEventId().equals(event.getId())) {
+                if (!isAccessibleNow || shouldBeAccessible) {
+                    return;
+                }
+                project.removeAccessibleConnectionFromCache(dataSourceId);
+                webSession.addSessionEvent(
+                    WSDataSourceEvent.delete(
+                        event.getSessionId(),
+                        event.getUserId(),
+                        project.getId(),
+                        dataSources,
+                        WSDataSourceProperty.CONFIGURATION
+                    )
+                );
+            }
+        };
+    }
 
-                    WebSessionGlobalProjectImpl project = webSession.getGlobalProject();
-                    if (project == null) {
-                        log.error("Project " + WebAppUtils.getGlobalProjectId() +
-                            " is not found in session " + activeUserSession.getSessionId());
+    @NotNull
+    private Consumer<BaseWebSession> getUpdateUserProjectsInfoConsumer(
+        @NotNull WSObjectPermissionEvent event,
+        @NotNull String projectId
+    ) {
+        return (activeUserSession) -> {
+            try {
+                if (WSEventType.OBJECT_PERMISSIONS_UPDATED.getEventId().equals(event.getId())) {
+                    var accessibleProjectIds = activeUserSession.getUserContext().getAccessibleProjectIds();
+                    if (accessibleProjectIds.contains(event.getObjectId())) {
                         return;
                     }
-                    if (WSEventType.OBJECT_PERMISSIONS_UPDATED.getEventId().equals(event.getId())) {
-                        isAccessibleNow = project.findWebConnectionInfo(objectId) != null;
-                        if (isAccessibleNow) {
-                            return;
-                        }
-                        project.addAccessibleConnectionToCache(objectId);
-                        webSession.addSessionEvent(
-                            WSDataSourceEvent.create(
-                                event.getSessionId(),
-                                event.getUserId(),
-                                project.getId(),
-                                dataSources,
-                                WSDataSourceProperty.CONFIGURATION
-                            )
-                        );
-                    } else if (WSEventType.OBJECT_PERMISSIONS_DELETED.getEventId().equals(event.getId())) {
-                        project.removeAccessibleConnectionFromCache(objectId);
-                        webSession.addSessionEvent(
-                            WSDataSourceEvent.delete(
-                                event.getSessionId(),
-                                event.getUserId(),
-                                project.getId(),
-                                dataSources,
-                                WSDataSourceProperty.CONFIGURATION
-                            )
-                        );
-                    }
+                    activeUserSession.addSessionProject(projectId);
+                    activeUserSession.addSessionEvent(
+                        WSProjectUpdateEvent.create(
+                            event.getSessionId(),
+                            event.getUserId(),
+                            projectId
+                        )
+                    );
+                } else if (WSEventType.OBJECT_PERMISSIONS_DELETED.getEventId().equals(event.getId())) {
+                    activeUserSession.removeSessionProject(projectId);
+                    activeUserSession.addSessionEvent(
+                        WSProjectUpdateEvent.delete(
+                            event.getSessionId(),
+                            event.getUserId(),
+                            projectId
+                        )
+                    );
+                }
+            } catch (DBException e) {
+                log.error("Error on changing permissions for project " +
+                    event.getObjectId() + " in session " + activeUserSession.getSessionId(), e);
             }
-        } catch (DBException e) {
-            log.error("Error on changing permissions for project " +
-                event.getObjectId() + " in session " + activeUserSession.getSessionId(), e);
-        }
+        };
     }
 
     @Override
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java
index fd9569ec59..7fe7cd1d01 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java
@@ -198,8 +198,7 @@ private void getObjectFeatures(DBSObject object, List<String> features) {
             features.add(OBJECT_FEATURE_OBJECT_CONTAINER);
             try {
                 Class<? extends DBSObject> childType = objectContainer.getPrimaryChildType(null);
-                Collection<? extends DBSObject> childrenCollection = objectContainer.getChildren(session.getProgressMonitor());
-                if (DBSTable.class.isAssignableFrom(childType) && childrenCollection != null) {
+                if (DBSTable.class.isAssignableFrom(childType)) {
                     features.add(OBJECT_FEATURE_ENTITY_CONTAINER);
                 }
             } catch (Exception e) {
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/core-blocks/src/InfoItem.module.css b/webapp/packages/core-blocks/src/InfoItem.module.css
index 5a8c0a4106..71f2362414 100644
--- a/webapp/packages/core-blocks/src/InfoItem.module.css
+++ b/webapp/packages/core-blocks/src/InfoItem.module.css
@@ -10,8 +10,15 @@
   align-items: center;
   flex: 0 0 auto;
 }
+
 .iconOrImage {
   width: 24px;
   height: 24px;
   margin-right: 16px;
+
+  &.compact {
+    width: 18px;
+    height: 18px;
+    margin-right: 8px;
+  }
 }
diff --git a/webapp/packages/core-blocks/src/InfoItem.tsx b/webapp/packages/core-blocks/src/InfoItem.tsx
index f0039e961a..ea73c59c76 100644
--- a/webapp/packages/core-blocks/src/InfoItem.tsx
+++ b/webapp/packages/core-blocks/src/InfoItem.tsx
@@ -18,19 +18,20 @@ import { useS } from './useS.js';
 export interface IInfoItem {
   info: TLocalizationToken;
   icon?: string;
+  compact?: boolean;
 }
 
 interface Props extends IInfoItem {
   className?: string;
 }
 
-export const InfoItem = observer<Props>(function InfoItem({ info, icon = '/icons/info_icon.svg', className }) {
+export const InfoItem = observer<Props>(function InfoItem({ info, compact, icon = '/icons/info_icon.svg', className }) {
   const styles = useS(style);
 
   const translate = useTranslate();
   return (
     <div className={s(styles, { infoItem: true }, className)}>
-      <IconOrImage className={s(styles, { iconOrImage: true })} icon={icon} />
+      <IconOrImage className={s(styles, { iconOrImage: true, compact })} icon={icon} />
       {translate(info)}
     </div>
   );
diff --git a/webapp/packages/core-connections/src/locales/de.ts b/webapp/packages/core-connections/src/locales/de.ts
index c92b054ac0..e5ee57cb7f 100644
--- a/webapp/packages/core-connections/src/locales/de.ts
+++ b/webapp/packages/core-connections/src/locales/de.ts
@@ -58,4 +58,5 @@ export default [
 
   ['core_connections_settings_disable', 'Disable'],
   ['core_connections_settings_disable_description', 'Disable the ability to create new connections'],
+  ['connections_templates_deprecated_message', 'Template connections are deprecated and will be removed in future releases'],
 ];
diff --git a/webapp/packages/core-connections/src/locales/en.ts b/webapp/packages/core-connections/src/locales/en.ts
index ca44fcca48..93133fd7db 100644
--- a/webapp/packages/core-connections/src/locales/en.ts
+++ b/webapp/packages/core-connections/src/locales/en.ts
@@ -102,4 +102,5 @@ export default [
 
   ['core_connections_settings_disable', 'Disable'],
   ['core_connections_settings_disable_description', 'Disable the ability to create new connections'],
+  ['connections_templates_deprecated_message', 'Template connections are deprecated and will be removed in future releases'],
 ];
diff --git a/webapp/packages/core-connections/src/locales/fr.ts b/webapp/packages/core-connections/src/locales/fr.ts
index c38d142279..808e902f12 100644
--- a/webapp/packages/core-connections/src/locales/fr.ts
+++ b/webapp/packages/core-connections/src/locales/fr.ts
@@ -111,4 +111,5 @@ export default [
 
   ['core_connections_settings_disable', 'Disable'],
   ['core_connections_settings_disable_description', 'Disable the ability to create new connections'],
+  ['connections_templates_deprecated_message', 'Template connections are deprecated and will be removed in future releases'],
 ];
diff --git a/webapp/packages/core-connections/src/locales/it.ts b/webapp/packages/core-connections/src/locales/it.ts
index 3d3002693b..f5f61ab238 100644
--- a/webapp/packages/core-connections/src/locales/it.ts
+++ b/webapp/packages/core-connections/src/locales/it.ts
@@ -100,4 +100,5 @@ export default [
 
   ['core_connections_settings_disable', 'Disable'],
   ['core_connections_settings_disable_description', 'Disable the ability to create new connections'],
+  ['connections_templates_deprecated_message', 'Template connections are deprecated and will be removed in future releases'],
 ];
diff --git a/webapp/packages/core-connections/src/locales/ru.ts b/webapp/packages/core-connections/src/locales/ru.ts
index ae8dfeae11..804cb0b13f 100644
--- a/webapp/packages/core-connections/src/locales/ru.ts
+++ b/webapp/packages/core-connections/src/locales/ru.ts
@@ -103,4 +103,5 @@ export default [
 
   ['core_connections_settings_disable', 'Отключить'],
   ['core_connections_settings_disable_description', 'Отключить возможность создания новых подключений'],
+  ['connections_templates_deprecated_message', 'Шаблоны подключений больше не поддерживаются и будут удалены в будущих релизах'],
 ];
diff --git a/webapp/packages/core-connections/src/locales/zh.ts b/webapp/packages/core-connections/src/locales/zh.ts
index 57f7bfbb5b..027ec3a69a 100644
--- a/webapp/packages/core-connections/src/locales/zh.ts
+++ b/webapp/packages/core-connections/src/locales/zh.ts
@@ -37,10 +37,7 @@ export default [
   ['connections_connection_authentication_save_credentials_for_session', '当前会话不再询问'],
   ['connections_connection_authentication_save_credentials_for_session_tooltip', '注销后将移除凭证'],
   ['connections_connection_edit_save_credentials_shared', '为所有访问用户保存凭证'],
-  [
-    'connections_connection_edit_save_credentials_shared_tooltip',
-    '凭证将用于为所有访问用户自动连接数据库',
-  ],
+  ['connections_connection_edit_save_credentials_shared_tooltip', '凭证将用于为所有访问用户自动连接数据库'],
   ['connections_connection_share_credentials', '分享凭证至团队'],
   ['connections_connection_share_credentials_tooltip', '凭证将用于为所有团队用户自动连接数据库'],
   ['connections_connection_credentials_provisioning', '认证凭据'],
@@ -52,7 +49,7 @@ export default [
   ['connections_connection_edit_search_hosts', '主机名称'],
   ['connections_connection_address', '地址'],
   ['connections_connection_folder', '文件夹'],
-  ['connections_connection_folder_validation', "文件夹名称不得包含以下符号 / : \" \\ ' <> | ? * 且不能以点开头"],
+  ['connections_connection_folder_validation', '文件夹名称不得包含以下符号 / : " \\ \' <> | ? * 且不能以点开头'],
   ['connections_connection_name', '连接名称'],
   ['connections_connection_access_admin_info', '管理员可以查看除其他用户的私有连接之外的所有连接。'],
   ['connections_connection_description', '描述'],
@@ -95,4 +92,5 @@ export default [
 
   ['core_connections_settings_disable', 'Disable'],
   ['core_connections_settings_disable_description', 'Disable the ability to create new connections'],
+  ['connections_templates_deprecated_message', 'Template connections are deprecated and will be removed in future releases'],
 ];
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',
diff --git a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx
index 91cb00ceb3..d4c1b95155 100644
--- a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx
+++ b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx
@@ -14,6 +14,7 @@ import {
   CommonDialogWrapper,
   ErrorMessage,
   Form,
+  InfoItem,
   s,
   useAdministrationSettings,
   useErrorDetails,
@@ -38,7 +39,12 @@ export const ConnectionDialog: DialogComponent<null, null> = observer(function C
   const dialog = useConnectionDialog(rejectDialog);
   const errorDetails = useErrorDetails(dialog.connectException);
 
-  const subTitle = dialog.step === ConnectionStep.Connection ? dialog.template?.name : undefined;
+  const subTitle =
+    dialog.step === ConnectionStep.Connection ? (
+      dialog.template?.name
+    ) : (
+      <InfoItem info={translate('connections_templates_deprecated_message')} compact />
+    );
 
   return (
     <CommonDialogWrapper size="large" fixedSize={dialog.step === ConnectionStep.ConnectionTemplateSelect}>
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministration.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministration.tsx
index e98371c1aa..5472d94c7b 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministration.tsx
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministration.tsx
@@ -14,8 +14,8 @@ import {
   ExceptionMessageStyles,
   Group,
   GroupItem,
-  GroupSubTitle,
   GroupTitle,
+  InfoItem,
   Loader,
   s,
   SContext,
@@ -25,13 +25,11 @@ import {
   useS,
   useTranslate,
 } from '@cloudbeaver/core-blocks';
-import { useService } from '@cloudbeaver/core-di';
 
 import ConnectionsAdministrationStyle from './ConnectionsAdministration.module.css';
 import { ConnectionsTable } from './ConnectionsTable/ConnectionsTable.js';
 import { useConnectionsTable } from './ConnectionsTable/useConnectionsTable.js';
 import { CreateConnection } from './CreateConnection/CreateConnection.js';
-import { CreateConnectionService } from './CreateConnectionService.js';
 
 const registry: StyleRegistry = [
   [
@@ -50,26 +48,16 @@ export const ConnectionsAdministration = observer<AdministrationItemContentProps
 }) {
   const style = useS(ConnectionsAdministrationStyle);
   const translate = useTranslate();
-  const service = useService(CreateConnectionService);
 
   const state = useConnectionsTable();
 
   return (
     <ColoredContainer vertical wrap parent gap>
       <Group keepSize dense>
-        <GroupSubTitle>{translate('templates_administration_info_message')}</GroupSubTitle>
+        <InfoItem info={translate('connections_templates_deprecated_message')} />
       </Group>
       <Group box keepSize>
         <ToolsPanel rounded>
-          <ToolsAction
-            title={translate('connections_administration_tools_add_tooltip')}
-            icon="add"
-            viewBox="0 0 24 24"
-            disabled={!!sub || state.loading}
-            onClick={service.create}
-          >
-            {translate('ui_add')}
-          </ToolsAction>
           <ToolsAction
             title={translate('connections_administration_tools_refresh_tooltip')}
             icon="refresh"
diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationService.ts b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationService.ts
index f1481c4082..d05d248aeb 100644
--- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationService.ts
+++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsAdministrationService.ts
@@ -69,7 +69,7 @@ export class ConnectionsAdministrationService extends Bootstrap {
           canDeActivate: this.canDeActivateCreate.bind(this),
         },
       ],
-      isHidden: () => this.serverConfigResource.distributed,
+      isHidden: () => this.serverConfigResource.distributed || !this.connectionInfoResource.values.some(connection => connection.template),
       getContentComponent: () => ConnectionsAdministration,
       getDrawerComponent: () => ConnectionsDrawerItem,
       onDeActivate: this.refreshUserConnections.bind(this),
@@ -78,6 +78,10 @@ export class ConnectionsAdministrationService extends Bootstrap {
     this.connectionDetailsPlaceholder.add(SSH, 2);
   }
 
+  override async load(): Promise<void> {
+    await this.connectionInfoResource.load();
+  }
+
   private async refreshUserConnections(configuration: boolean, outside: boolean, outsideAdminPage: boolean): Promise<void> {
     // TODO: we have to track users' leaving the page
     if (outside) {
diff --git a/webapp/packages/plugin-connections-administration/src/locales/en.ts b/webapp/packages/plugin-connections-administration/src/locales/en.ts
index 3718ace448..ba1aed8728 100644
--- a/webapp/packages/plugin-connections-administration/src/locales/en.ts
+++ b/webapp/packages/plugin-connections-administration/src/locales/en.ts
@@ -13,9 +13,5 @@ export default [
   ['plugin_connections_connection_edit_reconnect_failed', 'Failed to reconnect'],
 
   ['connections_administration_deactivate_message', "Your connection's settings will be lost. Do you want to continue?"],
-  [
-    'templates_administration_info_message',
-    'The templates enable administrators to define various reusable connection parameters, subsequently allowing users to create multiple connections based on these templates.',
-  ],
   ['connections_administration_connection_create_error', 'Failed to create connection'],
 ];
diff --git a/webapp/packages/plugin-connections-administration/src/locales/fr.ts b/webapp/packages/plugin-connections-administration/src/locales/fr.ts
index a70584acef..6efa32be67 100644
--- a/webapp/packages/plugin-connections-administration/src/locales/fr.ts
+++ b/webapp/packages/plugin-connections-administration/src/locales/fr.ts
@@ -13,9 +13,5 @@ export default [
   ['plugin_connections_connection_edit_reconnect_failed', 'Échec de la reconnexion'],
 
   ['connections_administration_deactivate_message', 'Les paramètres de votre connexion seront perdus. Voulez-vous continuer ?'],
-  [
-    'templates_administration_info_message',
-    'Les modèles permettent aux administrateurs de définir divers paramètres de connexion réutilisables, permettant ensuite aux utilisateurs de créer plusieurs connexions basées sur ces modèles.',
-  ],
   ['connections_administration_connection_create_error', 'Failed to create connection'],
 ];
diff --git a/webapp/packages/plugin-connections-administration/src/locales/it.ts b/webapp/packages/plugin-connections-administration/src/locales/it.ts
index c1eea9c399..676b42db43 100644
--- a/webapp/packages/plugin-connections-administration/src/locales/it.ts
+++ b/webapp/packages/plugin-connections-administration/src/locales/it.ts
@@ -8,9 +8,5 @@
 export default [
   ['plugin_connections_connection_edit_menu_item_title', 'Modifica Connessione'],
   ['plugin_connections_connection_edit_cancel_title', "Conferma l'annullamento"],
-  [
-    'templates_administration_info_message',
-    'The templates enable administrators to define various reusable connection parameters, subsequently allowing users to create multiple connections based on these templates.',
-  ],
   ['connections_administration_connection_create_error', 'Failed to create connection'],
 ];
diff --git a/webapp/packages/plugin-connections-administration/src/locales/ru.ts b/webapp/packages/plugin-connections-administration/src/locales/ru.ts
index 3ffea2835b..d3691ed3af 100644
--- a/webapp/packages/plugin-connections-administration/src/locales/ru.ts
+++ b/webapp/packages/plugin-connections-administration/src/locales/ru.ts
@@ -13,9 +13,5 @@ export default [
   ['plugin_connections_connection_edit_reconnect_failed', 'Не удалось переподключиться'],
 
   ['connections_administration_deactivate_message', 'Настройки вашего подключения будут потеряны. Вы хотите продолжить?'],
-  [
-    'templates_administration_info_message',
-    'Шаблоны позволяют администраторам определять различные параметры подключения, а затем позволяют пользователям создавать несколько подключений на основе этих шаблонов.',
-  ],
   ['connections_administration_connection_create_error', 'Не удалось создать подключение'],
 ];
diff --git a/webapp/packages/plugin-connections-administration/src/locales/zh.ts b/webapp/packages/plugin-connections-administration/src/locales/zh.ts
index 149fe0a2b0..eabd8240f1 100644
--- a/webapp/packages/plugin-connections-administration/src/locales/zh.ts
+++ b/webapp/packages/plugin-connections-administration/src/locales/zh.ts
@@ -13,6 +13,5 @@ export default [
   ['plugin_connections_connection_edit_reconnect_failed', '重新连接失败'],
 
   ['connections_administration_deactivate_message', '您的连接设置将丢失。您要继续吗？'],
-  ['templates_administration_info_message', '管理员可在数据库连接模板中定义各种可重用的连接参数，之后用户可基于这些模板创建多个数据库连接。'],
   ['connections_administration_connection_create_error', 'Failed to create connection'],
 ];