diff --git a/docker/docker-compose-clickhouse-cluster.yml b/docker/docker-compose-clickhouse-cluster.yml
index fbe5987f..e32e72b4 100644
--- a/docker/docker-compose-clickhouse-cluster.yml
+++ b/docker/docker-compose-clickhouse-cluster.yml
@@ -13,7 +13,7 @@ volumes:
 services:
   akvorado-orchestrator:
     environment:
-      - AKVORADO_CFG_ORCHESTRATOR_CLICKHOUSE_CLUSTER=akvorado
+      AKVORADO_CFG_ORCHESTRATOR_CLICKHOUSE_CLUSTER: akvorado
 
   clickhouse-keeper-1: &clickhouse-keeper
     extends:
diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml
index 412bad95..60d9932c 100644
--- a/docker/docker-compose-dev.yml
+++ b/docker/docker-compose-dev.yml
@@ -122,8 +122,8 @@ services:
       file: versions.yml
       service: clickhouse
     environment:
-      - CLICKHOUSE_SKIP_USER_SETUP=1
-      - CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS=1
+      CLICKHOUSE_SKIP_USER_SETUP: 1
+      CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS: 1
     cap_add:
       - SYS_NICE
     volumes:
diff --git a/docker/docker-compose-grafana.yml b/docker/docker-compose-grafana.yml
index 1143c935..78c8e767 100644
--- a/docker/docker-compose-grafana.yml
+++ b/docker/docker-compose-grafana.yml
@@ -7,9 +7,9 @@ services:
       file: versions.yml
       service: grafana
     environment:
-      - GF_INSTALL_PLUGINS=marcusolsson-json-datasource 1.3.8
-      - GF_SERVER_ROOT_URL=/grafana
-      - GF_SERVER_SERVE_FROM_SUB_PATH=true
+      GF_INSTALL_PLUGINS: marcusolsson-json-datasource 1.3.8
+      GF_SERVER_ROOT_URL: /grafana
+      GF_SERVER_SERVE_FROM_SUB_PATH: "true"
     depends_on:
       - prometheus
       - akvorado-console
diff --git a/docker/docker-compose-ipinfo.yml b/docker/docker-compose-ipinfo.yml
index 6035ba2e..fbc62a79 100644
--- a/docker/docker-compose-ipinfo.yml
+++ b/docker/docker-compose-ipinfo.yml
@@ -5,8 +5,8 @@ services:
       file: versions.yml
       service: ipinfo-geoipupdate
     environment:
-      - IPINFO_TOKEN=a2632ea59736c7
-      - IPINFO_DATABASES=country asn
-      - UPDATE_FREQUENCY=48h
+      IPINFO_TOKEN: a2632ea59736c7
+      IPINFO_DATABASES: country asn
+      UPDATE_FREQUENCY: 48h
     volumes:
       - akvorado-geoip:/data
diff --git a/docker/docker-compose-maxmind.yml b/docker/docker-compose-maxmind.yml
index b3f20681..03c64460 100644
--- a/docker/docker-compose-maxmind.yml
+++ b/docker/docker-compose-maxmind.yml
@@ -6,9 +6,9 @@ services:
       file: versions.yml
       service: maxmind-geoipupdate
     environment:
-      - GEOIPUPDATE_ACCOUNT_ID
-      - GEOIPUPDATE_LICENSE_KEY
-      - GEOIPUPDATE_EDITION_IDS=GeoLite2-ASN GeoLite2-Country
-      - GEOIPUPDATE_FREQUENCY=48
+      GEOIPUPDATE_ACCOUNT_ID:
+      GEOIPUPDATE_LICENSE_KEY:
+      GEOIPUPDATE_EDITION_IDS: GeoLite2-ASN GeoLite2-Country
+      GEOIPUPDATE_FREQUENCY: 48
     volumes:
       - akvorado-geoip:/usr/share/GeoIP
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index c619d5e6..858b1570 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -55,10 +55,10 @@ services:
     depends_on:
       - kafka
     environment:
-      - KAFKA_CLUSTERS_0_NAME=local
-      - KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=kafka:9092
-      - KAFKA_CLUSTERS_0_READONLY=true
-      - SERVER_SERVLET_CONTEXT_PATH=/kafka-ui
+      KAFKA_CLUSTERS_0_NAME: local
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:9092
+      KAFKA_CLUSTERS_0_READONLY: true
+      SERVER_SERVLET_CONTEXT_PATH: /kafka-ui
     labels:
       - traefik.enable=true
       - traefik.http.routers.kafka-ui.rule=PathPrefix(`/kafka-ui`)
@@ -112,7 +112,7 @@ services:
     volumes:
       - akvorado-console-db:/run/akvorado
     environment:
-      - AKVORADO_CFG_CONSOLE_DATABASE_DSN=/run/akvorado/console.sqlite
+      AKVORADO_CFG_CONSOLE_DATABASE_DSN: /run/akvorado/console.sqlite
     labels:
       - traefik.enable=true
       # Only expose /debug endpoint on the private entrypoint.
@@ -175,7 +175,7 @@ services:
     volumes:
       - akvorado-run:/run/akvorado
     environment:
-      - AKVORADO_CFG_OUTLET_METADATA_CACHEPERSISTFILE=/run/akvorado/metadata.cache
+      AKVORADO_CFG_OUTLET_METADATA_CACHEPERSISTFILE: /run/akvorado/metadata.cache
     labels:
       - traefik.enable=true
       # Disable access logging of /api/v0/outlet/metrics
@@ -208,8 +208,8 @@ services:
       - akvorado-clickhouse:/var/lib/clickhouse
       - ./clickhouse/akvorado.xml:/etc/clickhouse-server/config.d/akvorado.xml
     environment:
-      - CLICKHOUSE_INIT_TIMEOUT=60
-      - CLICKHOUSE_SKIP_USER_SETUP=1
+      CLICKHOUSE_INIT_TIMEOUT: 60
+      CLICKHOUSE_SKIP_USER_SETUP: 1
     cap_add:
       - SYS_NICE
     restart: unless-stopped