diff --git a/docker-compose.yml b/docker-compose.yml
index b599abd43..5f38b0ec2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,12 +34,12 @@ services:
       lagoon.persistent.name: nginx # mount the persistent storage of nginx into this container
       lagoon.persistent: /app/web/sites/default/files/ # location where the persistent storage should be mounted
       lando.type: php-cli-drupal
-    << : *default-volumes # loads the defined volumes from the top
+    <<: *default-volumes # loads the defined volumes from the top
     user: root
     volumes_from: ### mount the ssh-agent from the pygmy or cachalot ssh-agent. Automatically removed in CI.
       - container:amazeeio-ssh-agent ### Local overrides to mount host SSH keys. Automatically removed in CI.
     environment:
-      << : *default-environment # loads the defined environment variables from the top
+      <<: *default-environment # loads the defined environment variables from the top
 
   nginx:
     build:
@@ -52,8 +52,9 @@ services:
       lagoon.type: nginx-php-persistent
       lagoon.persistent: /app/web/sites/default/files/
       lando.type: nginx-drupal
-    <<: *default-volumes
-    << : *default-user # uses the defined user from top
+    <<:
+      - *default-volumes
+      - *default-user # uses the defined user from top
     depends_on:
       - cli # basically just tells docker-compose to build the cli first
     environment:
@@ -74,8 +75,9 @@ services:
       lagoon.name: nginx
       lagoon.persistent: /app/web/sites/default/files/ # define where the persistent storage should be mounted too
       lando.type: php-fpm
-    << : *default-volumes # loads the defined volumes from the top
-    << : *default-user # uses the defined user from top
+    <<:
+      - *default-volumes # loads the defined volumes from the top
+      - *default-user # uses the defined user from top
     depends_on:
       - cli
     environment:
@@ -87,7 +89,7 @@ services:
       lagoon.type: mariadb
     ports:
       - '3306'
-    << : *default-user # uses the defined user from top
+    <<: *default-user # uses the defined user from top
     environment:
       <<: *default-environment