diff --git a/Docker/setups/default/docker-compose.yml b/Docker/setups/default/docker-compose.yml
index 3d7f282..4ce2cc3 100644
--- a/Docker/setups/default/docker-compose.yml
+++ b/Docker/setups/default/docker-compose.yml
@@ -23,16 +23,13 @@ x-zeek-controller: &ZEEK_CONTROLLER
 
 services:
   controller:
-    <<: *ZEEK_BASE
-    <<: *ZEEK_CONTROLLER
+    <<: [*ZEEK_BASE, *ZEEK_CONTROLLER]
 
   inst1:
-    <<: *ZEEK_BASE
-    <<: *ZEEK_AGENT
+    <<: [*ZEEK_BASE, *ZEEK_AGENT]
 
   inst2:
-    <<: *ZEEK_BASE
-    <<: *ZEEK_AGENT
+    <<: [*ZEEK_BASE, *ZEEK_AGENT]
 
   client:
     image: zeektest:latest
diff --git a/Docker/setups/singlehost/docker-compose.yml b/Docker/setups/singlehost/docker-compose.yml
index 7e0cdc2..3ee9a2b 100644
--- a/Docker/setups/singlehost/docker-compose.yml
+++ b/Docker/setups/singlehost/docker-compose.yml
@@ -29,9 +29,7 @@ x-zeek-client: &ZEEK_CLIENT
 
 services:
   controller:
-    <<: *ZEEK_BASE
-    <<: *ZEEK_CONTROLLER
+    <<: [*ZEEK_BASE, *ZEEK_CONTROLLER]
 
   client:
-    <<: *ZEEK_BASE
-    <<: *ZEEK_CLIENT
+    <<: [*ZEEK_BASE, *ZEEK_CLIENT]