diff --git a/apps/nextjs-app/.eslintrc.cjs b/apps/nextjs-app/.eslintrc.cjs
index d8f31a04..333f08bc 100644
--- a/apps/nextjs-app/.eslintrc.cjs
+++ b/apps/nextjs-app/.eslintrc.cjs
@@ -11,7 +11,6 @@ module.exports = {
     'generators/*',
   ],
   extends: ['eslint:recommended', 'next/core-web-vitals'],
-  plugins: ['check-file'],
   overrides: [
     {
       files: ['**/*.ts', '**/*.tsx'],
@@ -127,26 +126,26 @@ module.exports = {
         '@typescript-eslint/no-empty-function': ['off'],
         '@typescript-eslint/no-explicit-any': ['off'],
         'prettier/prettier': ['error', {}, { usePrettierrc: true }],
+      },
+    },
+    {
+      plugins: ['check-file'],
+      files: ['src/**/*'],
+      rules: {
         'check-file/filename-naming-convention': [
           'error',
           {
-            'src/!(pages)/*.{ts,tsx}': 'KEBAB_CASE',
+            '**/*.{ts,tsx}': 'KEBAB_CASE',
           },
           {
             ignoreMiddleExtensions: true,
           },
         ],
-      },
-    },
-    {
-      plugins: ['check-file'],
-      files: ['src/**/*'],
-      ignorePatterns: ['**/__tests__/**/*', 'src/app/**/*'],
-      rules: {
         'check-file/folder-naming-convention': [
           'error',
           {
-            '**/*': 'KEBAB_CASE',
+            '!(src/app)/**/*': 'KEBAB_CASE',
+            '!(**/__tests__)/**/*': 'KEBAB_CASE',
           },
         ],
       },
diff --git a/apps/nextjs-app/src/app/app/discussions/[discussionId]/page.tsx b/apps/nextjs-app/src/app/app/discussions/[discussionId]/page.tsx
index b4c11212..ff1704c2 100644
--- a/apps/nextjs-app/src/app/app/discussions/[discussionId]/page.tsx
+++ b/apps/nextjs-app/src/app/app/discussions/[discussionId]/page.tsx
@@ -5,7 +5,6 @@ import { ErrorBoundary } from 'react-error-boundary';
 
 import { ContentLayout } from '@/components/layouts';
 import { Spinner } from '@/components/ui/spinner';
-
 import { Comments } from '@/features/comments/components/comments';
 import { useDiscussion } from '@/features/discussions/api/get-discussion';
 import { DiscussionView } from '@/features/discussions/components/discussion-view';
diff --git a/apps/nextjs-app/src/app/public/discussions/[discussionId]/page.tsx b/apps/nextjs-app/src/app/public/discussions/[discussionId]/page.tsx
index 97cfffdf..4cdb566e 100644
--- a/apps/nextjs-app/src/app/public/discussions/[discussionId]/page.tsx
+++ b/apps/nextjs-app/src/app/public/discussions/[discussionId]/page.tsx
@@ -3,13 +3,12 @@ import {
   HydrationBoundary,
   QueryClient,
 } from '@tanstack/react-query';
+import { cookies } from 'next/headers';
 
+import DiscussionPage from '@/app/app/discussions/[discussionId]/page';
 import { getInfiniteCommentsQueryOptions } from '@/features/comments/api/get-comments';
 import { getDiscussionQueryOptions } from '@/features/discussions/api/get-discussion';
 
-import DiscussionPage from '@/app/app/discussions/[discussionId]/page';
-import { cookies } from 'next/headers';
-
 const preloadData = async (discussionId: string) => {
   const queryClient = new QueryClient();