diff --git a/bookshop/package.json b/bookshop/package.json
index 7e8717f2..b4896b7e 100644
--- a/bookshop/package.json
+++ b/bookshop/package.json
@@ -11,7 +11,7 @@
     "genres": "cds serve test/genres.cds",
     "start": "cds run",
     "watch": "cds watch",
-    "to-openapi": "cds compile srv --to openapi -s CatalogService -o srv --openapi:diagram && mv srv/srv.openapi3.json srv/CatalogService.openapi3.json"
+    "to-openapi": "cds compile srv --to openapi -s all -o srv --openapi:diagram"
   },
   "cds": {
     "requires": {