diff --git a/ci/test-upgrade b/ci/test-upgrade
index 8deaf303fc..4dc852dbf2 100755
--- a/ci/test-upgrade
+++ b/ci/test-upgrade
@@ -43,6 +43,8 @@ function create {
     cd -
     cd $1/testgeomapfish
     git add --all
+    # Workaround for issue in 2.4.0
+    git add -f tilegeneration/config.yaml.tmpl || true
     git commit --quiet --message="Initial commit"
     git clean -fX
     cd -
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/+dot+env.sample_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/create/+dot+env.sample_tmpl
index 53ca465ee1..d69f183e0f 100644
--- a/geoportal/c2cgeoportal_geoportal/scaffolds/create/+dot+env.sample_tmpl
+++ b/geoportal/c2cgeoportal_geoportal/scaffolds/create/+dot+env.sample_tmpl
@@ -18,12 +18,9 @@ AUTHTKT_SECRET=change_me
 AUTHTKT_COOKIENAME=auth_tkt_{{package}}
 GEOPORTAL_INTERNAL_URL=http://geoportal:8080
 TILECLOUDCHAIN_INTERNAL_URL=http://tilecloudchain:8080
-MAPCACHE_URL=http://mapcache:8080/mapcache/
 MAPSERVER_URL=http://mapserver:8080/
 TINYOWS_URL=http://tinyows:8080/
 QGISSERVER_URL=http://qgisserver:8080/
-MEMCACHED_HOST=memcached
-MEMCACHED_PORT=11211
 REDIS_HOST=redis
 REDIS_PORT=6379
 TILEGENERATION_SQS_QUEUE=<queue_name>
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-lib.yaml_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-lib.yaml_tmpl
index 280d4cefc8..42a809238e 100644
--- a/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-lib.yaml_tmpl
+++ b/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-lib.yaml_tmpl
@@ -20,10 +20,7 @@ services:
       - PGSCHEMA_STATIC
       - GEOPORTAL_INTERNAL_URL
       - TILECLOUDCHAIN_INTERNAL_URL
-      - MAPCACHE_URL
       - MAPSERVER_URL
-      - MEMCACHED_HOST
-      - MEMCACHED_PORT
       - REDIS_HOST
       - REDIS_PORT
       - TILEGENERATION_SQS_QUEUE
@@ -92,19 +89,6 @@ services:
     user: www-data
     restart: unless-stopped
 
-  mapcache:
-    image: camptocamp/mapcache:1.6
-    user: www-data
-    restart: unless-stopped
-
-  memcached:
-    image: memcached:1.5
-    user: www-data
-    restart: unless-stopped
-    command:
-      - memcached
-      - --memory-limit=512
-
   redis:
     image: redis:5
     user: www-data
@@ -123,7 +107,7 @@ services:
       - '30'
 
   tilecloudchain:
-    image: camptocamp/tilecloud-chain:1.9
+    image: camptocamp/tilecloud-chain:1.12
     user: www-data
     restart: unless-stopped
     environment:
@@ -141,7 +125,7 @@ services:
       - AWS_SECRET_ACCESS_KEY
 
   tilegeneration_slave:
-    image: camptocamp/tilecloud-chain:1.9
+    image: camptocamp/tilecloud-chain:1.12
     user: www-data
     restart: unless-stopped
     entrypoint:
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose.yaml b/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose.yaml
index 7502cc38c3..991c4c9ebf 100644
--- a/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose.yaml
+++ b/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose.yaml
@@ -47,18 +47,6 @@ services:
     volumes_from:
       - config:ro
 
-  mapcache:
-    extends:
-      file: docker-compose-lib.yaml
-      service: mapcache
-    volumes_from:
-      - config:ro
-
-  memcached:
-    extends:
-      file: docker-compose-lib.yaml
-      service: memcached
-
   redis:
     extends:
       file: docker-compose-lib.yaml
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/tilegeneration/config.yaml.tmpl_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/create/tilegeneration/config.yaml.tmpl_tmpl
index a0a8259d90..90da4ca2ac 100644
--- a/geoportal/c2cgeoportal_geoportal/scaffolds/create/tilegeneration/config.yaml.tmpl_tmpl
+++ b/geoportal/c2cgeoportal_geoportal/scaffolds/create/tilegeneration/config.yaml.tmpl_tmpl
@@ -110,11 +110,11 @@ sqs:
     queue: '${TILEGENERATION_SQS_QUEUE}'
 
 server:
-    mapcache_base: '${MAPCACHE_URL}'
     wmts_path: tiles
     static_path: tiles/static
     admin_path: tiles/admin
     expires: 8  # 8 hours
+    mapcache_internal: True
     predefined_commands:
     -   name: Generation all layers
         command: generate_tiles --role=master
@@ -123,12 +123,6 @@ server:
     -   name: Generation layer ortho
         command: generate_tiles --role=master --layer=ortho
 
-mapcache:
-    config_file: mapcache/mapcache.xml.tmpl
-    location: ''
-    memcache_host: '${MEMCACHED_HOST}'
-    memcache_port: '${MEMCACHED_PORT}'
-
 process:
     optipng_test:
     -   cmd: optipng -o7 -simulate %(in)s
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/update/geoportal/CONST_vars.yaml_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/update/geoportal/CONST_vars.yaml_tmpl
index 3e121deeba..d05b4aa9c3 100644
--- a/geoportal/c2cgeoportal_geoportal/scaffolds/update/geoportal/CONST_vars.yaml_tmpl
+++ b/geoportal/c2cgeoportal_geoportal/scaffolds/update/geoportal/CONST_vars.yaml_tmpl
@@ -731,18 +731,12 @@ runtime_environment:
     default: http://qgisserver:8080/
   - name: PRINT_URL
     default: http://print:8080/print/
-  - name: MAPCACHE_URL
-    default: http://mapcache:8080/
   - name: DEVSERVER_HOST
     default: webpack-dev-server:8080
   - name: REDIS_HOST
     default: redis
   - name: REDIS_PORT
     default: '6372'
-  - name: MEMCACHED_HOST
-    default: memcached
-  - name: MEMCACHED_PORT
-    default: '11211'
   - name: TILEGENERATION_SQS_QUEUE
     default: queue_name