diff --git a/ydb/library/yql/cfg/tests/gateways-experimental.conf b/ydb/library/yql/cfg/tests/gateways-experimental.conf
index e69de29bb2d1..857a7f71d4c9 100644
--- a/ydb/library/yql/cfg/tests/gateways-experimental.conf
+++ b/ydb/library/yql/cfg/tests/gateways-experimental.conf
@@ -0,0 +1,34 @@
+Yt {
+    DefaultSettings {
+        Name: "InferSchemaMode"
+        Value: "rpc"
+    }
+
+    DefaultSettings {
+        Name: "DQRPCReaderInflight"
+        Value: "10"
+    }
+
+    DefaultSettings {
+        Name: "UseRPCReaderInDq"
+        Value: "true"
+    }
+
+    DefaultSettings {
+        Name: "TableContentLocalExecution"
+        Value: "true"
+    }
+}
+
+Dq {
+    DefaultSettings {
+        Name: "UseFastPickleTransport"
+        Value: "true"
+    }
+
+    DefaultSettings {
+        Name: "UseOOBTransport"
+        Value: "true"
+    }
+}
+
diff --git a/ydb/library/yql/cfg/tests/gateways.conf b/ydb/library/yql/cfg/tests/gateways.conf
index 8c420a5109a4..7fdbbd77179d 100644
--- a/ydb/library/yql/cfg/tests/gateways.conf
+++ b/ydb/library/yql/cfg/tests/gateways.conf
@@ -2,21 +2,6 @@ Yt {
     GatewayThreads: 0
     YtLogLevel: YL_INFO
 
-    DefaultSettings {
-        Name: "InferSchemaMode"
-        Value: "rpc"
-    }
-
-    DefaultSettings {
-        Name: "DQRPCReaderInflight"
-        Value: "10"
-    }
-
-    DefaultSettings {
-        Name: "UseRPCReaderInDq"
-        Value: "true"
-    }
-
     DefaultSettings {
         Name: "DefaultMaxJobFails"
         Value: "1"
@@ -72,11 +57,6 @@ Yt {
         Value: "true"
     }
 
-    DefaultSettings {
-        Name: "TableContentLocalExecution"
-        Value: "true"
-    }
-
     RemoteFilePatterns {
         Pattern: "yt://([a-zA-Z0-9\\-_]+)/([^&@?]+)$"
         Cluster: "$1"
@@ -164,16 +144,6 @@ Dq {
         Value: "grace"
     }
 
-    DefaultSettings {
-        Name: "UseFastPickleTransport"
-        Value: "true"
-    }
-
-    DefaultSettings {
-        Name: "UseOOBTransport"
-        Value: "true"
-    }
-
     DefaultSettings {
         Name: "UseFinalizeByKey"
         Value: "true"