diff --git a/src/sonic-bgpcfgd/setup.py b/src/sonic-bgpcfgd/setup.py
index 91fcdd0ac26..d6290bccb2b 100755
--- a/src/sonic-bgpcfgd/setup.py
+++ b/src/sonic-bgpcfgd/setup.py
@@ -18,7 +18,6 @@
         'jinja2>=2.10',
         'netaddr==0.8.0',
         'pyyaml==5.3.1',
-        'zipp==1.2.0', # importlib-resources needs zipp and seems to have a bug where it will try to import too new of a version for Python 2
     ],
     setup_requires = [
         'pytest-runner',
diff --git a/src/sonic-config-engine/setup.py b/src/sonic-config-engine/setup.py
index 7e7b9b45519..2483e8ebcf3 100755
--- a/src/sonic-config-engine/setup.py
+++ b/src/sonic-config-engine/setup.py
@@ -30,7 +30,8 @@
         'future',
         'Jinja2<3.0.0',
         'pyangbind==0.6.0',
-        'zipp==1.2.0', # importlib-resources needs zipp and seems to have a bug where it will try to install too new of a version for Python 2
+        'zipp==1.2.0',  # importlib-resources needs zipp and seems to have a bug where it will try to install too new of a version for Python 2
+        'importlib-resources==3.3.1'  # importlib-resources v4.0.0 was released 2020-12-23 and drops support for Python 2
     ]
 
 
diff --git a/src/sonic-swss b/src/sonic-swss
index c7ee75f0b92..cadf28faab2 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit c7ee75f0b92e3bbbd34938fb6ceca50f0491b5f9
+Subproject commit cadf28faab202c84805dfde8c582099998488b88