diff --git a/backend/Dockerfile b/backend/Dockerfile
index edd23e8c..71c030bf 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -17,6 +17,7 @@ ENV WORKERS=33
 ENV THREADS=2
 ENV WORKER_CONNECTIONS=2000
 
+ENV PYTHONPATH=/app
 EXPOSE 8000
 
 # Gunicorn configuration
diff --git a/backend/flags/flags.py b/backend/flags/flags.py
index 18d16429..dd034b94 100644
--- a/backend/flags/flags.py
+++ b/backend/flags/flags.py
@@ -4,9 +4,6 @@ import os
 from datetime import datetime
 from typing import Dict, List, Optional
 import sys
-
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
 from services import redis
 
 logger = logging.getLogger(__name__)
diff --git a/frontend/src/app/(dashboard)/settings/credentials/layout.tsx b/frontend/src/app/(dashboard)/settings/credentials/layout.tsx
new file mode 100644
index 00000000..3e8d0869
--- /dev/null
+++ b/frontend/src/app/(dashboard)/settings/credentials/layout.tsx
@@ -0,0 +1,25 @@
+import { isFlagEnabled } from '@/lib/feature-flags';
+import { Metadata } from 'next';
+import { redirect } from 'next/navigation';
+
+export const metadata: Metadata = {
+  title: 'Credentials | Kortix Suna',
+  description: 'Create and manage credentials to your services',
+  openGraph: {
+    title: 'Credentials | Kortix Suna',
+    description: 'Create and manage credentials to your services',
+    type: 'website',
+  },
+};
+
+export default async function CredentialsLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const customAgentsEnabled = await isFlagEnabled('custom_agents');
+  if (!customAgentsEnabled) {
+    redirect('/dashboard');
+  }
+  return <>{children}</>;
+}