diff --git a/docker-compose.yml b/docker-compose.yml
index f90076a1..126f927e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,15 @@
-version: '2.4'
+version: '3.9'
 
 services:
   archivebox:
     build: .
     command: server --debug --reload --quick-init 0.0.0.0:8000
+    dns: pihole
     ports:
       - 8000:8000
+    volumes:
+      - ./data:/data
+      - ./archivebox:/app/archivebox
     environment:
       - ALLOWED_HOSTS=*
       - MEDIA_MAX_SIZE=750m
@@ -21,18 +25,13 @@ services:
       # FIXME: Mercury doesn't work
       - USE_MERCURY=False
       - SAVE_MERCURY=False
-    dns:
-      - pihole
-    volumes:
-      - ./data:/data
-      - ./archivebox:/app/archivebox
 
   pihole:
     image: pihole/pihole:latest
     ports:
       - 80:80
-    environment:
-      WEBPASSWORD: 'password'
     volumes:
       - ./data/pihole:/etc/pihole
       - ./data/dnsmasq:/etc/dnsmasq.d
+    environment:
+      WEBPASSWORD: 'password'