diff --git a/rules/sonic-py-common.mk b/rules/sonic-py-common.mk
index 6afe9a826c6..297794a7deb 100644
--- a/rules/sonic-py-common.mk
+++ b/rules/sonic-py-common.mk
@@ -3,6 +3,8 @@
 SONIC_PY_COMMON_PY2 = sonic_py_common-1.0-py2-none-any.whl
 $(SONIC_PY_COMMON_PY2)_SRC_PATH = $(SRC_PATH)/sonic-py-common
 $(SONIC_PY_COMMON_PY2)_DEPENDS += $(SWSSSDK_PY2)
+$(SONIC_PY_COMMON_PY2)_DEBS_DEPENDS = $(LIBSWSSCOMMON) \
+                                      $(PYTHON_SWSSCOMMON)
 $(SONIC_PY_COMMON_PY2)_PYTHON_VERSION = 2
 SONIC_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2)
 
@@ -11,6 +13,8 @@ SONIC_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2)
 SONIC_PY_COMMON_PY3 = sonic_py_common-1.0-py3-none-any.whl
 $(SONIC_PY_COMMON_PY3)_SRC_PATH = $(SRC_PATH)/sonic-py-common
 $(SONIC_PY_COMMON_PY3)_DEPENDS += $(SWSSSDK_PY3)
+$(SONIC_PY_COMMON_PY3)_DEBS_DEPENDS = $(LIBSWSSCOMMON) \
+                                      $(PYTHON3_SWSSCOMMON)
 # Synthetic dependency to avoid building the Python 2 and 3 packages
 # simultaneously and any potential conflicts which may arise
 $(SONIC_PY_COMMON_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY2)
diff --git a/src/sonic-py-common/setup.py b/src/sonic-py-common/setup.py
index bed64fe7fd2..38be7a95a0f 100644
--- a/src/sonic-py-common/setup.py
+++ b/src/sonic-py-common/setup.py
@@ -2,12 +2,7 @@
 
 dependencies = [
     'natsort==6.2.1', # 6.2.1 is the last version which supports Python 2
-    'pyyaml',
-    'swsssdk>=2.0.1',
-]
-
-high_performance_deps = [
-    'swsssdk[high_perf]>=2.0.1',
+    'pyyaml'
 ]
 
 setup(
@@ -21,9 +16,6 @@
     maintainer='Joe LeVeque',
     maintainer_email='jolevequ@microsoft.com',
     install_requires=dependencies,
-    extras_require={
-        'high_perf': high_performance_deps,
-    },
     packages=[
         'sonic_py_common',
     ],
diff --git a/src/sonic-py-common/sonic_py_common/device_info.py b/src/sonic-py-common/sonic_py_common/device_info.py
index 4d1df635228..ba3c0f41b27 100644
--- a/src/sonic-py-common/sonic_py_common/device_info.py
+++ b/src/sonic-py-common/sonic_py_common/device_info.py
@@ -8,7 +8,7 @@
 from natsort import natsorted
 
 # TODO: Replace with swsscommon
-from swsssdk import ConfigDBConnector, SonicDBConfig, SonicV2Connector
+from swsscommon.swsscommon import ConfigDBConnector, SonicDBConfig, SonicV2Connector
 
 USR_SHARE_SONIC_PATH = "/usr/share/sonic"
 HOST_DEVICE_PATH = USR_SHARE_SONIC_PATH + "/device"
diff --git a/src/system-health/setup.py b/src/system-health/setup.py
index b0cc998e482..99b4c518797 100644
--- a/src/system-health/setup.py
+++ b/src/system-health/setup.py
@@ -27,6 +27,7 @@
         'pytest-runner'
     ],
     tests_require=[
+        'swsssdk>=2.0.1',
         'pytest',
         'mock>=2.0.0'
     ],