diff --git a/easybuild/easyconfigs/c/cf-units/cf-units-3.3.0-gfbf-2024a.eb b/easybuild/easyconfigs/c/cf-units/cf-units-3.3.0-gfbf-2024a.eb
new file mode 100644
index 000000000000..39497e943ded
--- /dev/null
+++ b/easybuild/easyconfigs/c/cf-units/cf-units-3.3.0-gfbf-2024a.eb
@@ -0,0 +1,38 @@
+easyblock = 'PythonBundle'
+
+name = 'cf-units'
+version = '3.3.0'
+
+homepage = 'https://cf-units.readthedocs.io'
+description = "Units of measure as required by the Climate and Forecast (CF) Metadata Conventions"
+
+toolchain = {'name': 'gfbf', 'version': '2024a'}
+
+builddependencies = [
+    ('Cython', '3.0.10'),
+]
+
+dependencies = [
+    ('Python', '3.12.3'),
+    ('SciPy-bundle', '2024.05'),
+    ('UDUNITS', '2.2.28'),
+]
+
+# antlr4-python3-runtime version depends on cf-units, see
+# https://github.com/SciTools/cf-units/blob/v3.3.0/cf_units/_udunits2_parser/_antlr4_runtime/_antlr4_version.txt
+exts_list = [
+    ('antlr4-python3-runtime', '4.11.1', {
+        'modulename': 'antlr4',
+        'checksums': ['a53de701312f9bdacc5258a6872cd6c62b90d3a90ae25e494026f76267333b60'],
+    }),
+    ('cftime', '1.6.4', {
+        'checksums': ['e325406193758a7ed67308deb52e727782a19e384e183378e7ff62098be0aedc'],
+    }),
+    (name, version, {
+        'preinstallopts': 'UDUNITS2_XML_PATH="$EBROOTUDUNITS/share/udunits/udunits2.xml"',
+        'source_tmpl': 'cf_units-%(version)s.tar.gz',
+        'checksums': ['2327da492f30cf018a3f1b5950192ce9bb3332e50b1c7ac53f7543de7fa61fdb'],
+    }),
+]
+
+moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/c/clisops/clisops-0.15.0-foss-2024a.eb b/easybuild/easyconfigs/c/clisops/clisops-0.15.0-foss-2024a.eb
index 91db80ea0eb1..47a210a2812f 100644
--- a/easybuild/easyconfigs/c/clisops/clisops-0.15.0-foss-2024a.eb
+++ b/easybuild/easyconfigs/c/clisops/clisops-0.15.0-foss-2024a.eb
@@ -14,13 +14,13 @@ as those found in ESGF data sets."""
 toolchain = {'name': 'foss', 'version': '2024a'}
 
 builddependencies = [
-    ('Cython', '3.0.10'),  # required for cftime
     ('hatchling', '1.24.2'),  # required for filelock
 ]
 
 dependencies = [
     ('Python', '3.12.3'),
     ('SciPy-bundle', '2024.05'),
+    ('cf-units', '3.3.0'),
     ('dask', '2024.9.1'),
     ('xarray', '2024.11.0'),
     ('aiohttp', '3.10.10'),
@@ -38,9 +38,6 @@ exts_list = [
     ('cf_xarray', '0.10.3', {
         'checksums': ['009143716ae1f49dc5d37624d7b6e1b0ec424b0a892a84f8f0a85e0970dc3453'],
     }),
-    ('cftime', '1.6.4', {
-        'checksums': ['e325406193758a7ed67308deb52e727782a19e384e183378e7ff62098be0aedc'],
-    }),
     ('roocs_grids', '0.1.2', {
         'checksums': ['7dbf178314950b0c0160032412677141106701c38141d2481c0e622c7b3efed0'],
     }),
diff --git a/easybuild/easyconfigs/s/SciTools-Iris/SciTools-Iris-3.13.0-foss-2024a.eb b/easybuild/easyconfigs/s/SciTools-Iris/SciTools-Iris-3.13.0-foss-2024a.eb
index f5d7f40fd198..4c8064399484 100644
--- a/easybuild/easyconfigs/s/SciTools-Iris/SciTools-Iris-3.13.0-foss-2024a.eb
+++ b/easybuild/easyconfigs/s/SciTools-Iris/SciTools-Iris-3.13.0-foss-2024a.eb
@@ -13,11 +13,11 @@ dependencies = [
     ('Python', '3.12.3'),
     ('SciPy-bundle', '2024.05'),
     ('Cartopy', '0.24.1'),
+    ('cf-units', '3.3.0'),
     ('dask', '2024.9.1'),
     ('matplotlib', '3.9.2'),
     ('netcdf4-python', '1.7.1.post2'),
     ('python-xxhash', '3.5.0'),
-    ('UDUNITS', '2.2.28'),
     ('Shapely', '2.0.6'),
 ]
 
@@ -25,18 +25,7 @@ dependencies = [
 _preinstallopts = "sed -i '/^license/d' pyproject.toml && "
 _preinstallopts += r"sed -i 's/dask\[array\].*/dask[array]/g' requirements/pypi-core.txt && "
 
-# antlr4-python3-runtime version depends on cf-units, see
-# https://github.com/SciTools/cf-units/blob/v3.3.0/cf_units/_udunits2_parser/_antlr4_runtime/_antlr4_version.txt
 exts_list = [
-    ('antlr4-python3-runtime', '4.11.1', {
-        'modulename': 'antlr4',
-        'checksums': ['a53de701312f9bdacc5258a6872cd6c62b90d3a90ae25e494026f76267333b60'],
-    }),
-    ('cf-units', '3.3.0', {
-        'preinstallopts': 'UDUNITS2_XML_PATH="$EBROOTUDUNITS/share/udunits/udunits2.xml"',
-        'source_tmpl': 'cf_units-%(version)s.tar.gz',
-        'checksums': ['2327da492f30cf018a3f1b5950192ce9bb3332e50b1c7ac53f7543de7fa61fdb'],
-    }),
     ('scitools-iris', version, {
         'modulename': 'iris',
         'preinstallopts': _preinstallopts,