diff --git a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
index 8980b26d0b..ccd536c6a4 100644
--- a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
+++ b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
@@ -346,7 +346,7 @@ type ConnectionInfo {
 
     properties: Object
 
-    template: Boolean!
+    template: Boolean! @deprecated
     connected: Boolean!
     provided: Boolean!
     readOnly: Boolean!
@@ -492,7 +492,7 @@ input ConnectionConfig {
     description: String
 
     # ID of template connection
-    templateId: ID
+    templateId: ID @deprecated
     # ID of database driver
     driverId: ID
 
@@ -519,7 +519,7 @@ input ConnectionConfig {
     autocommit: Boolean
 
     # Return template connection state
-    template: Boolean
+    template: Boolean @deprecated
     # Return read-only connection state
     readOnly: Boolean
 
@@ -579,7 +579,7 @@ extend type Query {
     userConnections( projectId: ID, id: ID, projectIds: [ID!] ): [ ConnectionInfo! ]!
 
     # Return list of template connections by project ID
-    templateConnections( projectId: ID ): [ ConnectionInfo! ]!
+    templateConnections( projectId: ID ): [ ConnectionInfo! ]! @deprecated
 
     # List of connection folders
     connectionFolders( projectId: ID, path: ID ): [ ConnectionFolderInfo! ]!
@@ -621,7 +621,7 @@ extend type Mutation {
     deleteConnection( id: ID!, projectId: ID ): Boolean!
 
     # Create new custom connection from template
-    createConnectionFromTemplate( templateId: ID!, projectId: ID!, connectionName: String ): ConnectionInfo!
+    createConnectionFromTemplate( templateId: ID!, projectId: ID!, connectionName: String ): ConnectionInfo! @deprecated
 
     # Create new folder for connections
     createConnectionFolder(parentFolderPath: ID, folderName: String!, projectId: ID ): ConnectionFolderInfo!
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java
index 48f78fbe7a..c03064c1ac 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java
@@ -146,6 +146,7 @@ boolean deleteConnection(
         @NotNull String connectionId) throws DBWebException;
 
     @WebAction
+    @Deprecated
     WebConnectionInfo createConnectionFromTemplate(
         @NotNull WebSession webSession,
         @NotNull String projectId,
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
index e9e78767bb..408095d615 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
@@ -611,6 +611,7 @@ public boolean deleteConnection(
     }
 
     @Override
+    @Deprecated
     public WebConnectionInfo createConnectionFromTemplate(
         @NotNull WebSession webSession,
         @NotNull String projectId,