diff --git a/package.json b/package.json
index c16d4493..5ecc947e 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,6 @@
     "@types/jsonwebtoken": "^9.0.7",
     "@types/mock-fs": "^4.13.4",
     "@types/node": "^20.17.3",
-    "@cap-js/cds-types": "^0.7.0",
     "depcheck": "^1.4.7",
     "eslint": "^9.13.0",
     "glob": "^11.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d94137f6..4de1b62c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,9 +10,6 @@ importers:
 
   .:
     devDependencies:
-      '@cap-js/cds-types':
-        specifier: ^0.7.0
-        version: 0.7.0(@sap/cds@8.4.0(express@4.21.1))
       '@changesets/cli':
         specifier: ^2.27.9
         version: 2.27.9
@@ -187,6 +184,10 @@ importers:
       express:
         specifier: ^4
         version: 4.21.1
+    devDependencies:
+      '@cap-js/cds-types':
+        specifier: ^0.7.0
+        version: 0.7.0(@sap/cds@8.3.1(express@4.21.1))
 
   sample-code:
     dependencies:
@@ -1053,16 +1054,6 @@ packages:
       express:
         optional: true
 
-  '@sap/cds@8.4.0':
-    resolution: {integrity: sha512-nJzDmoyZVcnACZ2gHL03LRNZCDMV6fEW4t0PFg6cdvRAIiKl0s9/0zKp8kVDJpm6a+k5yvDx8nW2O10KqpMIVQ==}
-    engines: {node: '>=18'}
-    hasBin: true
-    peerDependencies:
-      express: '>=4'
-    peerDependenciesMeta:
-      express:
-        optional: true
-
   '@sap/xsenv@5.3.0':
     resolution: {integrity: sha512-2UqioTBYe7XTvrskulaqVvoQ8WUA06Ofumxfa545DlB9gZyvvdL0ncQDU9EWrqFKE6U/e+kdQRpaMfRnrM5ykQ==}
     engines: {node: ^18.0.0 || ^20.0.0}
@@ -4631,9 +4622,9 @@ snapshots:
 
   '@bcoe/v8-coverage@0.2.3': {}
 
-  '@cap-js/cds-types@0.7.0(@sap/cds@8.4.0(express@4.21.1))':
+  '@cap-js/cds-types@0.7.0(@sap/cds@8.3.1(express@4.21.1))':
     dependencies:
-      '@sap/cds': 8.4.0(express@4.21.1)
+      '@sap/cds': 8.3.1(express@4.21.1)
       '@types/express': 4.17.21
 
   '@changesets/apply-release-plan@7.0.5':
@@ -5482,11 +5473,6 @@ snapshots:
       '@sap/cds': 8.3.1(express@4.21.1)
       express: 4.21.1
 
-  '@sap/cds-fiori@1.2.7(@sap/cds@8.4.0(express@4.21.1))(express@4.21.1)':
-    dependencies:
-      '@sap/cds': 8.4.0(express@4.21.1)
-      express: 4.21.1
-
   '@sap/cds-foss@5.0.1':
     dependencies:
       big.js: 6.2.2
@@ -5502,14 +5488,6 @@ snapshots:
     optionalDependencies:
       express: 4.21.1
 
-  '@sap/cds@8.4.0(express@4.21.1)':
-    dependencies:
-      '@sap/cds-compiler': 5.3.2
-      '@sap/cds-fiori': 1.2.7(@sap/cds@8.4.0(express@4.21.1))(express@4.21.1)
-      '@sap/cds-foss': 5.0.1
-    optionalDependencies:
-      express: 4.21.1
-
   '@sap/xsenv@5.3.0':
     dependencies:
       debug: 4.3.7(supports-color@8.1.1)
diff --git a/sample-cap/package.json b/sample-cap/package.json
index 071962fa..e991e53b 100644
--- a/sample-cap/package.json
+++ b/sample-cap/package.json
@@ -12,6 +12,9 @@
     "@sap/cds": "^8",
     "express": "^4"
   },
+  "devDependencies": {
+    "@cap-js/cds-types": "^0.7.0"
+  },
   "scripts": {
     "build": "tsc -b",
     "watch": "cds-tsx watch",