diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c472709bc8..8955a154f1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -67,6 +67,9 @@ jobs:
         # Install pykdtree with --no-build-isolation so it builds with numpy 2.0
         # We must get LD_PRELOAD for stdlibc++ or else the manylinux wheels
         # may break the conda-forge libraries trying to use newer glibc versions
+        # NOTE: Many of the packages removed and then reinstalled below are to avoid
+        #   compatibility issues with numpy 2. When conda-forge has numpy 2 available
+        #   this shouldn't be needed.
         run: |
           python -m pip install versioneer extension-helpers setuptools-scm configobj pkgconfig
           python -m pip install \
@@ -77,11 +80,13 @@ jobs:
           numpy \
           pandas \
           scipy
-          mamba remove --force-remove -y pykdtree pyresample trollimage pyhdf netcdf4 h5py
+          conda remove --force-remove -y pykdtree pyresample python-geotiepoints pyhdf netcdf4 h5py cftime astropy pyerfa
           python -m pip install --upgrade --no-deps --pre --no-build-isolation \
+          pyerfa \
           git+https://github.com/storpipfugl/pykdtree \
           git+https://github.com/pytroll/pyresample \
           git+https://github.com/pytroll/trollimage \
+          git+https://github.com/pytroll/python-geotiepoints \
           git+https://github.com/fhs/pyhdf \
           git+https://github.com/h5py/h5py \
           git+https://github.com/h5netcdf/h5netcdf \