diff --git a/MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl b/MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl
new file mode 100644
index 0000000000000000000000000000000000000000..46dbca2f1dc1896100f87c556a0b685e14eca668
Binary files /dev/null and b/MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl differ
diff --git a/awscrt-0.11.13-cp36-cp36m-manylinux1_x86_64.whl b/awscrt-0.11.13-cp36-cp36m-manylinux1_x86_64.whl
new file mode 100644
index 0000000000000000000000000000000000000000..15c254520ed8f71ba86e8dcae2fd4f4d8655ae5a
Binary files /dev/null and b/awscrt-0.11.13-cp36-cp36m-manylinux1_x86_64.whl differ
diff --git a/cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl b/cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl
new file mode 100644
index 0000000000000000000000000000000000000000..a6271bc46c1af307dc70a59e9308477b9db34926
Binary files /dev/null and b/cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl differ
diff --git a/cryptography-3.3.2-cp36-abi3-manylinux1_x86_64.whl b/cryptography-3.3.2-cp36-abi3-manylinux1_x86_64.whl
new file mode 100644
index 0000000000000000000000000000000000000000..3893155d03aab66e1d58d99663105968817ca441
Binary files /dev/null and b/cryptography-3.3.2-cp36-abi3-manylinux1_x86_64.whl differ
diff --git a/fence-agents.spec b/fence-agents.spec
index f8c1177db2858c1629b337f00b9ca0db50eaa301..793d76f7fe57b59fe10ebc20b6d24e8d3e77d975 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -187,7 +187,6 @@ Source1095: %{googleauth}-%{googleauth_version}.tar.gz
 Source1096: %{cachetools}-%{cachetools_version}.tar.gz
 Source1097: %{pyasn1modules}-%{pyasn1modules_version}.tar.gz
 Source1098: %{pyasn1}-%{pyasn1_version}.tar.gz
-Source1099: python-%{dateutil}-%{dateutil_version}.tar.gz
 Source1100: %{pyyaml}-%{pyyaml_version}.tar.gz
 ## rsa is dependency for "pip install",
 ## but gets removed to use cryptography lib instead
@@ -211,6 +210,17 @@ Source1116: packaging-21.2-py3-none-any.whl
 Source1117: poetry-core-1.0.7.tar.gz
 Source1118: pyparsing-3.0.1.tar.gz
 Source1119: tomli-1.0.1.tar.gz
+Source1120: pycryptodome-3.10.1.tar.gz
+Source1121: cryptography-3.3.2-cp36-abi3-manylinux1_x86_64.whl
+Source1122: awscrt-0.11.13-cp36-cp36m-manylinux1_x86_64.whl
+Source1123: cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl 
+Source1124: urllib3-1.24.3-py2.py3-none-any.whl
+Source1125: importlib_metadata-4.8.1-py3-none-any.whl 
+Source1126: protobuf-3.17.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl
+Source1127: zipp-3.5.0-py3-none-any.whl
+Source1128: typing_extensions-3.10.0.2-py3-none-any.whl
+Source1129: importlib_resources-5.2.2-py3-none-any.whl 
+Source1130: MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl
 ### END
 
 Patch0: ha-cloud-support-aliyun.patch
@@ -308,6 +318,7 @@ BuildRequires: python3-devel python3-pip
 # wheel for HA support subpackages
 BuildRequires: python3-wheel
 BuildRequires: python3-pycurl python3-requests
+BuildRequires: python3-markupsafe
 %if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7
 BuildRequires: openwsman-python3
 %endif
@@ -385,18 +396,19 @@ LIBS="%{_sourcedir}/requirements-openstack.txt %{_sourcedir}/requirements-common
 %ifnarch x86_64 ppc64le
 LIBS="%{_sourcedir}/requirements-common.txt"
 %endif
+# %{__python3} -m pip install --target support/$(echo $x | sed -E "s/.*requirements-(.*).txt/\1/") --no-index --find-links %{_sourcedir} setuptools_scm
 for x in $LIBS; do
 	%{__python3} -m pip install --target support/$(echo $x | sed -E "s/.*requirements-(.*).txt/\1/") --no-index --find-links %{_sourcedir} -r $x
 done
 
 # fix incorrect #! detected by CI
-%ifarch x86_64
-sed -i -e "/^#\!\/Users/c#\!%{__python3}" support/aws/bin/jp support/aliyun/bin/jp support/awscli/bin/jp
-%endif
+# %ifarch x86_64
+# sed -i -e "/^#\!\/Users/c#\!%{__python3}" support/aws/bin/jp support/aliyun/bin/jp support/awscli/bin/jp
+# %endif
 
-%ifarch x86_64
-sed -i -e "/^import awscli.clidriver/isys.path.insert(0, '/usr/lib/%{name}/support/awscli')" support/awscli/bin/aws
-%endif
+# %ifarch x86_64
+# sed -i -e "/^import awscli.clidriver/isys.path.insert(0, '/usr/lib/%{name}/support/awscli')" support/awscli/bin/aws
+# %endif
 
 ./autogen.sh
 %{configure} --disable-libvirt-qmf-plugin PYTHONPATH="support/aliyun:support/aws:support/azure:support/google:support/openstack:support/common" --with-agents='%{supportedagents} %{testagents}'
@@ -422,7 +434,7 @@ install -m 0644 agents/virt/fence_virtd.service %{buildroot}/%{_unitdir}/
 # XXX unsure if /usr/sbin/fence_* should be compiled as well
 
 # kubevirt
-%{__python3} -m pip install --user --no-index --find-links %{_sourcedir} setuptools-scm
+%{__python3} -m pip install --user --no-index --find-links %{_sourcedir} setuptools-scm MarkupSafe
 %{__python3} -m pip install --target %{buildroot}/usr/lib/fence-agents/%{bundled_lib_dir}/kubevirt --no-index --find-links %{_sourcedir} openshift
 rm -rf %{buildroot}/usr/lib/fence-agents/%{bundled_lib_dir}/kubevirt/rsa*
 
diff --git a/importlib_metadata-4.8.1-py3-none-any.whl b/importlib_metadata-4.8.1-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..0a226fb73c259dde1679607eafd87faabaf307fb
Binary files /dev/null and b/importlib_metadata-4.8.1-py3-none-any.whl differ
diff --git a/importlib_resources-5.2.2-py3-none-any.whl b/importlib_resources-5.2.2-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..45047a5a848b39592607c46611a3cbb458eea331
Binary files /dev/null and b/importlib_resources-5.2.2-py3-none-any.whl differ
diff --git a/protobuf-3.17.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl b/protobuf-3.17.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl
new file mode 100644
index 0000000000000000000000000000000000000000..51f6ceadcf10bdaac6542d8eebd4904b234297d6
Binary files /dev/null and b/protobuf-3.17.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl differ
diff --git a/pycryptodome-3.10.1.tar.gz b/pycryptodome-3.10.1.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..ee913bf6f69f491e34d52758369cfeb8e9824378
Binary files /dev/null and b/pycryptodome-3.10.1.tar.gz differ
diff --git a/python-dateutil-2.8.2.tar.gz b/python-dateutil-2.8.2.tar.gz
deleted file mode 100644
index f73bc9ee925c0392d286c2761390ee47c003ad73..0000000000000000000000000000000000000000
Binary files a/python-dateutil-2.8.2.tar.gz and /dev/null differ
diff --git a/typing_extensions-3.10.0.2-py3-none-any.whl b/typing_extensions-3.10.0.2-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..7d994c5ef03d22e66d317e923f491ad812f997c2
Binary files /dev/null and b/typing_extensions-3.10.0.2-py3-none-any.whl differ
diff --git a/urllib3-1.24.3-py2.py3-none-any.whl b/urllib3-1.24.3-py2.py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..8da9f547675f6c4b7c0bfe0e9078d0b03af4b378
Binary files /dev/null and b/urllib3-1.24.3-py2.py3-none-any.whl differ
diff --git a/zipp-3.5.0-py3-none-any.whl b/zipp-3.5.0-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..9b606195459d3fa4808b0ad26caafe3a4a3d669d
Binary files /dev/null and b/zipp-3.5.0-py3-none-any.whl differ