diff --git a/services/groupware/.gitignore b/services/groupware/.gitignore
index 36cb322bf..9989a9005 100644
--- a/services/groupware/.gitignore
+++ b/services/groupware/.gitignore
@@ -1,5 +1,4 @@
 /swagger.yml
-/openapi.yml
 /api.html
 /api.html.template
 /node_modules
diff --git a/services/groupware/Makefile b/services/groupware/Makefile
index fbd81785e..da501552c 100644
--- a/services/groupware/Makefile
+++ b/services/groupware/Makefile
@@ -21,10 +21,8 @@ node_modules:
 	pnpm install
 
 .PHONY: swagger.yml
-swagger.yml:	apidoc.yml tsnode openapi.yml
-	#swagger generate spec --include='groupware' --include='jmap' --include='jscalendar' --include='jscontact' --scan-models --input=$< | NODE_OPTIONS='--no-warnings --loader ts-node/esm' pnpm exec ts-node apidoc-process.ts > $@
-	#NODE_OPTIONS='--no-warnings --loader ts-node/esm' pnpm exec ts-node apidoc-process.ts > $@ < openapi.yml
-	cp openapi.yml $@
+swagger.yml: apidoc.yml
+	groupware-apidocs -C ../../ -t $< > $@
 
 APIDOC_PORT=9999