diff --git a/demo/BaseComponent/.gitignore b/demo/.gitignore
similarity index 100%
rename from demo/BaseComponent/.gitignore
rename to demo/.gitignore
diff --git a/demo/BaseComponent/package.json b/demo/BaseComponent/package.json
index 0b0a52270..fb36143bf 100644
--- a/demo/BaseComponent/package.json
+++ b/demo/BaseComponent/package.json
@@ -23,7 +23,7 @@
     "ui5-component"
   ],
   "devDependencies": {
-   "eslint": "^9.0.0",
+    "eslint": "^9.0.0",
     "@ui5/cli": "^3.9.2",
     "local-web-server": "^5.3.3",
     "karma": "^6.4.3",
diff --git a/demo/CategoriesComponent/.gitignore b/demo/CategoriesComponent/.gitignore
deleted file mode 100644
index 548b5b27d..000000000
--- a/demo/CategoriesComponent/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules/
-dist/
-.DS_Store
-coverage/
\ No newline at end of file
diff --git a/demo/CategoriesComponent/package.json b/demo/CategoriesComponent/package.json
index 9791ecf91..90df2ae23 100644
--- a/demo/CategoriesComponent/package.json
+++ b/demo/CategoriesComponent/package.json
@@ -8,7 +8,7 @@
     "build": "ui5 build -a --clean-dest",
     "serve": "ws --compress -d dist",
     "test": "npm run lint && rimraf coverage && npm run karma-ci",
-    "lint": "eslint webapp",
+    "lint": "eslint src",
     "karma": "karma start",
     "karma-ci": "karma start karma-ci.conf.js"
   },
@@ -29,7 +29,7 @@
     "my-lib-sample-products-component": "^0.0.1"
   },
   "devDependencies": {
-   "eslint": "^9.0.0",
+    "eslint": "^9.0.0",
     "@ui5/cli": "^3.9.2",
     "local-web-server": "^5.3.3",
     "karma": "^6.4.3",
diff --git a/demo/ProductsComponent/.gitignore b/demo/ProductsComponent/.gitignore
deleted file mode 100644
index 548b5b27d..000000000
--- a/demo/ProductsComponent/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules/
-dist/
-.DS_Store
-coverage/
\ No newline at end of file
diff --git a/demo/ProductsComponent/package.json b/demo/ProductsComponent/package.json
index 25cc2c8de..e77896373 100644
--- a/demo/ProductsComponent/package.json
+++ b/demo/ProductsComponent/package.json
@@ -8,7 +8,7 @@
     "build": "ui5 build -a --clean-dest",
     "serve": "ws --compress -d dist",
     "test": "npm run lint && rimraf coverage && npm run karma-ci",
-    "lint": "eslint webapp",
+    "lint": "eslint src",
     "karma": "karma start",
     "karma-ci": "karma start karma-ci.conf.js"
   },
@@ -28,7 +28,7 @@
     "my-lib-sample-base-component": "^0.0.1"
   },
   "devDependencies": {
-   "eslint": "^9.0.0",
+    "eslint": "^9.0.0",
     "@ui5/cli": "^3.9.2",
     "local-web-server": "^5.3.3",
     "karma": "^6.4.3",
diff --git a/demo/RootComponent/.eslintrc b/demo/RootComponent/.eslintrc
deleted file mode 100644
index d2aa45d4d..000000000
--- a/demo/RootComponent/.eslintrc
+++ /dev/null
@@ -1,10 +0,0 @@
-  
-{
-	"env": {
-		"browser": true
-	},
-	"globals": {
-		"sap": true,
-		"jQuery": true
-    }
-}
\ No newline at end of file
diff --git a/demo/RootComponent/.gitignore b/demo/RootComponent/.gitignore
deleted file mode 100644
index 548b5b27d..000000000
--- a/demo/RootComponent/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules/
-dist/
-.DS_Store
-coverage/
\ No newline at end of file
diff --git a/demo/RootComponent/package.json b/demo/RootComponent/package.json
index 28fedc369..9ea01d327 100644
--- a/demo/RootComponent/package.json
+++ b/demo/RootComponent/package.json
@@ -31,7 +31,7 @@
     "my-lib-sample-products-component": "^0.0.1"
   },
   "devDependencies": {
-   "eslint": "^9.0.0",
+    "eslint": "^9.0.0",
     "@ui5/cli": "^3.9.2",
     "local-web-server": "^5.3.3",
     "karma": "^6.4.3",
diff --git a/demo/SuppliersComponent/package.json b/demo/SuppliersComponent/package.json
index 6b9d85256..e02c17bdf 100644
--- a/demo/SuppliersComponent/package.json
+++ b/demo/SuppliersComponent/package.json
@@ -8,7 +8,7 @@
     "build": "ui5 build -a --clean-dest",
     "serve": "ws --compress -d dist",
     "test": "npm run lint && rimraf coverage && npm run karma-ci",
-    "lint": "eslint webapp",
+    "lint": "eslint src",
     "karma": "karma start",
     "karma-ci": "karma start karma-ci.conf.js"
   },
diff --git a/demo/eslint.config.mjs b/demo/eslint.config.mjs
new file mode 100644
index 000000000..9448000e1
--- /dev/null
+++ b/demo/eslint.config.mjs
@@ -0,0 +1,14 @@
+import js from "@eslint/js";
+
+export default [
+	js.configs.recommended,
+	js.configs.all,
+	{
+		languageOptions: {
+			globals: {
+				jQuery: true,
+				sap: true
+			}
+		}
+	}
+]
diff --git a/demo/package.json b/demo/package.json
index 4c001376f..f685a1489 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -4,7 +4,9 @@
   "version": "1.0.0",
   "description": "ui5-nested-component-scenario demo",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint": "npm run lint --workspaces --if-present",
+    "lint:fix": "npm run lint:fix --workspaces --if-present"
   },
   "workspaces": [
     "BaseComponent",
@@ -13,6 +15,7 @@
     "SuppliersComponent",
     "RootComponent"
   ],
+
   "author": "Jiawei Cao, Florian Vogt",
   "license": "Apache-2.0"
 }