diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen
index ae1b5977d892..6897e383d8c6 100755
--- a/src/sonic-config-engine/sonic-cfggen
+++ b/src/sonic-config-engine/sonic-cfggen
@@ -46,7 +46,7 @@ from sonic_py_common.device_info import get_platform, get_system_mac
 from sonic_py_common.multi_asic import get_asic_id_from_name, is_multi_asic
 from config_samples import generate_sample_config
 from config_samples import get_available_config
-from swsssdk import SonicV2Connector, ConfigDBConnector, SonicDBConfig 
+from swsssdk import SonicV2Connector, ConfigDBConnector, SonicDBConfig, ConfigDBPipeConnector
 from redis_bcc import RedisBytecodeCache
 from collections import OrderedDict
 from natsort import natsorted
@@ -340,9 +340,9 @@ def main():
 
     if args.from_db:
         if args.namespace is None:
-            configdb = ConfigDBConnector(use_unix_socket_path=True, **db_kwargs)
+            configdb = ConfigDBPipeConnector(use_unix_socket_path=True, **db_kwargs)
         else:
-            configdb = ConfigDBConnector(use_unix_socket_path=True, namespace=args.namespace, **db_kwargs)
+            configdb = ConfigDBPipeConnector(use_unix_socket_path=True, namespace=args.namespace, **db_kwargs)
 
         configdb.connect()
         deep_update(data, FormatConverter.db_to_output(configdb.get_config()))
@@ -401,9 +401,9 @@ def main():
 
     if args.write_to_db:
         if args.namespace is None:
-            configdb = ConfigDBConnector(use_unix_socket_path=True, **db_kwargs)
+            configdb = ConfigDBPipeConnector(use_unix_socket_path=True, **db_kwargs)
         else:
-            configdb = ConfigDBConnector(use_unix_socket_path=True, namespace=args.namespace, **db_kwargs)
+            configdb = ConfigDBPipeConnector(use_unix_socket_path=True, namespace=args.namespace, **db_kwargs)
 
         configdb.connect(False)
         configdb.mod_config(FormatConverter.output_to_db(data))
diff --git a/src/sonic-py-swsssdk b/src/sonic-py-swsssdk
index 2df4f40fcec2..c25d492c4cbb 160000
--- a/src/sonic-py-swsssdk
+++ b/src/sonic-py-swsssdk
@@ -1 +1 @@
-Subproject commit 2df4f40fcec2c5ddafe543aec964a6390d2a9a90
+Subproject commit c25d492c4cbb356b1fdd4502f75eda7db9e48aea