diff --git a/CONST_create_template/docker-compose-lib.yaml b/CONST_create_template/docker-compose-lib.yaml
index 9210b816e..2be4401c5 100644
--- a/CONST_create_template/docker-compose-lib.yaml
+++ b/CONST_create_template/docker-compose-lib.yaml
@@ -75,7 +75,7 @@ services:
       - PGOPTIONS
 
   mapserver:
-    image: camptocamp/mapserver:8.0-gdal3.6
+    image: camptocamp/mapserver:8.2-gdal3.8
     user: www-data
     restart: unless-stopped
     entrypoint: []
diff --git a/CONST_create_template/env.default b/CONST_create_template/env.default
index 124a4947b..eecc00e9d 100644
--- a/CONST_create_template/env.default
+++ b/CONST_create_template/env.default
@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.9.rc.23
+GEOMAPFISH_VERSION=2.9.rc.24
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish
diff --git a/docker-compose-lib.yaml b/docker-compose-lib.yaml
index 9210b816e..2be4401c5 100644
--- a/docker-compose-lib.yaml
+++ b/docker-compose-lib.yaml
@@ -75,7 +75,7 @@ services:
       - PGOPTIONS
 
   mapserver:
-    image: camptocamp/mapserver:8.0-gdal3.6
+    image: camptocamp/mapserver:8.2-gdal3.8
     user: www-data
     restart: unless-stopped
     entrypoint: []
diff --git a/env.default b/env.default
index 124a4947b..eecc00e9d 100644
--- a/env.default
+++ b/env.default
@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.9.rc.23
+GEOMAPFISH_VERSION=2.9.rc.24
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish