diff --git a/cwltool/software_requirements.py b/cwltool/software_requirements.py
index 7e114bb86..9854bca38 100644
--- a/cwltool/software_requirements.py
+++ b/cwltool/software_requirements.py
@@ -156,7 +156,7 @@ def get_container_from_software_requirements(
             [DOCKER_CONTAINER_TYPE], tool_info
         )
         if container_description:
-            return cast(Optional[str], container_description.identifier)
+            return container_description.identifier
 
     return None
 
diff --git a/pyproject.toml b/pyproject.toml
index f8526fab8..789bed01a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,8 @@ requires = [
     "ruamel.yaml>=0.16.0,<0.18",
     "schema-salad>=8.2.20211104054942,<9",
     "cwl-utils >=0.19",
-    'toml',
+    "galaxy-tool-util >= 22.1.2, < 24",
+    "toml",
 ]
 build-backend = "setuptools.build_meta"
 
diff --git a/setup.py b/setup.py
index 06b9e11e1..f90da9e79 100644
--- a/setup.py
+++ b/setup.py
@@ -132,7 +132,7 @@
         "cwl-utils >= 0.22",
     ],
     extras_require={
-        "deps": ["galaxy-tool-util >= 22.1.2, <23", "galaxy-util <23"],
+        "deps": ["galaxy-tool-util >= 22.1.2, <24", "galaxy-util <24"],
     },
     python_requires=">=3.6, <4",
     setup_requires=PYTEST_RUNNER,
diff --git a/test-requirements.txt b/test-requirements.txt
index f96c672e5..e5a1b8c9d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,5 +8,5 @@ pytest-cov
 arcp>=0.2.0
 rdflib-jsonld>=0.4.0,<= 0.6.1;python_version<='3.6'
 -rrequirements.txt
-galaxy-tool-util>=22.1.2,<23
-galaxy-util<23
+galaxy-tool-util>=22.1.2,<24
+galaxy-util<24
diff --git a/tests/test_dependencies.py b/tests/test_dependencies.py
index 639f68b7b..c7964bf9d 100644
--- a/tests/test_dependencies.py
+++ b/tests/test_dependencies.py
@@ -17,7 +17,7 @@
 
 deps: Optional[ModuleType] = None
 try:
-    from galaxy.tool_util import deps  # type: ignore[no-redef]
+    from galaxy.tool_util import deps
 except ImportError:
     pass