diff --git a/bookshop/app/index.cds b/bookshop/app/services.cds
similarity index 100%
rename from bookshop/app/index.cds
rename to bookshop/app/services.cds
diff --git a/fiori/app/admin/fiori-service.cds b/fiori/app/admin/fiori-service.cds
index 8e97fdbe..d1c2b50a 100644
--- a/fiori/app/admin/fiori-service.cds
+++ b/fiori/app/admin/fiori-service.cds
@@ -70,7 +70,7 @@ annotate AdminService.Authors with @(
 annotate sap.capire.bookshop.Books with @fiori.draft.enabled;
 annotate AdminService.Books with @odata.draft.enabled;
 
-annotate AdminService.Books_texts with @(
+annotate AdminService.Books.texts with @(
 	UI: {
 		Identification: [{Value:title}],
 		SelectionFields: [ locale, title ],
@@ -83,7 +83,7 @@ annotate AdminService.Books_texts with @(
 );
 
 // Add Value Help for Locales
-annotate AdminService.Books_texts {
+annotate AdminService.Books.texts {
 	locale @ValueList:{entity:'Languages',type:#fixed}
 }
 // In addition we need to expose Languages through AdminService
diff --git a/fiori/package.json b/fiori/package.json
index 1cd47e4f..57985f96 100644
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -7,8 +7,8 @@
     "@capire/orders": "*",
     "@capire/reviews": "*",
     "@capire/suppliers": "*",
-    "@sap/cds": ">=4",
-    "express": "^4",
+    "@sap/cds": "^5",
+    "express": "^4.17.1",
     "passport": "^0.4.1"
   },
   "scripts": {
diff --git a/orders/package.json b/orders/package.json
index 87cd62cd..7415f469 100644
--- a/orders/package.json
+++ b/orders/package.json
@@ -2,6 +2,6 @@
   "name": "@capire/orders",
   "version": "1.0.0",
   "dependencies": {
-    "@sap/cds": ">=4.3.0"
+    "@sap/cds": "^5"
   }
 }
\ No newline at end of file
diff --git a/reviews/package.json b/reviews/package.json
index 746d279e..b91edfba 100644
--- a/reviews/package.json
+++ b/reviews/package.json
@@ -7,7 +7,7 @@
     "index.cds"
   ],
   "dependencies": {
-    "@sap/cds": ">=4",
+    "@sap/cds": "^5",
     "express": "^4.17.1"
   },
   "scripts": {
diff --git a/test/custom-handlers.test.js b/test/custom-handlers.test.js
index f8541a18..80b9ed71 100644
--- a/test/custom-handlers.test.js
+++ b/test/custom-handlers.test.js
@@ -6,13 +6,9 @@ else cds.User = cds.User.Privileged // hard core monkey patch for older cds rele
 describe('Custom Handlers', () => {
 
   it('should reject out-of-stock orders', async () => {
-    await expect(
-      Promise.all([
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
-      ])
-    ).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
+    await POST('/browse/submitOrder', { book: 201, amount: 5 })
+    await POST('/browse/submitOrder', { book: 201, amount: 5 })
+    await expect(POST('/browse/submitOrder', { book: 201, amount: 5 })).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
     const { data } = await GET`/admin/Books/201/stock/$value`
     expect(data).to.equal(2)
   })