diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 1a7fc9fb..8a9aa406 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -522,6 +522,7 @@ model projects {
   workflow_file              String?
   include_patterns           String?
   exclude_patterns           String?
+  auto_approve               Boolean        @default(false)
   chats                      chats[]
   digger_runs                digger_runs[]
   env_vars                   env_vars[]
@@ -655,19 +656,19 @@ model user_profiles {
   user_roles                                                                                 user_roles[]
 }
 
-
 model user_m2m_applications {
-  id          Int      @id @default(autoincrement())
+  id          Int       @id @default(autoincrement())
   email       String
-  clientId    String   @unique
-  audience    String?
-  issuer      String?
+  clientId    String    @unique
+  audience    String
+  issuer      String
   name        String?
   description String?
-  createdAt   DateTime @default(now()) @map("created_at")
-  updatedAt   DateTime @default(now()) @updatedAt @map("updated_at")
-}
+  createdAt   DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
+  updatedAt   DateTime? @default(now()) @updatedAt @map("updated_at") @db.Timestamptz(6)
 
+  @@index([email], map: "m2m_application_user_id_idx")
+}
 
 /// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments
 /// This model contains row level security and requires additional setup for migrations. Visit https://pris.ly/d/row-level-security for more info.
diff --git a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/ProjectSettings.tsx b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/ProjectSettings.tsx
index 06a233cd..1276b113 100644
--- a/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/ProjectSettings.tsx
+++ b/src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/ProjectSettings.tsx
@@ -31,6 +31,7 @@ type ProjectSettingsFormData = {
     managedState: boolean;
     is_drift_detection_enabled: boolean;
     drift_crontab: string;
+    auto_approve: boolean;
 };
 
 export default function ProjectSettings({ project, repositoryName }: ProjectSettingsProps) {
@@ -46,6 +47,7 @@ export default function ProjectSettings({ project, repositoryName }: ProjectSett
             managedState: project.is_managing_state || false,
             is_drift_detection_enabled: project.is_drift_detection_enabled || false,
             drift_crontab: project.drift_crontab || '',
+            auto_approve: project.auto_approve || false,
         },
     });
 
@@ -63,6 +65,7 @@ export default function ProjectSettings({ project, repositoryName }: ProjectSett
                 managedState: data.managedState,
                 is_drift_detection_enabled: data.is_drift_detection_enabled,
                 drift_crontab: data.drift_crontab,
+                auto_approve: data.auto_approve,
             });
             return result;
         },
@@ -276,6 +279,20 @@ export default function ProjectSettings({ project, repositoryName }: ProjectSett
                             />
                         </div>
 
+                        <div className="flex items-center gap-2">
+                            <Label htmlFor="auto_approve">Auto-approve</Label>
+                            <Controller
+                                name="auto_approve"
+                                control={control}
+                                render={({ field }) => (
+                                    <Switch
+                                        checked={field.value}
+                                        onCheckedChange={field.onChange}
+                                    />
+                                )}
+                            />
+                        </div>
+
                         <motion.div
                             initial={{ opacity: 0 }}
                             animate={{ opacity: 1 }}
diff --git a/src/data/user/projects.tsx b/src/data/user/projects.tsx
index ec4ab45f..a0f62380 100644
--- a/src/data/user/projects.tsx
+++ b/src/data/user/projects.tsx
@@ -981,6 +981,7 @@ export async function updateProjectSettingsAction({
   managedState,
   is_drift_detection_enabled,
   drift_crontab,
+  auto_approve,
 }: {
   projectId: string;
   terraformWorkingDir: string;
@@ -993,6 +994,7 @@ export async function updateProjectSettingsAction({
   managedState: boolean;
   is_drift_detection_enabled: boolean;
   drift_crontab: string;
+  auto_approve: boolean;
 }): Promise<SAPayload<projects>> {
   const prisma = new PrismaClient();
 
@@ -1012,6 +1014,7 @@ export async function updateProjectSettingsAction({
         is_managing_state: managedState,
         is_drift_detection_enabled,
         drift_crontab,
+        auto_approve,
       }
     });