diff --git a/package-lock.json b/package-lock.json
index 0688e220d..74776c375 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "devDependencies": {
         "@cap-js/cds-typer": "^0",
         "@cap-js/cds-types": "^0",
-        "@sap/cds": "^8",
+        "@sap/cds": "^9.0.0",
         "@shikijs/vitepress-twoslash": "^2.0.0",
         "@types/adm-zip": ">=0.5.0",
         "@types/express": "^4.17.21",
@@ -2215,23 +2215,22 @@
       ]
     },
     "node_modules/@sap/cds": {
-      "version": "8.9.4",
-      "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-8.9.4.tgz",
-      "integrity": "sha512-pgEx855xxtrBkYEtvWOLHqBCvFePbV4ERCpssDn7K4G8WipoXMcOPCkAYq1aP+OVpjz2WMb3p7QSwu4qHwWFKw==",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-9.0.3.tgz",
+      "integrity": "sha512-9bMeDY66A8Eh+AkmemK1EdDmquswofn7qISNp9SGiIJ1cmF1LtysiAjs9IR/taHnv7IEacvHUK+A7X3VDm0iQg==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@sap/cds-compiler": "^5",
-        "@sap/cds-fiori": "^1",
-        "@sap/cds-foss": "^5.0.0"
+        "@sap/cds-compiler": "^6",
+        "@sap/cds-fiori": "^2",
+        "js-yaml": "^4.1.0"
       },
       "bin": {
         "cds-deploy": "lib/dbs/cds-deploy.js",
-        "cds-serve": "bin/serve.js",
-        "cds-test": "bin/test.js"
+        "cds-serve": "bin/serve.js"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       },
       "peerDependencies": {
         "@eslint/js": "^9",
@@ -2248,50 +2247,31 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-5.6.0.tgz",
-      "integrity": "sha512-MYhAQNkSQPwi16q738edpHP9JcVH8gunm15+02nQu1Rz59PQDcj7GcWqyb4EGQklKRyMUg/5J4zXKaH1RxKqgA==",
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-6.0.12.tgz",
+      "integrity": "sha512-7X68zXRJNjJfVFI7Qesp/YrCVTNCvmuGLRxdBSbpiZkgz6Wq9q4iTMeUg+8NcCynv+KaS6x1hSDfAEWTL0iLDA==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
-      "dependencies": {
-        "antlr4": "4.9.3"
-      },
       "bin": {
         "cdsc": "bin/cdsc.js",
         "cdshi": "bin/cdshi.js",
         "cdsse": "bin/cdsse.js"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "node_modules/@sap/cds-fiori": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@sap/cds-fiori/-/cds-fiori-1.2.8.tgz",
-      "integrity": "sha512-UXvsd4pGxnrxMBDO3HWLHFYhkVIsz3F15ePrAqHpeUKXw42ToCFFu+QJTbhKtONKlxoW1DVDobga4K1dvSyzrw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@sap/cds-fiori/-/cds-fiori-2.0.1.tgz",
+      "integrity": "sha512-KZVLWXndydgqdlao8OL1gtgd/XMgBdiKBmmgwGpBL1y4S21FOXglnWh6d3bnSZL/qwR3z50D+0PoGghjhayF0Q==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
-        "@sap/cds": ">=7.6",
+        "@sap/cds": ">=8",
         "express": ">=4"
       }
     },
-    "node_modules/@sap/cds-foss": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@sap/cds-foss/-/cds-foss-5.0.1.tgz",
-      "integrity": "sha512-q6h7LkEx6w9LswCIQzJJ2mnoyeGS8jrmBXN4I4+aECRL60mkLskoqGetot+2tX2xXGxCYJuo5v1dtSafwBqTRQ==",
-      "dev": true,
-      "license": "See LICENSE in LICENSE",
-      "dependencies": {
-        "big.js": "^6.1.1",
-        "generic-pool": "^3.8.2",
-        "xmlbuilder": "^15.1.1",
-        "yaml": "^2.2.2"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/@shikijs/core": {
       "version": "1.26.1",
       "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.26.1.tgz",
@@ -3311,16 +3291,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/antlr4": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/antlr4/-/antlr4-4.9.3.tgz",
-      "integrity": "sha512-qNy2odgsa0skmNMCuxzXhM4M8J1YDaPv3TI+vCdnOAanu0N982wBrSqziDKRDctEZLZy9VffqIZXc0UGjjSP/g==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -3350,20 +3320,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/big.js": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-6.2.2.tgz",
-      "integrity": "sha512-y/ie+Faknx7sZA5MfGA2xKlu0GDv8RWrXGsmlteyJQ2lvoKv9GBK/fpRMc2qlSoBAgNxrixICFCBefIq8WCQpQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/bigjs"
-      }
-    },
     "node_modules/birpc": {
       "version": "0.2.19",
       "resolved": "https://registry.npmjs.org/birpc/-/birpc-0.2.19.tgz",
@@ -4952,16 +4908,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/generic-pool": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz",
-      "integrity": "sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/gensequence": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/gensequence/-/gensequence-7.0.0.tgz",
@@ -8963,16 +8909,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/xmlbuilder": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
-      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/yaml": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
diff --git a/package.json b/package.json
index 28d3310f6..e227af9a3 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@cap-js/cds-typer": "^0",
     "@cap-js/cds-types": "^0",
-    "@sap/cds": "^8",
+    "@sap/cds": "^9.0.0",
     "@shikijs/vitepress-twoslash": "^2.0.0",
     "@types/adm-zip": ">=0.5.0",
     "@types/express": "^4.17.21",