diff --git a/ansible/library/acl_capabilities_facts.py b/ansible/library/acl_capabilities_facts.py
index 4f98cc5890a..23bd0534d4b 100644
--- a/ansible/library/acl_capabilities_facts.py
+++ b/ansible/library/acl_capabilities_facts.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python
 
-import swsssdk
 from sonic_py_common import multi_asic
 DOCUMENTATION = '''
 module:         acl_capabilities_facts
@@ -9,6 +8,12 @@
 short_description: Retrieve ACL capability information
 '''
 
+# swsssdk will be deprecate after 202205
+try:
+    from swsssdk import SonicDBConfig, SonicV2Connector
+except ImportError:
+    from swsscommon.swsscommon import SonicDBConfig, SonicV2Connector
+
 EXAMPLES = '''
 - name: Get ACL capability facts
   acl_capabilities_facts:
@@ -32,8 +37,9 @@ def run(self):
         """
         self.facts['acl_capabilities'] = {}
         namespace_list = multi_asic.get_namespace_list()
-        swsssdk.SonicDBConfig.load_sonic_global_db_config()
-        conn = swsssdk.SonicV2Connector(namespace=namespace_list[0])
+
+        SonicDBConfig.load_sonic_global_db_config()
+        conn = SonicV2Connector(namespace=namespace_list[0])
         conn.connect(conn.STATE_DB)
         keys = conn.keys(conn.STATE_DB, 'ACL_STAGE_CAPABILITY_TABLE|*') or []
 
diff --git a/ansible/library/switch_capabilities_facts.py b/ansible/library/switch_capabilities_facts.py
index 280cb3acc3e..1b00aefc25d 100644
--- a/ansible/library/switch_capabilities_facts.py
+++ b/ansible/library/switch_capabilities_facts.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python
 
-import swsssdk
 from sonic_py_common import multi_asic
 DOCUMENTATION = '''
 module:         switch_capability_facts
@@ -9,6 +8,12 @@
 short_description: Retrieve switch capability information
 '''
 
+# swsssdk will be deprecate after 202205
+try:
+    from swsssdk import SonicDBConfig, SonicV2Connector
+except ImportError:
+    from swsscommon.swsscommon import SonicDBConfig, SonicV2Connector
+
 EXAMPLES = '''
 - name: Get switch capability facts
   switch_capability_facts:
@@ -33,8 +38,9 @@ def run(self):
         """
         self.facts['switch_capabilities'] = {}
         namespace_list = multi_asic.get_namespace_list()
-        swsssdk.SonicDBConfig.load_sonic_global_db_config()
-        conn = swsssdk.SonicV2Connector(namespace=namespace_list[0])
+
+        SonicDBConfig.load_sonic_global_db_config()
+        conn = SonicV2Connector(namespace=namespace_list[0])
         conn.connect(conn.STATE_DB)
         keys = conn.keys(conn.STATE_DB, 'SWITCH_CAPABILITY|*')
 
diff --git a/tests/sflow/test_sflow.py b/tests/sflow/test_sflow.py
index 25d51f332e4..29ca14a11de 100644
--- a/tests/sflow/test_sflow.py
+++ b/tests/sflow/test_sflow.py
@@ -114,8 +114,16 @@ def get_ifindex(duthost, port):
 
 def get_port_index(duthost, port):
     py_version = 'python' if '201911' in duthost.os_version else 'python3'
-    cmd = "{} -c \"from swsssdk import port_util; print(port_util.get_index_from_str(\'{}\'))\""
-    index = duthost.shell(cmd.format(py_version, port))['stdout']
+
+    # if sonic_py_common.port_util exist, use port_util from sonic_py_common.
+    util_lib = "swsssdk"
+    cmd = "{} -c \"import pkgutil; print(pkgutil.find_loader(\'sonic_py_common.port_util\'))\"".format(py_version)
+    class_exist = duthost.shell(cmd)['stdout']
+    if class_exist != "None":
+        util_lib = "sonic_py_common"
+
+    cmd = "{} -c \"from {} import port_util; print(port_util.get_index_from_str(\'{}\'))\""
+    index = duthost.shell(cmd.format(py_version, util_lib, port))['stdout']
     return index
 
 # ----------------------------------------------------------------------------------