diff --git a/docker/docker-compose.cassandra.yml b/docker/docker-compose.cassandra.yml
--- a/docker/docker-compose.cassandra.yml
+++ b/docker/docker-compose.cassandra.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: "2.1"
 
 services:
   cassandra-seed:
diff --git a/docker/docker-compose.keycloak.yml b/docker/docker-compose.keycloak.yml
--- a/docker/docker-compose.keycloak.yml
+++ b/docker/docker-compose.keycloak.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: "2.1"
 
 services:
 
@@ -32,4 +32,4 @@
     environment:
       SWH_CONFIG_FILENAME: /web-keycloak.yml
     volumes:
-      - "./conf/web-keycloak.yml:/web-keycloak.yml:ro"
\ No newline at end of file
+      - "./conf/web-keycloak.yml:/web-keycloak.yml:ro"
diff --git a/docker/docker-compose.override.yml.example b/docker/docker-compose.override.yml.example
--- a/docker/docker-compose.override.yml.example
+++ b/docker/docker-compose.override.yml.example
@@ -1,4 +1,4 @@
-version: '2'
+version: "2.1"
 
 services:
   swh-objstorage:
diff --git a/docker/docker-compose.search.yml b/docker/docker-compose.search.yml
--- a/docker/docker-compose.search.yml
+++ b/docker/docker-compose.search.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.1"
 
 services:
   elasticsearch:
diff --git a/docker/docker-compose.storage-mirror.yml b/docker/docker-compose.storage-mirror.yml
--- a/docker/docker-compose.storage-mirror.yml
+++ b/docker/docker-compose.storage-mirror.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: "2.1"
 
 services:
   # override web app to use the mirror
diff --git a/docker/docker-compose.storage-read-replica.yml b/docker/docker-compose.storage-read-replica.yml
--- a/docker/docker-compose.storage-read-replica.yml
+++ b/docker/docker-compose.storage-read-replica.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: "2.1"
 
 services:
   swh-storage-read-replica-db:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.1"
 
 services:
   amqp: