diff --git a/samples/cds-sample-application/package-lock.json b/samples/cds-sample-application/package-lock.json
index 28ba1ac0..e7f0b512 100644
--- a/samples/cds-sample-application/package-lock.json
+++ b/samples/cds-sample-application/package-lock.json
@@ -14,7 +14,7 @@
         "@nestjs/core": "^8.4.7",
         "@nestjs/platform-express": "^8.4.7",
         "@sap-cloud-sdk/odata-v2": "^3.22.2",
-        "@sap/cds": "6.1.3",
+        "@sap/cds": "8.4.2",
         "@sap/cds-dk": "7.9.4",
         "passport": "^0.7.0",
         "reflect-metadata": "^0.1.14",
@@ -2209,24 +2209,36 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.1.3.tgz",
-      "integrity": "sha512-yvL9lPonVwUx9Md1eylAtpY0JrlSMyoxZXnCA2q9lNoVNudmjPMynO5CJBfAYEaThZSqd2yMJg/+xyKy/mn3wg==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-8.4.2.tgz",
+      "integrity": "sha512-wHiPU+PciyG6L7oGglUq22ji+aV5SFwef/gF/rnIheMirzxpDlHq+K8GwqmcrrFu3GWRioQGRe3rr8KAalOQrg==",
       "dependencies": {
-        "@sap/cds-compiler": "^3.0.0",
-        "@sap/cds-foss": "^4"
+        "@sap/cds-compiler": ">=5.1",
+        "@sap/cds-fiori": "^1",
+        "@sap/cds-foss": "^5.0.0"
       },
       "bin": {
-        "cds": "bin/cds.js"
+        "cds-deploy": "lib/dbs/cds-deploy.js",
+        "cds-serve": "bin/serve.js",
+        "cds-test": "bin/test.js",
+        "chest": "bin/test.js"
       },
       "engines": {
-        "node": ">=14.15.0"
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "express": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "express": {
+          "optional": true
+        }
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-3.6.2.tgz",
-      "integrity": "sha512-S7Xf9Ts02G8bMwAAJ0ncrv+nypdSKI0WFEmQqq/lj1HXi/T/drR5MOyMiXtPdEYthqhe2dhvvtP3XDMFYWo/Mw==",
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-5.4.2.tgz",
+      "integrity": "sha512-Y8S5E0VYmaHSfi+yKFR4728Ve5cACP1JcvETI0fGtH6J97kvwE3J5Fj1BfBEotGXGQt356kRsb+Qp/P3Yp44uQ==",
       "dependencies": {
         "antlr4": "4.9.3"
       },
@@ -2236,7 +2248,7 @@
         "cdsse": "bin/cdsse.js"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       }
     },
     "node_modules/@sap/cds-dk": {
@@ -5535,16 +5547,24 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@sap/cds-fiori": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@sap/cds-fiori/-/cds-fiori-1.2.7.tgz",
+      "integrity": "sha512-F6Uf9wvkv0fXW+Fh7PiV2BbB/k+p1cFJLkQCCKDRJH8HvlxWEcXcn/YIvBrQGuX+GToi125MxB3wd712d8OLTA==",
+      "peerDependencies": {
+        "@sap/cds": ">=7.6",
+        "express": ">=4"
+      }
+    },
     "node_modules/@sap/cds-foss": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@sap/cds-foss/-/cds-foss-4.0.0.tgz",
-      "integrity": "sha512-66enuhyx+SdcIgdYstLGk31GFWDyK+Ch5+bWFRYJJ8340izZJlgyCYtHjZI1m9j4tNxWg9ZhkbFkXG5d80xWdw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@sap/cds-foss/-/cds-foss-5.0.1.tgz",
+      "integrity": "sha512-q6h7LkEx6w9LswCIQzJJ2mnoyeGS8jrmBXN4I4+aECRL60mkLskoqGetot+2tX2xXGxCYJuo5v1dtSafwBqTRQ==",
       "dependencies": {
         "big.js": "^6.1.1",
         "generic-pool": "^3.8.2",
-        "uuid": "^8.3.2",
         "xmlbuilder": "^15.1.1",
-        "yaml": "^2.1.1"
+        "yaml": "^2.2.2"
       },
       "engines": {
         "node": ">=14"
@@ -6731,9 +6751,9 @@
       ]
     },
     "node_modules/big.js": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-6.2.1.tgz",
-      "integrity": "sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-6.2.2.tgz",
+      "integrity": "sha512-y/ie+Faknx7sZA5MfGA2xKlu0GDv8RWrXGsmlteyJQ2lvoKv9GBK/fpRMc2qlSoBAgNxrixICFCBefIq8WCQpQ==",
       "engines": {
         "node": "*"
       },
@@ -14047,9 +14067,12 @@
       "dev": true
     },
     "node_modules/yaml": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
-      "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
+      "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
       "engines": {
         "node": ">= 14"
       }
@@ -15738,18 +15761,19 @@
       }
     },
     "@sap/cds": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-6.1.3.tgz",
-      "integrity": "sha512-yvL9lPonVwUx9Md1eylAtpY0JrlSMyoxZXnCA2q9lNoVNudmjPMynO5CJBfAYEaThZSqd2yMJg/+xyKy/mn3wg==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-8.4.2.tgz",
+      "integrity": "sha512-wHiPU+PciyG6L7oGglUq22ji+aV5SFwef/gF/rnIheMirzxpDlHq+K8GwqmcrrFu3GWRioQGRe3rr8KAalOQrg==",
       "requires": {
-        "@sap/cds-compiler": "^3.0.0",
-        "@sap/cds-foss": "^4"
+        "@sap/cds-compiler": ">=5.1",
+        "@sap/cds-fiori": "^1",
+        "@sap/cds-foss": "^5.0.0"
       }
     },
     "@sap/cds-compiler": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-3.6.2.tgz",
-      "integrity": "sha512-S7Xf9Ts02G8bMwAAJ0ncrv+nypdSKI0WFEmQqq/lj1HXi/T/drR5MOyMiXtPdEYthqhe2dhvvtP3XDMFYWo/Mw==",
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-5.4.2.tgz",
+      "integrity": "sha512-Y8S5E0VYmaHSfi+yKFR4728Ve5cACP1JcvETI0fGtH6J97kvwE3J5Fj1BfBEotGXGQt356kRsb+Qp/P3Yp44uQ==",
       "requires": {
         "antlr4": "4.9.3"
       }
@@ -17719,16 +17743,21 @@
         }
       }
     },
+    "@sap/cds-fiori": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@sap/cds-fiori/-/cds-fiori-1.2.7.tgz",
+      "integrity": "sha512-F6Uf9wvkv0fXW+Fh7PiV2BbB/k+p1cFJLkQCCKDRJH8HvlxWEcXcn/YIvBrQGuX+GToi125MxB3wd712d8OLTA==",
+      "requires": {}
+    },
     "@sap/cds-foss": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@sap/cds-foss/-/cds-foss-4.0.0.tgz",
-      "integrity": "sha512-66enuhyx+SdcIgdYstLGk31GFWDyK+Ch5+bWFRYJJ8340izZJlgyCYtHjZI1m9j4tNxWg9ZhkbFkXG5d80xWdw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@sap/cds-foss/-/cds-foss-5.0.1.tgz",
+      "integrity": "sha512-q6h7LkEx6w9LswCIQzJJ2mnoyeGS8jrmBXN4I4+aECRL60mkLskoqGetot+2tX2xXGxCYJuo5v1dtSafwBqTRQ==",
       "requires": {
         "big.js": "^6.1.1",
         "generic-pool": "^3.8.2",
-        "uuid": "^8.3.2",
         "xmlbuilder": "^15.1.1",
-        "yaml": "^2.1.1"
+        "yaml": "^2.2.2"
       }
     },
     "@sap/xsenv": {
@@ -18707,9 +18736,9 @@
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "big.js": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-6.2.1.tgz",
-      "integrity": "sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ=="
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-6.2.2.tgz",
+      "integrity": "sha512-y/ie+Faknx7sZA5MfGA2xKlu0GDv8RWrXGsmlteyJQ2lvoKv9GBK/fpRMc2qlSoBAgNxrixICFCBefIq8WCQpQ=="
     },
     "bignumber.js": {
       "version": "9.1.2",
@@ -24121,9 +24150,9 @@
       "dev": true
     },
     "yaml": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
-      "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw=="
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
+      "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ=="
     },
     "yargs": {
       "version": "17.7.2",
diff --git a/samples/cds-sample-application/package.json b/samples/cds-sample-application/package.json
index 4de81d19..58251887 100644
--- a/samples/cds-sample-application/package.json
+++ b/samples/cds-sample-application/package.json
@@ -31,7 +31,7 @@
     "@nestjs/common": "^8.4.7",
     "@nestjs/core": "^8.4.7",
     "@nestjs/platform-express": "^8.4.7",
-    "@sap/cds": "6.1.3",
+    "@sap/cds": "8.4.2",
     "@sap/cds-dk": "7.9.4",
     "passport": "^0.7.0",
     "reflect-metadata": "^0.1.14",