diff --git a/.eslintrc b/.eslintrc
index aaf7f04f..3589f2c5 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,5 +1,8 @@
 {
-    "extends": "eslint:recommended",
+    "extends": [
+        "eslint:recommended",
+        "plugin:@sap/cds/recommended"
+    ],
     "env": {
         "browser": true,
         "es2022": true,
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 70b6c043..a31bd518 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -14,5 +14,14 @@
       "**/odata-v4/okra/**"
     ]
   },
-  "mochaExplorer.parallel": true
-}
+  "mochaExplorer.parallel": true,
+  "eslint.validate": [
+    "cds",
+    "csn",
+    "csv",
+    "csv (semicolon)",
+    "tsv",
+    "tab"
+  ],
+  "eslint.run": "onSave"
+}
\ No newline at end of file
diff --git a/fiori-ext/.vscode/settings.json b/fiori-ext/.vscode/settings.json
new file mode 100644
index 00000000..09523d88
--- /dev/null
+++ b/fiori-ext/.vscode/settings.json
@@ -0,0 +1,11 @@
+{
+  "eslint.validate": [
+    "cds",
+    "csn",
+    "csv",
+    "csv",
+    "csv (semicolon)",
+    "tsv",
+    "tab"
+  ]
+}
\ No newline at end of file
diff --git a/fiori-ext/package.json b/fiori-ext/package.json
index 6647af4b..8934d234 100644
--- a/fiori-ext/package.json
+++ b/fiori-ext/package.json
@@ -9,7 +9,8 @@
     "@sap/cds": "^6"
   },
   "devDependencies": {
-    "sqlite3": "^5.0.4"
+    "sqlite3": "^5.0.4",
+    "@sap/eslint-plugin-cds": "^2.5.0"
   },
   "scripts": {
     "start": "cds run"
@@ -18,7 +19,10 @@
     "extends": "@capire/fiori"
   },
   "eslintConfig": {
-    "extends": "eslint:recommended",
+    "extends": [
+      "eslint:recommended",
+      "plugin:@sap/cds/recommended"
+    ],
     "env": {
       "es2020": true,
       "node": true,
@@ -42,4 +46,4 @@
       "require-atomic-updates": "off"
     }
   }
-}
+}
\ No newline at end of file