diff --git a/packages/app/setup.cfg b/packages/app/setup.cfg
index 929d77f69a77..53395032feab 100644
--- a/packages/app/setup.cfg
+++ b/packages/app/setup.cfg
@@ -54,7 +54,8 @@ install_requires =
     lxml
     Mako
     Markdown
-    packaging
+    MarkupSafe
+    packaging<22
     paramiko!=2.9.0,!=2.9.1
     pebble
     pulsar-galaxy-lib>=0.14.13
diff --git a/packages/data/setup.cfg b/packages/data/setup.cfg
index c1b722c96c95..7a1c7cbfb0d5 100644
--- a/packages/data/setup.cfg
+++ b/packages/data/setup.cfg
@@ -37,11 +37,11 @@ install_requires =
     alembic
     bdbag
     bx-python
-    contextvars; python_version >= "3.6" and python_version < "3.7"
     dnspython
     galaxy-sequence-utils
     h5py
     isa-rwval
+    MarkupSafe
     mrcfile
     numpy
     parsley
@@ -52,7 +52,7 @@ install_requires =
     pysam
     social-auth-core[openidconnect]==4.0.3
     SQLAlchemy>=1.4.25,<2
-    tifffile<=2020.9.3  # Last version compatible with python 3.6
+    tifffile
     typing-extensions
     WebOb
 packages = find:
diff --git a/packages/tool_util/setup.cfg b/packages/tool_util/setup.cfg
index 3721d23ff1b6..f116a82008cd 100644
--- a/packages/tool_util/setup.cfg
+++ b/packages/tool_util/setup.cfg
@@ -33,6 +33,8 @@ include_package_data = True
 install_requires =
     galaxy-util>=22.1
     lxml
+    MarkupSafe
+    packaging<22
     pydantic
     PyYAML
     sortedcontainers
diff --git a/packages/util/setup.cfg b/packages/util/setup.cfg
index 598b0347a86d..7a0ddbe61793 100644
--- a/packages/util/setup.cfg
+++ b/packages/util/setup.cfg
@@ -35,9 +35,7 @@ install_requires =
     boltons
     docutils
     importlib_resources
-    MarkupSafe
     packaging<22  # packaging 22.0 dropped LegacyVersion
-    pycryptodome
     pyparsing
     PyYAML
     requests
diff --git a/pyproject.toml b/pyproject.toml
index 1f305af56a3d..76fe5660c1ab 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -71,6 +71,7 @@ mrcfile = "*"
 nodeenv = "*"
 nose = "*"
 numpy = "*"
+packaging = "<22"  # packaging 22.0 dropped LegacyVersion
 paramiko = "!=2.9.0, !=2.9.1"  # https://github.com/paramiko/paramiko/issues/1961
 Parsley = "*"
 Paste = "*"