diff --git a/docker/typesense.yml b/docker/app.typesense.yml
similarity index 100%
rename from docker/typesense.yml
rename to docker/app.typesense.yml
diff --git a/docker/dnsmasq.yml b/docker/dnsmasq.yml
deleted file mode 100644
index 480c8fb80..000000000
--- a/docker/dnsmasq.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-services:
-  dnsmasq:
-    image: jamesmorrison/dnsmasq
-    ports:
-      - "172.17.0.1:53:53/udp"
-      - "172.17.0.1:53:53/tcp"
-    volumes:
-      - ./dnsmasq.conf:/etc/dnsmasq.conf
-      - ./funkwhale.test.conf:/etc/dnsmasq.d/funkwhale.test.conf
-    network_mode: bridge
diff --git a/docker/net.dnsmasq.yml b/docker/net.dnsmasq.yml
new file mode 100644
index 000000000..ec10b1035
--- /dev/null
+++ b/docker/net.dnsmasq.yml
@@ -0,0 +1,7 @@
+services:
+  dnsmasq:
+    image: jamesmorrison/dnsmasq
+    volumes:
+      - ./etc/dnsmasq/dnsmasq.conf:/etc/dnsmasq.conf
+      - ./etc/dnsmasq/funkwhale.test.conf:/etc/dnsmasq.d/funkwhale.test.conf
+    network_mode: host
diff --git a/docker/net.helpers.resolved.yml b/docker/net.helpers.resolved.yml
new file mode 100644
index 000000000..38d5fcae8
--- /dev/null
+++ b/docker/net.helpers.resolved.yml
@@ -0,0 +1,5 @@
+services:
+  keep-docker0-up:
+    extends:
+      file: ./net.helpers.yml
+      service: keep-docker0-up
diff --git a/docker/net.helpers.yml b/docker/net.helpers.yml
new file mode 100644
index 000000000..62f360f68
--- /dev/null
+++ b/docker/net.helpers.yml
@@ -0,0 +1,32 @@
+x-busybox: &busybox
+  init: true
+  image: "busybox"
+  network_mode: bridge
+  dns: 172.17.0.1
+  dns_search: funkwhale.test
+
+networks:
+  federation:
+    external: true
+
+services:
+  whoami:
+    image: "traefik/whoami"
+    networks:
+      - federation
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.whoami-web.rule=Host(`whoami.funkwhale.test`)"
+      - "traefik.http.routers.whoami-web.entrypoints=web"
+
+      - "traefik.http.routers.whoami-webs.rule=Host(`whoami.funkwhale.test`)"
+      - "traefik.http.routers.whoami-webs.entrypoints=webs"
+      - "traefik.http.routers.whoami-webs.tls=true"
+      - "traefik.http.routers.whoami.tls.domains[0].main=whoami.funkwhale.test"
+
+  shell:
+    <<: *busybox
+
+  keep-docker0-up:
+    <<: *busybox
+    tty: true
diff --git a/docker/minio.yml b/docker/net.minio.yml
similarity index 89%
rename from docker/minio.yml
rename to docker/net.minio.yml
index e1ac2b4db..a6979c886 100644
--- a/docker/minio.yml
+++ b/docker/net.minio.yml
@@ -3,7 +3,7 @@ services:
     image: minio/minio
     command: server /data
     volumes:
-      - "./data/${COMPOSE_PROJECT_NAME-node1}/minio:/data"
+      - "./data/${COMPOSE_PROJECT_NAME:-node1}/minio:/data"
     environment:
       - "MINIO_ACCESS_KEY=${AWS_ACCESS_KEY_ID-access_key}"
       - "MINIO_SECRET_KEY=${AWS_SECRET_ACCESS_KEY-secret_key}"
diff --git a/docker/net.traefik.yml b/docker/net.traefik.yml
new file mode 100644
index 000000000..aa4f71e59
--- /dev/null
+++ b/docker/net.traefik.yml
@@ -0,0 +1,9 @@
+services:
+  traefik:
+    image: traefik:mimolette
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./etc/traefik/traefik.yml:/etc/traefik/traefik.yml
+      - ./var/test.key:/ssl/traefik.key
+      - ./var/test.crt:/ssl/traefik.crt
+    network_mode: host
diff --git a/docker/net.verify.yml b/docker/net.verify.yml
new file mode 100644
index 000000000..f616a3afa
--- /dev/null
+++ b/docker/net.verify.yml
@@ -0,0 +1,15 @@
+x-verify: &verify
+  init: true
+  image: "busybox"
+  network_mode: bridge
+  dns: 172.17.0.1
+  dns_search: funkwhale.test
+
+services:
+  verify-external-connectivity:
+    <<: *verify
+    command: ping -c 1 funkwhale.audio
+
+  verify-internal-connectivity:
+    <<: *verify
+    command: "ping -c 1 ${COMPOSE_PROJECT_NAME}.funkwhale.test"
diff --git a/docker/traefik.yml b/docker/traefik.yml
deleted file mode 100644
index 5c35d71de..000000000
--- a/docker/traefik.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-services:
-  traefik:
-    image: traefik:alpine
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ./traefik.toml:/traefik.toml
-      - ./ssl/test.key:/ssl/traefik.key
-      - ./ssl/test.crt:/ssl/traefik.crt
-    ports:
-      - "172.17.0.1:80:80"
-      - "172.17.0.1:443:443"
-      - "172.17.0.1:8040:8040"
-    networks:
-      - federation
-
-networks:
-  federation:
-    external: true