diff --git a/compose.docs.yml b/compose.docs.yml
index 41fa8fe32..77e8cd5a9 100644
--- a/compose.docs.yml
+++ b/compose.docs.yml
@@ -2,21 +2,6 @@ name: funkwhale-docs
 networks:
   web:
     external: true
-services:
-  sphinx:
-    build:
-      context: "compose/context/docs"
-    init: true
-    ports: ["8001:8001"]
-    command: sh -c 'cd /src/docs && make install && make dev'
-    volumes:
-      - ${PWD}:/src
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.whoami-web.rule=Host(`docs.funkwhale.test`)"
-      - "traefik.http.routers.whoami-web.entrypoints=web"
-
-      - "traefik.http.routers.whoami-webs.rule=Host(`docs.funkwhale.test`)"
-      - "traefik.http.routers.whoami-webs.entrypoints=webs"
-      - "traefik.http.routers.whoami-webs.tls=true"
-    networks: ["web"]
+include:
+  - path: compose/docs.sphinx.yml
+  - path: compose/docs.openapi.yml
diff --git a/compose/api-docs.yml b/compose/api-docs.yml
deleted file mode 100644
index c0b557ef2..000000000
--- a/compose/api-docs.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-services:
-  api-docs:
-    image: swaggerapi/swagger-ui:v3.37.2
-    environment:
-      - "API_URL=/swagger.yml"
-    ports:
-      - "8002:8080"
-    volumes:
-      - "./docs/swagger.yml:/usr/share/nginx/html/swagger.yml"
-      - "./docs/api:/usr/share/nginx/html/api"
diff --git a/compose/docs.openapi.yml b/compose/docs.openapi.yml
new file mode 100644
index 000000000..898a0d912
--- /dev/null
+++ b/compose/docs.openapi.yml
@@ -0,0 +1,19 @@
+services:
+  openapi:
+    image: swaggerapi/swagger-ui
+    environment:
+      - "URL=/openapi.yml"
+    ports:
+      - "8002:8080"
+    volumes:
+      - "../docs/specs/nodeinfo21/schema.yml:/usr/share/nginx/html/openapi.yml"
+    #  - "../docs/api:/usr/share/nginx/html/api"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.test-funkwhale-openapi-web.rule=Host(`openapi.funkwhale.test`)"
+      - "traefik.http.routers.test-funkwhale-openapi-web.entrypoints=web"
+      - "traefik.http.services.test-funkwhale-openapi.loadbalancer.server.port=8080"
+      - "traefik.http.routers.test-funkwhale-openapi-webs.rule=Host(`openapi.funkwhale.test`)"
+      - "traefik.http.routers.test-funkwhale-openapi-webs.entrypoints=webs"
+      - "traefik.http.routers.test-funkwhale-openapi-webs.tls=true"
+    networks: ["web"]