diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000000000..288473096
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,8 @@
+{
+  "extends": ["next/core-web-vitals", "next/typescript"],
+  "rules": {
+    "@typescript-eslint/no-explicit-any": "off",
+    "@next/next/no-img-element": "off",
+    "react-hooks/exhaustive-deps": "off"
+  }
+}
diff --git a/.prettierrc.json b/.prettierrc.json
new file mode 100644
index 000000000..55490b2db
--- /dev/null
+++ b/.prettierrc.json
@@ -0,0 +1,12 @@
+{
+  "semi": false,
+  "singleQuote": false,
+  "printWidth": 100,
+  "tabWidth": 2,
+  "trailingComma": "all",
+  "importOrder": ["^@core/(.*)$", "^@server/(.*)$", "^@ui/(.*)$", "^[./]"],
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true,
+  "endOfLine": "auto",
+  "plugins": ["prettier-plugin-tailwindcss", "@trivago/prettier-plugin-sort-imports"]
+}
diff --git a/.prettierrc.mjs b/.prettierrc.mjs
deleted file mode 100644
index f3f80054a..000000000
--- a/.prettierrc.mjs
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  semi: false,
-  singleQuote: false,
-  printWidth: 100,
-  tabWidth: 2,
-  trailingComma: "all",
-  importOrder: ["^@core/(.*)$", "^@server/(.*)$", "^@ui/(.*)$", "^[./]"],
-  importOrderSeparation: true,
-  importOrderSortSpecifiers: true,
-  endOfLine: "auto",
-  plugins: ["prettier-plugin-tailwindcss", "@trivago/prettier-plugin-sort-imports"],
-}
diff --git a/bun.lockb b/bun.lockb
index 49affa214..3278b7fb5 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/eslint.config.js b/eslint.config.js
deleted file mode 100644
index 80ca66b20..000000000
--- a/eslint.config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import js from "@eslint/js"
-import globals from "globals"
-import tseslint from "typescript-eslint"
-
-export default tseslint.config(
-  { ignores: [".next"] },
-  {
-    extends: [js.configs.recommended, ...tseslint.configs.recommended,"next/core-web-vitals", "next/typescript"],
-    files: ["**/*.{ts,tsx}"],
-    languageOptions: {
-      ecmaVersion: 2020,
-      globals: globals.browser,
-    },
-    rules: {
-      "@typescript-eslint/no-explicit-any": "off",
-      "@next/next/no-img-element": "off",
-      "react-hooks/exhaustive-deps": "off",
-    },
-  },
-)
diff --git a/package.json b/package.json
index 9928853dc..5c1fc4f71 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
   "scripts": {
     "dev": "next dev -p 3040",
     "start": "node .next/standalone/server.js",
-    "lint": "eslint",
-    "lint:fix": "eslint --fix",
+    "lint": "next lint",
+    "lint:fix": "next lint --fix",
     "format": "prettier --write .",
     "build": "next build && cp -r .next/static .next/standalone/.next/ && cp -r public .next/standalone/",
     "build-dev": "next build",