diff --git a/eslint.config.d.ts b/eslint.config.d.ts
index e10c8409..54ee6e2d 100644
--- a/eslint.config.d.ts
+++ b/eslint.config.d.ts
@@ -1 +1,2 @@
-export { configWebApp as default } from 'eslint-config-cityssm';
+export declare const config: import("@typescript-eslint/utils/dist/ts-eslint").FlatConfig.ConfigArray;
+export default config;
diff --git a/eslint.config.js b/eslint.config.js
index e10c8409..4cebc825 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1 +1,10 @@
-export { configWebApp as default } from 'eslint-config-cityssm';
+import { configWebApp } from 'eslint-config-cityssm';
+import tseslint from 'typescript-eslint';
+export const config = tseslint.config(...configWebApp, {
+    languageOptions: {
+        parserOptions: {
+            project: ['./tsconfig.json', './tsconfig.client.json']
+        }
+    }
+});
+export default config;
diff --git a/eslint.config.ts b/eslint.config.ts
index 15251e3e..f65d9dad 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -1 +1,15 @@
-export { configWebApp as default } from 'eslint-config-cityssm'
+import { configWebApp } from 'eslint-config-cityssm'
+import tseslint from 'typescript-eslint'
+
+export const config = tseslint.config(
+  ...configWebApp,
+  {
+    languageOptions: {
+      parserOptions: {
+        project: ['./tsconfig.json', './tsconfig.client.json']
+      }
+    }
+  }
+)
+
+export default config
diff --git a/tsconfig.client.json b/tsconfig.client.json
index 0e85365f..25ff969c 100644
--- a/tsconfig.client.json
+++ b/tsconfig.client.json
@@ -1,48 +1,48 @@
 {
-    "compilerOptions": {
-        "target": "ES6",
-        "module": "CommonJS",
-        "moduleResolution": "Node",
-        "isolatedModules": false,
-        "declaration": true,
-        "noImplicitAny": false,
-        "removeComments": false,
-        "allowUnreachableCode": false,
-        "skipLibCheck": true,
-        "strictNullChecks": true
-    },
-    "files": [
-        "public-typescript/adminDatabase.ts",
-        "public-typescript/adminFees.ts",
-        "public-typescript/adminLotTypes.ts",
-        "public-typescript/adminOccupancyTypes.ts",
-        "public-typescript/adminTables/adminTables.ts",
-        "public-typescript/adminTables/adminTablesLotOccupantTypes.ts",
-        "public-typescript/adminTables/adminTablesLotStatuses.ts",
-        "public-typescript/adminTables/adminTablesWorkOrderMilestoneTypes.ts",
-        "public-typescript/adminTables/adminTablesWorkOrderTypes.ts",
-        "public-typescript/dashboard.ts",
-        "public-typescript/lotEdit.ts",
-        "public-typescript/lotOccupancyEdit/lotOccupancyEdit.ts",
-        "public-typescript/lotOccupancyEdit/lotOccupancyEditComments.ts",
-        "public-typescript/lotOccupancyEdit/lotOccupancyEditFees.ts",
-        "public-typescript/lotOccupancyEdit/lotOccupancyEditOccupants.ts",
-        "public-typescript/lotOccupancySearch.ts",
-        "public-typescript/lotSearch.ts",
-        "public-typescript/lotView.ts",
-        "public-typescript/main.ts",
-        "public-typescript/mapEdit.ts",
-        "public-typescript/mapSearch.ts",
-        "public-typescript/mapView.ts",
-        "public-typescript/reportSearch.ts",
-        "public-typescript/workOrderEdit/workOrderEdit.ts",
-        "public-typescript/workOrderEdit/workOrderEditComments.ts",
-        "public-typescript/workOrderEdit/workOrderEditLots.ts",
-        "public-typescript/workOrderMilestoneCalendar.ts",
-        "public-typescript/workOrderOutlook.ts",
-        "public-typescript/workOrderSearch.ts",
-        "public-typescript/workOrderView.ts"
-    ],
-    "compileOnSave": true,
-    "buildOnSave": true
+  "compilerOptions": {
+    "target": "ES6",
+    "module": "CommonJS",
+    "moduleResolution": "Node",
+    "isolatedModules": false,
+    "declaration": true,
+    "noImplicitAny": false,
+    "removeComments": false,
+    "allowUnreachableCode": false,
+    "skipLibCheck": true,
+    "strictNullChecks": true
+  },
+  "files": [
+    "public-typescript/adminDatabase.ts",
+    "public-typescript/adminFees.ts",
+    "public-typescript/adminLotTypes.ts",
+    "public-typescript/adminOccupancyTypes.ts",
+    "public-typescript/adminTables/adminTables.ts",
+    "public-typescript/adminTables/adminTablesLotOccupantTypes.ts",
+    "public-typescript/adminTables/adminTablesLotStatuses.ts",
+    "public-typescript/adminTables/adminTablesWorkOrderMilestoneTypes.ts",
+    "public-typescript/adminTables/adminTablesWorkOrderTypes.ts",
+    "public-typescript/dashboard.ts",
+    "public-typescript/lotEdit.ts",
+    "public-typescript/lotOccupancyEdit/lotOccupancyEdit.ts",
+    "public-typescript/lotOccupancyEdit/lotOccupancyEditComments.ts",
+    "public-typescript/lotOccupancyEdit/lotOccupancyEditFees.ts",
+    "public-typescript/lotOccupancyEdit/lotOccupancyEditOccupants.ts",
+    "public-typescript/lotOccupancySearch.ts",
+    "public-typescript/lotSearch.ts",
+    "public-typescript/lotView.ts",
+    "public-typescript/main.ts",
+    "public-typescript/mapEdit.ts",
+    "public-typescript/mapSearch.ts",
+    "public-typescript/mapView.ts",
+    "public-typescript/reportSearch.ts",
+    "public-typescript/workOrderEdit/workOrderEdit.ts",
+    "public-typescript/workOrderEdit/workOrderEditComments.ts",
+    "public-typescript/workOrderEdit/workOrderEditLots.ts",
+    "public-typescript/workOrderMilestoneCalendar.ts",
+    "public-typescript/workOrderOutlook.ts",
+    "public-typescript/workOrderSearch.ts",
+    "public-typescript/workOrderView.ts"
+  ],
+  "compileOnSave": true,
+  "buildOnSave": true
 }