diff --git a/.gitlab/ci/configure_common.cmake b/.gitlab/ci/configure_common.cmake
index 2c79a1ae51679af057eec80d53d5fa1e55b3539e..57fd420119c7fcf912a87dbc96b91eaa7818edd8 100644
--- a/.gitlab/ci/configure_common.cmake
+++ b/.gitlab/ci/configure_common.cmake
@@ -22,6 +22,7 @@ enable_project(adios2)
 enable_project(alembic)
 enable_project(blosc)
 enable_project(blosc2)
+enable_project(cdi)
 enable_project(cinemaexport)
 enable_project(cosmotools)
 enable_project(exodus) # requires seacas to actually build anything
diff --git a/.gitlab/ci/configure_linux_shared.cmake b/.gitlab/ci/configure_linux_shared.cmake
index e47af6433ef839534a74e6871fb14316e5f72402..88170ae6ce148c11cf61c47d0bdbe251c0007ffc 100644
--- a/.gitlab/ci/configure_linux_shared.cmake
+++ b/.gitlab/ci/configure_linux_shared.cmake
@@ -1,5 +1,3 @@
-set(ENABLE_cdi ON CACHE BOOL "")
-set(SUPPRESS_cdi_OUTPUT ON CACHE BOOL "")
 set(ENABLE_catalyst ON  CACHE BOOL "")
 set(ENABLE_lookingglass ON  CACHE BOOL "")
 set(ENABLE_fides ON CACHE BOOL "")
diff --git a/.gitlab/ci/configure_macos.cmake b/.gitlab/ci/configure_macos.cmake
index a162eeeb890c0337ee9040886595dc05581ce0b7..fe6681c3448e01bbc14fb224d8bbefec6dfd16dd 100644
--- a/.gitlab/ci/configure_macos.cmake
+++ b/.gitlab/ci/configure_macos.cmake
@@ -1,6 +1,4 @@
 set(ENABLE_catalyst ON CACHE BOOL "")
-set(ENABLE_cdi ON CACHE BOOL "")
-set(SUPPRESS_cdi_OUTPUT ON CACHE BOOL "")
 set(ENABLE_fides ON CACHE BOOL "")
 set(ENABLE_openmp OFF CACHE BOOL "")
 set(ENABLE_paraviewtranslations ON CACHE BOOL "")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33eaabcb06d1183c96ba5553a7a0247eed45fc41..a02d0b9669f83d433a4d7cc76f21ac981f4e578c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,7 @@ function (superbuild_find_projects var)
     boost
     bzip2
     catalyst
+    cdi
     cinemaexport
     cuda
     curl
@@ -192,7 +193,6 @@ function (superbuild_find_projects var)
 
   if (UNIX)
     list(APPEND projects
-      cdi
       cosmotools
       expat
       ffi
diff --git a/projects/apple-unix/cdi.cmake b/projects/apple-unix/cdi.cmake
deleted file mode 100644
index 330c486bf51b43980cc3c94a6a31bea8ec8b2bac..0000000000000000000000000000000000000000
--- a/projects/apple-unix/cdi.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-# netcdf required, either system or installed
-set(cdi_netcdf_args "--with-netcdf=<INSTALL_DIR>")
-if (USE_SYSTEM_netcdf)
-  set(cdi_netcdf_args "--with-netcdf=yes")
-endif ()
-
-superbuild_add_project(cdi
-  CAN_USE_SYSTEM
-  DEPENDS
-    netcdf
-  LICENSE_FILES
-    LICENSE
-  SPDX_LICENSE_IDENTIFIER
-    BSD-3-Clause
-  SPDX_COPYRIGHT_TEXT
-    "Copyright 2002-2023, MPI für Meteorologie"
-  CONFIGURE_COMMAND
-    <SOURCE_DIR>/configure
-    --prefix=<INSTALL_DIR>
-    ${cdi_netcdf_args}
-  BUILD_COMMAND
-    $(MAKE)
-  INSTALL_COMMAND
-    $(MAKE) install
-  BUILD_IN_SOURCE 1)
-
-if (NOT APPLE AND UNIX)
-  superbuild_append_flags(ld_flags "-Wl,-rpath,<INSTALL_DIR>/lib" PROJECT_ONLY)
-endif ()
diff --git a/projects/cdi.cmake b/projects/cdi.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..bfce58e3720512ee1e673609651233ba6aaad72f
--- /dev/null
+++ b/projects/cdi.cmake
@@ -0,0 +1,25 @@
+superbuild_add_project(cdi
+  CAN_USE_SYSTEM
+  DEPENDS
+    netcdf
+    hdf5
+  LICENSE_FILES
+    LICENSE
+  SPDX_LICENSE_IDENTIFIER
+    BSD-3-Clause
+  SPDX_COPYRIGHT_TEXT
+    "Copyright 2002-2023, MPI für Meteorologie"
+  CMAKE_ARGS
+    -DBUILD_SHARED_LIBS:BOOL=ON
+    -DCDI_PTHREAD:BOOL=OFF
+    -DCDI_LIBGRIB:BOOL=OFF
+    -DCDI_LIBGRIBEX:BOOL=OFF
+    -DCDI_EXTRA:BOOL=OFF
+    -DCDI_IEG:BOOL=OFF
+    -DCDI_SERVICE:BOOL=OFF
+    -DCDI_ECCODES:BOOL=OFF
+    -DCDI_NETCDF:BOOL=ON
+    -DCDI_BUILD_APP:BOOL=OFF
+    -DBUILD_TESTING:BOOL=OFF
+    -DCDI_BUILD_UNKNOWN:BOOL=OFF
+  )
diff --git a/projects/paraview.cmake b/projects/paraview.cmake
index 0984cb07b25de58d401dca8cad0685965b0e68df..9e0abd1f240c5119b43b12ea34f80147011077b3 100644
--- a/projects/paraview.cmake
+++ b/projects/paraview.cmake
@@ -48,7 +48,7 @@ if (UNIX)
       fontconfig)
   endif ()
   list(APPEND paraview_platform_dependencies
-    cdi ffmpeg fides fortran libxml2 freetype mili gmsh
+    ffmpeg fides fortran libxml2 freetype mili gmsh
     # For cosmotools
     genericio cosmotools)
 endif ()
@@ -251,6 +251,7 @@ superbuild_add_project(paraview
     adios2 alembic catalyst cuda boost eigen gdal hdf5 matplotlib mpi numpy pdal png
     protobuf python3 qt5 qt6 visitbridge zlib silo las lookingglass pythonmpi4py
     xdmf3 vrpn vtkm netcdf
+    cdi
     openturns
     openmp
     openpmd
diff --git a/versions.cmake b/versions.cmake
index 108bcbd2d4c802e23ba2489e9d8e42ae07b8f874..565e1dbb257167373dada4055c8a01debf0bbde0 100644
--- a/versions.cmake
+++ b/versions.cmake
@@ -372,8 +372,8 @@ superbuild_set_selectable_source(catalyst
 
 superbuild_set_revision(cdi
   # https://code.mpimet.mpg.de/projects/cdi/files
-  URL     "https://www.paraview.org/files/dependencies/cdi-2.2.4.tar.gz"
-  URL_MD5 "8441bd74d3f1a25941e27008b7b7e770")
+  URL     "https://www.paraview.org/files/dependencies/cdi-2.5.1.1.tar.gz"
+  URL_MD5 "b9181f784b226c9560cde82cb5046ca8")
 
 superbuild_set_revision(occt
   # https://git.dev.opencascade.org/gitweb/?p=occt.git pick the tag you want, and download a snapshot.