diff --git a/docker/docker-compose.cassandra.volumes.yml b/docker/docker-compose.cassandra.volumes.yml
index 4ee4760fb0..6efdd849e0 100644
--- a/docker/docker-compose.cassandra.volumes.yml
+++ b/docker/docker-compose.cassandra.volumes.yml
@@ -23,5 +23,5 @@ services:
 
 volumes:
   cassandra-volume:
-    external: true
-    name: ${CASSANDRA_DATA_VOLUME}
+    external:
+      name: ${CASSANDRA_DATA_VOLUME}
diff --git a/docker/docker-compose.postgres.volumes.yml b/docker/docker-compose.postgres.volumes.yml
index 51138a4d5b..8a57c2b74d 100644
--- a/docker/docker-compose.postgres.volumes.yml
+++ b/docker/docker-compose.postgres.volumes.yml
@@ -23,5 +23,5 @@ services:
 
 volumes:
   postgres-db-volume:
-    external: true
-    name: ${POSTGRES_DATA_VOLUME}
+    external:
+      name: ${POSTGRES_DATA_VOLUME}
diff --git a/docker/docker-compose.redis-cluster.volumes.yml b/docker/docker-compose.redis-cluster.volumes.yml
index 03b29110e3..445b79099b 100644
--- a/docker/docker-compose.redis-cluster.volumes.yml
+++ b/docker/docker-compose.redis-cluster.volumes.yml
@@ -39,20 +39,20 @@ services:
 
 volumes:
   redis-cluster-data-0:
-    external: true
-    name: ${REDIS_CLUSTER_DATA_VOLUME_0}
+    external:
+      name: ${REDIS_CLUSTER_DATA_VOLUME_0}
   redis-cluster-data-1:
-    external: true
-    name: ${REDIS_CLUSTER_DATA_VOLUME_1}
+    external:
+      name: ${REDIS_CLUSTER_DATA_VOLUME_1}
   redis-cluster-data-2:
-    external: true
-    name: ${REDIS_CLUSTER_DATA_VOLUME_2}
+    external:
+      name: ${REDIS_CLUSTER_DATA_VOLUME_2}
   redis-cluster-data-3:
-    external: true
-    name: ${REDIS_CLUSTER_DATA_VOLUME_3}
+    external:
+      name: ${REDIS_CLUSTER_DATA_VOLUME_3}
   redis-cluster-data-4:
-    external: true
-    name: ${REDIS_CLUSTER_DATA_VOLUME_4}
+    external:
+      name: ${REDIS_CLUSTER_DATA_VOLUME_4}
   redis-cluster-data-5:
-    external: true
-    name: ${REDIS_CLUSTER_DATA_VOLUME_5}
+    external:
+      name: ${REDIS_CLUSTER_DATA_VOLUME_5}
diff --git a/docker/docker-compose.redis.volumes.yml b/docker/docker-compose.redis.volumes.yml
index c96da9a5ab..fb6fee20f4 100644
--- a/docker/docker-compose.redis.volumes.yml
+++ b/docker/docker-compose.redis.volumes.yml
@@ -23,5 +23,5 @@ services:
 
 volumes:
   redis-data:
-    external: true
-    name: ${REDIS_DATA_VOLUME}
+    external:
+      name: ${REDIS_DATA_VOLUME}
diff --git a/docker/docker-compose.volumes.yml b/docker/docker-compose.volumes.yml
index dffdcacd2a..8a30d9b566 100644
--- a/docker/docker-compose.volumes.yml
+++ b/docker/docker-compose.volumes.yml
@@ -59,23 +59,23 @@ services:
 
 volumes:
   tb-log-volume:
-    external: true
-    name: ${TB_LOG_VOLUME}
+    external:
+      name: ${TB_LOG_VOLUME}
   tb-coap-transport-log-volume:
-    external: true
-    name: ${TB_COAP_TRANSPORT_LOG_VOLUME}
+    external:
+      name: ${TB_COAP_TRANSPORT_LOG_VOLUME}
   tb-lwm2m-transport-log-volume:
-    external: true
-    name: ${TB_LWM2M_TRANSPORT_LOG_VOLUME}
+    external:
+      name: ${TB_LWM2M_TRANSPORT_LOG_VOLUME}
   tb-http-transport-log-volume:
-    external: true
-    name: ${TB_HTTP_TRANSPORT_LOG_VOLUME}
+    external:
+      name: ${TB_HTTP_TRANSPORT_LOG_VOLUME}
   tb-mqtt-transport-log-volume:
-    external: true
-    name: ${TB_MQTT_TRANSPORT_LOG_VOLUME}
+    external:
+      name: ${TB_MQTT_TRANSPORT_LOG_VOLUME}
   tb-snmp-transport-log-volume:
-    external: true
-    name: ${TB_SNMP_TRANSPORT_LOG_VOLUME}
+    external:
+      name: ${TB_SNMP_TRANSPORT_LOG_VOLUME}
   tb-vc-executor-log-volume:
-    external: true
-    name: ${TB_VC_EXECUTOR_LOG_VOLUME}
+    external:
+      name: ${TB_VC_EXECUTOR_LOG_VOLUME}