diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index a471bfa9471..00000000000
--- a/.eslintignore
+++ /dev/null
@@ -1,7 +0,0 @@
-dist/*
-build/*
-coverage/*
-public/*
-.github/*
-node_modules/*
-.vscode/*
\ No newline at end of file
diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index e1f6ba9ee32..00000000000
--- a/.eslintrc
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "parser": "@typescript-eslint/parser", // Specifies the ESLint parser for TypeScript
-  "plugins": ["@typescript-eslint", "import"], // Includes TypeScript and import plugins
-  "overrides": [
-    {
-      "files": ["src/**/*.{ts,tsx,js,jsx}"], // Applies these rules to all TypeScript and JavaScript files in the src directory
-      "rules": {
-        // General rules that apply to all files
-        "eqeqeq": ["error", "always"], // Enforces the use of === and !== instead of == and !=
-        "indent": ["error", 2], // Enforces a 2-space indentation
-        "quotes": ["error", "double"], // Enforces the use of double quotes for strings
-        "no-var": "error", // Disallows the use of var, enforcing let or const instead
-        "prefer-const": "error", // Prefers the use of const for variables that are never reassigned
-        "no-undef": "off", // Disables the rule that disallows the use of undeclared variables (TypeScript handles this)
-        "@typescript-eslint/no-unused-vars": [ "error", {
-          "args": "none", // Allows unused function parameters. Useful for functions with specific signatures where not all parameters are always used.
-          "ignoreRestSiblings": true // Allows unused variables that are part of a rest property in object destructuring. Useful for excluding certain properties from an object while using the rest.
-        }],
-        "eol-last": ["error", "always"], // Enforces at least one newline at the end of files
-        "@typescript-eslint/semi": ["error", "always"], // Requires semicolons for TypeScript-specific syntax
-        "semi": "off", // Disables the general semi rule for TypeScript files
-        "@typescript-eslint/no-extra-semi": ["error"], // Disallows unnecessary semicolons for TypeScript-specific syntax
-        "brace-style": "off", // Note: you must disable the base rule as it can report incorrect errors
-        "curly": ["error", "all"], // Enforces the use of curly braces for all control statements
-        "@typescript-eslint/brace-style": ["error", "1tbs"],
-        "no-trailing-spaces": ["error", { // Disallows trailing whitespace at the end of lines
-          "skipBlankLines": false, // Enforces the rule even on blank lines
-          "ignoreComments": false // Enforces the rule on lines containing comments
-        }],
-        "space-before-blocks": ["error", "always"], // Enforces a space before blocks
-        "keyword-spacing": ["error", { "before": true, "after": true }] // Enforces spacing before and after keywords
-      }
-    }
-  ]
-}
diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
index 5dab0886d59..32c0ca7707a 100644
--- a/.github/workflows/eslint.yml
+++ b/.github/workflows/eslint.yml
@@ -28,4 +28,4 @@ jobs:
         run: npm ci  # Use 'npm ci' to install dependencies
 
       - name: eslint  # Step to run linters
-        uses: icrawl/action-eslint@v1
\ No newline at end of file
+        run: npm run eslint-ci
\ No newline at end of file
diff --git a/eslint.config.js b/eslint.config.js
new file mode 100644
index 00000000000..d04b7a7176d
--- /dev/null
+++ b/eslint.config.js
@@ -0,0 +1,42 @@
+import tseslint from '@typescript-eslint/eslint-plugin';
+import parser from '@typescript-eslint/parser';
+import imports from 'eslint-plugin-import';
+
+export default [ 
+    {
+        files: ["src/**/*.{ts,tsx,js,jsx}"],
+        ignores: ["dist/*", "build/*", "coverage/*", "public/*", ".github/*", "node_modules/*", ".vscode/*"],
+        languageOptions: {
+            parser: parser
+        },
+        plugins: {
+            imports: imports.configs.recommended,
+            '@typescript-eslint': tseslint
+        },
+        rules: {
+            "eqeqeq": ["error", "always"], // Enforces the use of === and !== instead of == and !=
+            "indent": ["error", 2], // Enforces a 2-space indentation
+            "quotes": ["error", "double"], // Enforces the use of double quotes for strings
+            "no-var": "error", // Disallows the use of var, enforcing let or const instead
+            "prefer-const": "error", // Prefers the use of const for variables that are never reassigned
+            "no-undef": "off", // Disables the rule that disallows the use of undeclared variables (TypeScript handles this)
+            "@typescript-eslint/no-unused-vars": [ "error", {
+                "args": "none", // Allows unused function parameters. Useful for functions with specific signatures where not all parameters are always used.
+                "ignoreRestSiblings": true // Allows unused variables that are part of a rest property in object destructuring. Useful for excluding certain properties from an object while using the rest.
+            }],
+            "eol-last": ["error", "always"], // Enforces at least one newline at the end of files
+            "@typescript-eslint/semi": ["error", "always"], // Requires semicolons for TypeScript-specific syntax
+            "semi": "off", // Disables the general semi rule for TypeScript files
+            "no-extra-semi": ["error"], // Disallows unnecessary semicolons for TypeScript-specific syntax
+            "brace-style": "off", // Note: you must disable the base rule as it can report incorrect errors
+            "curly": ["error", "all"], // Enforces the use of curly braces for all control statements
+            "@typescript-eslint/brace-style": ["error", "1tbs"],
+            "no-trailing-spaces": ["error", { // Disallows trailing whitespace at the end of lines
+                "skipBlankLines": false, // Enforces the rule even on blank lines
+                "ignoreComments": false // Enforces the rule on lines containing comments
+            }],
+            "space-before-blocks": ["error", "always"], // Enforces a space before blocks
+            "keyword-spacing": ["error", { "before": true, "after": true }] // Enforces spacing before and after keywords
+        }
+    }
+]
diff --git a/package.json b/package.json
index a477bbe8cbf..49577e0192d 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,8 @@
 		"test": "vitest run",
 		"test:cov": "vitest run --coverage",
 		"test:watch": "vitest watch --coverage",
-		"eslint": "eslint --fix ."
+		"eslint": "eslint --fix .",
+		"eslint-ci": "eslint ."
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.3.0",