diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index fad67c1e..ddc97d2b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -72,10 +72,10 @@ jobs:
         # XXX: We don't currently have OpenGL installation on other platforms
         #os: ["windows-latest", "ubuntu-latest", "macos-latest"]
         os: ["ubuntu-latest"]
-        python-version: ["3.9", "3.11"]
+        python-version: ["3.9", "3.11", "3.12"]
         experimental: [false]
         include:
-          - python-version: "3.11"
+          - python-version: "3.12"
             os: "ubuntu-latest"
             experimental: true
 
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index ea690ee0..47fa760b 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -65,6 +65,7 @@ jobs:
         uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
+          python-version: ${{ matrix.python-version }}
           environment-file: continuous_integration/environment.yaml
           activate-environment: test-environment
           channels: conda-forge
diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml
index c201ad93..bfcb16c0 100644
--- a/continuous_integration/environment.yaml
+++ b/continuous_integration/environment.yaml
@@ -2,8 +2,7 @@ name: test-environment
 channels:
   - conda-forge
 dependencies:
-  # limiting python due to ecmwflibs
-  - python<=3.11
+  - python<=3.12
   - appdirs
   - defusedxml
   - Cython
@@ -26,8 +25,6 @@ dependencies:
   - bottleneck
   - dask
   - donfig
-  # 2.19.1 seems to cause library linking issues
-  - eccodes>=2.20
   - cfgrib
   - fsspec
   - h5netcdf
@@ -38,7 +35,6 @@ dependencies:
   - pooch
   - pyhdf
   - pyresample
-  - python-eccodes
   - python-geotiepoints
   - pyyaml
   - rasterio
@@ -61,4 +57,4 @@ dependencies:
     - trollimage
     - pyspectral
     - pyorbital
-    - ecmwflibs
+    - eccodes>=2.37 # 2.37.0 has ecmwflibs integrated
diff --git a/continuous_integration/rtd_environment.yaml b/continuous_integration/rtd_environment.yaml
index 68730bbf..f5730823 100644
--- a/continuous_integration/rtd_environment.yaml
+++ b/continuous_integration/rtd_environment.yaml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
   # limiting python due to ecmwflibs
-  - python<=3.11
+  - python<=3.12
   - appdirs
   - defusedxml
   - Cython
@@ -26,8 +26,6 @@ dependencies:
   - bottleneck
   - dask
   - donfig
-  # 2.19.1 seems to cause library linking issues
-  - eccodes>=2.20
   - cfgrib
   - fsspec
   - h5netcdf
@@ -38,7 +36,6 @@ dependencies:
   - pooch
   - pyhdf
   - pyresample
-  - python-eccodes
   - python-geotiepoints
   - pyyaml
   - rasterio
@@ -61,7 +58,6 @@ dependencies:
     - trollimage
     - pyspectral
     - pyorbital
-    - ecmwflibs
     # docs:
     - blockdiag
     - sphinx
@@ -69,3 +65,4 @@ dependencies:
     - sphinxcontrib-seqdiag
     - sphinxcontrib-blockdiag
     - psutil
+    - eccodes>=2.37 # 2.37.0 has ecmwflibs integrated
diff --git a/setup.py b/setup.py
index 2f55f684..a022e3b4 100644
--- a/setup.py
+++ b/setup.py
@@ -222,8 +222,7 @@ def run(self):
         "trollsift",
         "vispy>=0.10.0",
         'pygrib;sys_platform=="linux" or sys_platform=="darwin"',
-        "ecmwflibs",
-        "eccodes",
+        "eccodes>=2.37",  # has ecmwflibs included
         "cfgrib",
     ],
     tests_requires=["pytest", "pytest-qt", "pytest-mock"],