diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2599b15c..ec367684 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,7 @@ stages:
   - weekly_tests
 
 variables:
-  EEO_DEPS: $REGISTRY_GITLAB/extracteo/extracteo_deps
-  EO_CONTAINER: $REGISTRY_GITLAB/eo-containers/python
+  EO_CONTAINER: $REGISTRY_GITLAB/eo-containers
   EOREADER_CHANGES: eoreader/**/[^_]*.{py,xml}
 
 lint:
@@ -24,7 +23,7 @@ lint:
 
 # Test with data on local disk
 pytest:
-  image: $EEO_DEPS:latest
+  image: $EO_CONTAINER:geo_latest
   stage: test
   variables:
     CI_EOREADER_USE_S3: "0"
@@ -59,7 +58,7 @@ pytest:
 # Test with data on S3
 # TODO: create S3-specific CI ?
 pytest_s3:
-  image: $EEO_DEPS:latest
+  image: $EO_CONTAINER:geo_latest
   stage: test
   variables:
     CI_EOREADER_USE_S3: "1"
@@ -93,7 +92,7 @@ pytest_s3:
 
 # Test SNAP with SNAP
 pytest_end_to_end:
-  image: $EEO_DEPS:latest
+  image: $EO_CONTAINER:geo_latest
   stage: test
   variables:
     EOREADER_USE_DASK: "1"
@@ -119,7 +118,7 @@ pytest_end_to_end:
       when: always
 
 pytest_end_to_end310:
-  image: $EEO_DEPS:310
+  image: $EO_CONTAINER:geo_310
   stage: test
   variables:
     # Use Dask for python 3.10
@@ -147,7 +146,7 @@ pytest_end_to_end310:
   needs: [ "pytest_end_to_end" ]
 
 pytest_end_to_end311:
-  image: $EEO_DEPS:311
+  image: $EO_CONTAINER:geo_311
   stage: test
   variables:
     # Use Dask for python 3.11
@@ -175,7 +174,7 @@ pytest_end_to_end311:
   needs: [ "pytest_end_to_end310" ]
 
 pytest_end_to_end312:
-  image: $EEO_DEPS:312
+  image: $EO_CONTAINER:geo_312
   stage: test
   variables:
     # Use Dask for python 3.11
@@ -203,7 +202,7 @@ pytest_end_to_end312:
   needs: [ "pytest_end_to_end311" ]
 
 tox-linux-3.9:on-schedule:
-  image: $EO_CONTAINER:3.9
+  image: $EO_CONTAINER:geo_39
   stage: weekly_tests
   before_script:
     - python -m pip install --upgrade pip
diff --git a/requirements.txt b/requirements.txt
index d1627cc1..0353a83e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,7 +20,7 @@ dicttoxml
 
 # Paths
 validators
-cloudpathlib>=0.10.0
+cloudpathlib[s3]>=0.10.0
 
 # Raster libs
 scipy