diff --git a/src/lib/components/settings/PublicPrivateToggle.svelte b/src/lib/components/settings/Toggle.svelte
similarity index 62%
rename from src/lib/components/settings/PublicPrivateToggle.svelte
rename to src/lib/components/settings/Toggle.svelte
index 194c3c861..5469170c7 100644
--- a/src/lib/components/settings/PublicPrivateToggle.svelte
+++ b/src/lib/components/settings/Toggle.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { HTMLInputAttributes } from 'svelte/elements';
+  import type { HTMLInputAttributes, ChangeEventHandler } from 'svelte/elements';
   import IconContainer from '../IconContainer.svelte';
   import InputWithMessage from './InputWithMessage.svelte';
   import type { ValueKey } from '$lib/locales.svelte';
@@ -7,25 +7,40 @@
   interface Props {
     title?: ValueKey;
     message?: ValueKey;
-    className?: string;
-    formName?: string;
+    name?: string;
     checked: boolean;
+    canEdit?: boolean;
     inputAttr?: HTMLInputAttributes;
+    onchange: ChangeEventHandler<HTMLInputElement>;
+    onIcon?: string;
+    offIcon?: string;
   }
+
   let {
     title,
     message,
-    className = '',
-    formName,
+    name,
     checked = $bindable(),
-    inputAttr
+    canEdit = true,
+    onchange,
+    onIcon = '',
+    offIcon = ''
   }: Props = $props();
+
+  let className = $derived(canEdit ? '' : 'cursor-not-allowed');
 </script>
 
 <InputWithMessage {title} {message} {className}>
   <label class="group">
     <div class="relative">
-      <input name={formName} type="checkbox" class="sr-only group" bind:checked {...inputAttr} />
+      <input
+        {name}
+        type="checkbox"
+        class="sr-only group"
+        bind:checked
+        {onchange}
+        disabled={!canEdit}
+      />
       <div
         class="block h-8 rounded-full bg-gray-3 dark:bg-dark-2 w-14 toggle group-has-checked:border-accent"
       ></div>
@@ -34,15 +49,11 @@
       >
         <span class="hidden group-has-checked:block">
           <!-- Switch on -> public -->
-          <IconContainer
-            icon="mdi:lock-open-variant"
-            class="-translate-y-px text-white"
-            width="15"
-          />
+          <IconContainer icon={onIcon} class="-translate-y-px text-white" width="15" />
         </span>
         <span class="text-body-color dark:text-light group-has-checked:hidden">
           <!-- Switch off -> private -->
-          <IconContainer icon="mdi:lock" class="-translate-y-px text-black" width="15" />
+          <IconContainer icon={offIcon} class="-translate-y-px text-black" width="15" />
         </span>
       </div>
     </div>
diff --git a/src/lib/components/settings/ToggleForm.svelte b/src/lib/components/settings/ToggleForm.svelte
new file mode 100644
index 000000000..aca441576
--- /dev/null
+++ b/src/lib/components/settings/ToggleForm.svelte
@@ -0,0 +1,65 @@
+<!--
+    @component
+    An abstraction over Toggle which makes it easier to submit simple POSTs using a toggle.
+-->
+<script lang="ts">
+  import { enhance } from '$app/forms';
+  import Toggle from '$lib/components/settings/Toggle.svelte';
+  import { m } from '$lib/paraglide/messages';
+  import { toast } from '$lib/utils';
+  import type { ValueKey } from '$lib/locales.svelte';
+  type Method = 'POST' | 'GET';
+
+  interface Props {
+    name: string;
+    method: Method;
+    action: string;
+    formVar: boolean;
+    onmsg: string;
+    offmsg: string;
+    onIcon?: string;
+    offIcon?: string;
+    title: ValueKey;
+    message: ValueKey;
+  }
+
+  let { name, method, action, formVar, onmsg, offmsg, title, message, onIcon, offIcon }: Props =
+    $props();
+
+  let form: HTMLFormElement;
+</script>
+
+<form
+  bind:this={form}
+  {method}
+  {action}
+  use:enhance={() =>
+    ({ update, result }) => {
+      if (result.type === 'success') {
+        const res = result.data as ActionData;
+        if (res?.ok) {
+          if (formVar) {
+            toast('success', onmsg);
+          } else {
+            toast('success', offmsg);
+          }
+        } else {
+          toast('error', m.errors_generic({ errorMessage: '' }));
+          formVar = !formVar;
+        }
+      }
+      update({ reset: false });
+    }}
+>
+  <Toggle
+    {title}
+    {message}
+    {name}
+    bind:checked={formVar}
+    onchange={() => {
+      form.requestSubmit();
+    }}
+    {onIcon}
+    {offIcon}
+  />
+</form>
diff --git a/src/lib/locales/en-US.json b/src/lib/locales/en-US.json
index 6a1fa9875..45851dd06 100644
--- a/src/lib/locales/en-US.json
+++ b/src/lib/locales/en-US.json
@@ -22,13 +22,8 @@
   "localePicker_placeholder": "Search by Language...",
   "localePicker_region": [
     {
-      "declarations": [
-        "input count",
-        "local countPlural = count: plural"
-      ],
-      "selectors": [
-        "countPlural"
-      ],
+      "declarations": ["input count", "local countPlural = count: plural"],
+      "selectors": ["countPlural"],
       "match": {
         "countPlural=one": "Region",
         "countPlural=other": "Regions"
@@ -37,13 +32,8 @@
   ],
   "localePicker_name": [
     {
-      "declarations": [
-        "input count",
-        "local countPlural = count: plural"
-      ],
-      "selectors": [
-        "countPlural"
-      ],
+      "declarations": ["input count", "local countPlural = count: plural"],
+      "selectors": ["countPlural"],
       "match": {
         "countPlural=one": "Name",
         "countPlural=other": "Names"
@@ -52,13 +42,8 @@
   ],
   "localePicker_tag": [
     {
-      "declarations": [
-        "input count",
-        "local countPlural = count: plural"
-      ],
-      "selectors": [
-        "countPlural"
-      ],
+      "declarations": ["input count", "local countPlural = count: plural"],
+      "selectors": ["countPlural"],
       "match": {
         "countPlural=one": "Tag",
         "countPlural=other": "Tags"
@@ -67,13 +52,8 @@
   ],
   "localePicker_variant": [
     {
-      "declarations": [
-        "input count",
-        "local countPlural = count: plural"
-      ],
-      "selectors": [
-        "countPlural"
-      ],
+      "declarations": ["input count", "local countPlural = count: plural"],
+      "selectors": ["countPlural"],
       "match": {
         "countPlural=one": "Variant",
         "countPlural=other": "Variants"
@@ -264,12 +244,8 @@
   "products_unpublished": "Unpublished",
   "products_numArtifacts": [
     {
-      "declarations": [
-        "local countPlural = amount: plural"
-      ],
-      "selectors": [
-        "countPlural"
-      ],
+      "declarations": ["local countPlural = amount: plural"],
+      "selectors": ["countPlural"],
       "match": {
         "amount=0": "No Product Files",
         "countPlural=one": "{amount} Product File",
@@ -389,8 +365,12 @@
   "project_details_language": "Language",
   "project_details_type": "Project Type",
   "project_settings_title": "Settings",
-  "project_autoRebuild_title": "Automatic Rebuilds",
+  "project_autoPublish_title": "Auto Publish on Rebuild",
+  "project_autoPublish_description": "When the rebuild workflow is run, skip verification and publish the app. Send a notification to owner and reviewers that the app was published without review.",
+  "project_autoRebuild_title": "Automatic Rebuild",
   "project_autoRebuild_description": "When automatic rebuilds are on, Scriptoria will automatically rebuild your products when the input source is updated",
+  "project_autoRebuild_on_update_title": "Rebuild on Software Update",
+  "project_autoRebuild_on_update_description": "When the App Builder software used by Scriptoria is updated, rebuild the products of the project that have completed the initial workflow and are not currently being rebuilt.",
   "project_orgDownloads_title": "Allow Other Organizations to download",
   "project_orgDownloads_description": "When this setting is on, any Scriptoria User that is able to view your project in the Directory will be able to download the Product Files (the outputs of the products).",
   "project_visibility_title": "Public Visibility",
@@ -418,6 +398,9 @@
   "project_acts_downloads_on": "Allow project download is ON",
   "project_acts_downloads_off": "Allow project download is OFF",
   "project_acts_downloads_error": "Error: We could not change Allow Download status",
+  "project_acts_autoPublish_on": "Auto Publish is ON",
+  "project_acts_autoPublish_off": "Auto Publish is OFF",
+  "project_acts_autoPublish_error": "Error: We could not change Auto Publish status",
   "project_acts_isPublic_on": "Project visibility is set to Public",
   "project_acts_isPublic_off": "Project visibility is set to Private",
   "project_acts_isPublic_error": "Error: We could not change Project visibility",
@@ -572,4 +555,4 @@
   "system_publishFailed": "Publish failed",
   "system_unavailable": "Scriptoria is currently unable to process background tasks",
   "downloads_title": "Downloads"
-}
\ No newline at end of file
+}
diff --git a/src/lib/locales/es-419.json b/src/lib/locales/es-419.json
index 0cf5dadb5..c749a3d86 100644
--- a/src/lib/locales/es-419.json
+++ b/src/lib/locales/es-419.json
@@ -22,13 +22,8 @@
   "localePicker_placeholder": "Buscar por idioma...",
   "localePicker_region": [
     {
-      "declarations": [
-        "input count",
-        "local countPlural = count: plural"
-      ],
-      "selectors": [
-        "countPlural"
-      ],
+      "declarations": ["input count", "local countPlural = count: plural"],
+      "selectors": ["countPlural"],
       "match": {
         "countPlural=one": "Region",
         "countPlural=other": "Region"
@@ -37,13 +32,8 @@
   ],
   "localePicker_name": [
     {
-      "declarations": [
-        "input count",
-        "local countPlural = count: plural"
-      ],
-      "selectors": [
-        "countPlural"
-      ],
+      "declarations": ["input count", "local countPlural = count: plural"],
+      "selectors": ["countPlural"],
       "match": {
         "countPlural=one": "Name",
         "countPlural=other": "Names"
@@ -52,13 +42,8 @@
   ],
   "localePicker_tag": [
     {
-      "declarations": [
-        "input count",
-        "local countPlural = count: plural"
-      ],
-      "selectors": [
-        "countPlural"
-      ],
+      "declarations": ["input count", "local countPlural = count: plural"],
+      "selectors": ["countPlural"],
       "match": {
         "countPlural=one": "Tag",
         "countPlural=other": "Tags"
@@ -67,13 +52,8 @@
   ],
   "localePicker_variant": [
     {
-      "declarations": [
-        "input count",
-        "local countPlural = count: plural"
-      ],
-      "selectors": [
-        "countPlural"
-      ],
+      "declarations": ["input count", "local countPlural = count: plural"],
+      "selectors": ["countPlural"],
       "match": {
         "countPlural=one": "Variant",
         "countPlural=other": "Variants"
@@ -264,12 +244,8 @@
   "products_unpublished": "Sin publicar",
   "products_numArtifacts": [
     {
-      "declarations": [
-        "local countPlural = amount: plural"
-      ],
-      "selectors": [
-        "countPlural"
-      ],
+      "declarations": ["local countPlural = amount: plural"],
+      "selectors": ["countPlural"],
       "match": {
         "amount=0": "No hay archivos de producto",
         "countPlural=one": "{amount} Product File",
@@ -389,8 +365,12 @@
   "project_details_language": "Lenguaje",
   "project_details_type": "Tipo de proyecto",
   "project_settings_title": "Configuración",
-  "project_autoRebuild_title": "Recompilaciones automáticas",
+  "project_autoPublish_title": "Publicación Automática al Reconstruir",
+  "project_autoPublish_description": "Cuando se ejecuta la compilación, omite la verificación y publica la aplicación. Notificar al propietaro y a los revisores que la aplicación se publicó sin revisión.",
+  "project_autoRebuild_title": "Recompilaciones Automáticas",
   "project_autoRebuild_description": "Cuando las recompilaciones automáticas están activadas, Scriptoria reconstruirá sus productos automáticamente cuando el código fuente se actualice",
+  "project_autoRebuild_on_update_title": "Recompilar cuando se Actualiza el Software",
+  "project_autoRebuild_on_update_description": "Cuando el App Builder se actualice, vuelva a compilar los productos del proyecto que se han completado el flujo de trabajo inicial y que no se están reconstruyendo.",
   "project_orgDownloads_title": "Permitir descargar a otras organizaciones",
   "project_orgDownloads_description": "Cuando esta configuración está activada, cualquier usuario de Scriptoria que pueda ver su proyecto en el Directorio podrá descargar los archivos del producto (los resultados de los productos).",
   "project_visibility_title": "Visibilidad pública",
@@ -415,6 +395,9 @@
   "project_acts_autoBuilds_on": "Compilaciones automáticas está activada",
   "project_acts_autoBuilds_off": "Compilaciones automáticas está desactivada",
   "project_acts_autoBuilds_error": "Error: No pudimos cambiar el estado de \"compilación automática\"",
+  "project_acts_autoPublish_on": "Publicaciones automáticas esta activada",
+  "project_acts_autoPublish_off": "Publicaciones automáticas está desactivada",
+  "project_acts_autoPublish_error": "Error: No pudimos cambiar el estado de \"publicaciones automáticas\"",
   "project_acts_downloads_on": "Permitir descarga de proyecto está activada",
   "project_acts_downloads_off": "Permitir descarga de proyecto está desactivada",
   "project_acts_downloads_error": "Error: No pudimos cambiar el estado de \"permitir descargas\"",
@@ -572,4 +555,4 @@
   "system_publishFailed": "Publish failed",
   "system_unavailable": "Scriptoria actualmente no puede procesar tareas",
   "downloads_title": "Downloads"
-}
\ No newline at end of file
+}
diff --git a/src/lib/locales/fr-FR.json b/src/lib/locales/fr-FR.json
index 486d0e502..ddcc81998 100644
--- a/src/lib/locales/fr-FR.json
+++ b/src/lib/locales/fr-FR.json
@@ -365,7 +365,11 @@
   "project_details_language": "Language",
   "project_details_type": "Project Type",
   "project_settings_title": "Settings",
+  "project_autoPublish_title": "Auto Publish on Rebuild",
+  "project_autoPublish_description": "When the rebuild workflow is run, skip verification and publish the app. Send a notification to owner and reviewers that the app was published without review.",
   "project_autoRebuild_title": "Automatic Rebuilds",
+  "project_autoRebuild_on_update_title": "Rebuild on Software Update",
+  "project_autoRebuild_on_update_description": "When the App Builder software used by Scriptoria is updated, rebuild the products of the project that have completed the initial workflow and are not currently being rebuilt.",
   "project_autoRebuild_description": "When automatic rebuilds are on, Scriptoria will automatically rebuild your products when the input source is updated",
   "project_orgDownloads_title": "Allow Other Organizations to download",
   "project_orgDownloads_description": "When this setting is on, any Scriptoria User that is able to view your project in the Directory will be able to download the Product Files (the outputs of the products).",
@@ -390,6 +394,9 @@
   "project_acts_autoBuilds_on": "Automatic builds is ON",
   "project_acts_autoBuilds_off": "Automatic builds is OFF",
   "project_acts_autoBuilds_error": "Error: We could not change automatic build status",
+  "project_acts_autoPublish_on": "Auto Publish is ON",
+  "project_acts_autoPublish_off": "Auto Publish is OFF",
+  "project_acts_autoPublish_error": "Error: We could not change Auto Publish status",
   "project_acts_downloads_on": "Allow project download is ON",
   "project_acts_downloads_off": "Allow project download is OFF",
   "project_acts_downloads_error": "Error: We could not change Allow Download status",
diff --git a/src/lib/prisma/migrations/12_auto_rebuilds/migration.sql b/src/lib/prisma/migrations/12_auto_rebuilds/migration.sql
new file mode 100644
index 000000000..55bd8e6aa
--- /dev/null
+++ b/src/lib/prisma/migrations/12_auto_rebuilds/migration.sql
@@ -0,0 +1,10 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `AutomaticBuilds` on the `Projects` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "public"."Projects" DROP COLUMN "AutomaticBuilds",
+ADD COLUMN     "AutoPublishOnRebuild" BOOLEAN DEFAULT false,
+ADD COLUMN     "RebuildOnSoftwareUpdate" BOOLEAN DEFAULT false;
diff --git a/src/lib/prisma/schema.prisma b/src/lib/prisma/schema.prisma
index 26147b87c..f6b4b029c 100644
--- a/src/lib/prisma/schema.prisma
+++ b/src/lib/prisma/schema.prisma
@@ -331,33 +331,34 @@ model ProjectImports {
 }
 
 model Projects {
-  Id                    Int              @id(map: "PK_Projects") @default(autoincrement())
-  Name                  String?
-  TypeId                Int
-  Description           String?
-  OwnerId               Int
-  GroupId               Int
-  OrganizationId        Int
-  Language              String?
-  IsPublic              Boolean?         @default(true)
-  DateCreated           DateTime?        @default(now()) @db.Timestamp(6)
-  DateUpdated           DateTime?        @updatedAt @db.Timestamp(6)
-  DateArchived          DateTime?        @db.Timestamp(6)
-  AllowDownloads        Boolean?         @default(true)
-  AutomaticBuilds       Boolean?         @default(true)
-  WorkflowProjectId     Int              @default(0)
-  WorkflowProjectUrl    String?
-  WorkflowAppProjectUrl String?
-  DateActive            DateTime?        @db.Timestamp(6)
-  ImportId              Int?
-  Authors               Authors[]
-  Products              Products[]
-  ApplicationType       ApplicationTypes @relation(fields: [TypeId], references: [Id], onUpdate: NoAction, map: "FK_Projects_ApplicationTypes_TypeId")
-  Group                 Groups           @relation(fields: [GroupId], references: [Id], onUpdate: NoAction, map: "FK_Projects_Groups_GroupId")
-  Organization          Organizations    @relation(fields: [OrganizationId], references: [Id], onUpdate: NoAction, map: "FK_Projects_Organizations_OrganizationId")
-  ProjectImport         ProjectImports?  @relation(fields: [ImportId], references: [Id], onDelete: Restrict, onUpdate: NoAction, map: "FK_Projects_ProjectImports_ImportId")
-  Owner                 Users            @relation(fields: [OwnerId], references: [Id], onUpdate: NoAction, map: "FK_Projects_Users_OwnerId")
-  Reviewers             Reviewers[]
+  Id                      Int              @id(map: "PK_Projects") @default(autoincrement())
+  Name                    String?
+  TypeId                  Int
+  Description             String?
+  OwnerId                 Int
+  GroupId                 Int
+  OrganizationId          Int
+  Language                String?
+  IsPublic                Boolean?         @default(true)
+  DateCreated             DateTime?        @default(now()) @db.Timestamp(6)
+  DateUpdated             DateTime?        @updatedAt @db.Timestamp(6)
+  DateArchived            DateTime?        @db.Timestamp(6)
+  AllowDownloads          Boolean?         @default(true)
+  AutoPublishOnRebuild    Boolean?         @default(false)
+  RebuildOnSoftwareUpdate Boolean?         @default(false)
+  WorkflowProjectId       Int              @default(0)
+  WorkflowProjectUrl      String?
+  WorkflowAppProjectUrl   String?
+  DateActive              DateTime?        @db.Timestamp(6)
+  ImportId                Int?
+  Authors                 Authors[]
+  Products                Products[]
+  ApplicationType         ApplicationTypes @relation(fields: [TypeId], references: [Id], onUpdate: NoAction, map: "FK_Projects_ApplicationTypes_TypeId")
+  Group                   Groups           @relation(fields: [GroupId], references: [Id], onUpdate: NoAction, map: "FK_Projects_Groups_GroupId")
+  Organization            Organizations    @relation(fields: [OrganizationId], references: [Id], onUpdate: NoAction, map: "FK_Projects_Organizations_OrganizationId")
+  ProjectImport           ProjectImports?  @relation(fields: [ImportId], references: [Id], onDelete: Restrict, onUpdate: NoAction, map: "FK_Projects_ProjectImports_ImportId")
+  Owner                   Users            @relation(fields: [OwnerId], references: [Id], onUpdate: NoAction, map: "FK_Projects_Users_OwnerId")
+  Reviewers               Reviewers[]
 
   @@index([GroupId], map: "IX_Projects_GroupId")
   @@index([ImportId], map: "IX_Projects_ImportId")
diff --git a/src/routes/(authenticated)/admin/settings/organizations/edit/+page.svelte b/src/routes/(authenticated)/admin/settings/organizations/edit/+page.svelte
index 37482774a..c66c034ea 100644
--- a/src/routes/(authenticated)/admin/settings/organizations/edit/+page.svelte
+++ b/src/routes/(authenticated)/admin/settings/organizations/edit/+page.svelte
@@ -4,7 +4,7 @@
   import { goto } from '$app/navigation';
   import InputWithMessage from '$lib/components/settings/InputWithMessage.svelte';
   import LabeledFormInput from '$lib/components/settings/LabeledFormInput.svelte';
-  import PublicPrivateToggle from '$lib/components/settings/PublicPrivateToggle.svelte';
+  import Toggle from '$lib/components/settings/Toggle.svelte';
   import { m } from '$lib/paraglide/messages';
   import { localizeHref } from '$lib/paraglide/runtime';
   import { toast } from '$lib/utils';
@@ -100,7 +100,7 @@
     />
     <span class="validator-hint">&nbsp;</span>
   </LabeledFormInput>
-  <PublicPrivateToggle
+  <Toggle
     title={{ key: 'org_publicByDefault' }}
     message={{ key: 'org_publicByDefaultDescription' }}
     className="py-1"
diff --git a/src/routes/(authenticated)/organizations/[id]/settings/products/+page.svelte b/src/routes/(authenticated)/organizations/[id]/settings/products/+page.svelte
index 8e836254f..dfcc5fef8 100644
--- a/src/routes/(authenticated)/organizations/[id]/settings/products/+page.svelte
+++ b/src/routes/(authenticated)/organizations/[id]/settings/products/+page.svelte
@@ -3,7 +3,7 @@
   import { enhance } from '$app/forms';
   import MultiselectBox from '$lib/components/settings/MultiselectBox.svelte';
   import MultiselectBoxElement from '$lib/components/settings/MultiselectBoxElement.svelte';
-  import PublicPrivateToggle from '$lib/components/settings/PublicPrivateToggle.svelte';
+  import Toggle from '$lib/components/settings/Toggle.svelte';
   import { m } from '$lib/paraglide/messages';
   import { getLocale } from '$lib/paraglide/runtime';
   import { toast } from '$lib/utils';
@@ -33,7 +33,7 @@
       };
     }}
   >
-    <PublicPrivateToggle
+    <Toggle
       title={{ key: 'org_makePrivateTitle', classes: 'font-bold' }}
       message={{ key: 'org_makePrivateDescription' }}
       className="pb-2"
diff --git a/src/routes/(authenticated)/projects/[id=idNumber]/+page.server.ts b/src/routes/(authenticated)/projects/[id=idNumber]/+page.server.ts
index 054c11f0c..9c26ec19f 100644
--- a/src/routes/(authenticated)/projects/[id=idNumber]/+page.server.ts
+++ b/src/routes/(authenticated)/projects/[id=idNumber]/+page.server.ts
@@ -223,6 +223,7 @@ export const actions = {
     });
     return { form, ok: true };
   },
+
   async toggleDownload(event) {
     // permissions checked in auth
     const form = await superValidate(
@@ -239,6 +240,42 @@ export const actions = {
     });
     return { form, ok: true };
   },
+
+
+  async toggleAutoPublishOnRebuild(event) {
+    // permissions checked in auth
+    const form = await superValidate(
+      event.request,
+      valibot(
+        v.object({
+          autoPublishOnRebuild: v.boolean()
+        })
+      )
+    );
+    if (!form.valid) return fail(400, { form, ok: false });
+    await DatabaseWrites.projects.update(parseInt(event.params.id), {
+      AutoPublishOnRebuild: form.data.autoPublishOnRebuild
+    });
+    return { form, ok: true };
+  },
+  async toggleRebuildOnSoftwareUpdate(event) {
+    // permissions checked in auth
+    const form = await superValidate(
+      event.request,
+      valibot(
+        v.object({
+          autoRebuildOnSoftwareUpdate: v.boolean()
+        })
+      )
+    );
+    if (!form.valid) return fail(400, { form, ok: false });
+    await DatabaseWrites.projects.update(parseInt(event.params.id), {
+      RebuildOnSoftwareUpdate: form.data.autoRebuildOnSoftwareUpdate
+    });
+    return { form, ok: true };
+  },
+
+
   async editOwnerGroup(event) {
     // permissions checked in auth
     const form = await superValidate(event.request, valibot(updateOwnerGroupSchema));
@@ -283,8 +320,8 @@ export const actions = {
       project.OrganizationId,
       form.data.operation === 'claim'
         ? (await userGroupsForOrg(session.user.userId, project.OrganizationId)).map(
-            (g) => g.GroupId
-          )
+          (g) => g.GroupId
+        )
         : []
     );
 
diff --git a/src/routes/(authenticated)/projects/[id=idNumber]/+page.svelte b/src/routes/(authenticated)/projects/[id=idNumber]/+page.svelte
index 3d08f240d..6cad511a8 100644
--- a/src/routes/(authenticated)/projects/[id=idNumber]/+page.svelte
+++ b/src/routes/(authenticated)/projects/[id=idNumber]/+page.svelte
@@ -240,12 +240,7 @@
       </div>
       <!-- Settings -->
       <div class="settingsarea my-4">
-        <Settings
-          project={projectData.project}
-          publicEndpoint="toggleVisibility"
-          downloadEndpoint="toggleDownload"
-          {canEdit}
-        />
+        <Settings project={projectData.project} {canEdit} />
       </div>
       <!-- Sidebar Settings -->
       <div class="space-y-2 min-w-0 flex-auto sidebararea">
diff --git a/src/routes/(authenticated)/projects/[id=idNumber]/forms/Settings.svelte b/src/routes/(authenticated)/projects/[id=idNumber]/forms/Settings.svelte
index f99512dcc..ba1a53771 100644
--- a/src/routes/(authenticated)/projects/[id=idNumber]/forms/Settings.svelte
+++ b/src/routes/(authenticated)/projects/[id=idNumber]/forms/Settings.svelte
@@ -1,106 +1,78 @@
 <script lang="ts">
   import type { Prisma } from '@prisma/client';
-  import type { ActionData } from '../$types';
-  import { enhance } from '$app/forms';
-  import InputWithMessage from '$lib/components/settings/InputWithMessage.svelte';
-  import PublicPrivateToggle from '$lib/components/settings/PublicPrivateToggle.svelte';
+  import ToggleForm from '$lib/components/settings/ToggleForm.svelte';
   import { m } from '$lib/paraglide/messages';
-  import { toast } from '$lib/utils';
 
   interface Props {
     project: Prisma.ProjectsGetPayload<{
       select: {
         IsPublic: true;
         AllowDownloads: true;
+        AutoPublishOnRebuild: true;
+        RebuildOnSoftwareUpdate: true;
       };
     }>;
-    publicEndpoint: string;
-    downloadEndpoint: string;
     canEdit: boolean;
   }
 
-  let { project, publicEndpoint, downloadEndpoint, canEdit }: Props = $props();
+  let { project, canEdit }: Props = $props();
+
+  const publicEndpoint = 'toggleVisibility';
+  const downloadEndpoint = 'toggleDownload';
+  const rebuildEndpoint = 'toggleRebuildOnSoftwareUpdate';
+  const publishEndpoint = 'toggleAutoPublishOnRebuild';
 
   let isPublic = $state(!!project.IsPublic);
-  let publicForm: HTMLFormElement;
-  let downloadInput: HTMLInputElement;
+  let allowDownloads = $state(!!project.AllowDownloads);
+  let autoRebuild = $state(!!project.RebuildOnSoftwareUpdate);
+  let autoPublish = $state(!!project.AutoPublishOnRebuild);
 </script>
 
 <h2 class="pl-0 pt-0">{m.project_settings_title()}</h2>
 <div class="space-y-2">
-  <form
-    bind:this={publicForm}
+  <ToggleForm
+    name="isPublic"
     method="POST"
     action="?/{publicEndpoint}"
-    use:enhance={() =>
-      ({ update, result }) => {
-        if (result.type === 'success') {
-          const res = result.data as ActionData;
-          if (res?.ok) {
-            if (isPublic) {
-              toast('success', m.project_acts_isPublic_on());
-            } else {
-              toast('success', m.project_acts_isPublic_off());
-            }
-          } else {
-            toast('error', m.errors_generic({ errorMessage: '' }));
-            isPublic = !isPublic;
-          }
-        }
-        update({ reset: false });
-      }}
-  >
-    <PublicPrivateToggle
-      title={{ key: 'project_visibility_title' }}
-      message={{ key: 'project_visibility_description' }}
-      formName="isPublic"
-      bind:checked={isPublic}
-      inputAttr={{
-        onchange: () => {
-          publicForm.requestSubmit();
-        },
-        disabled: !canEdit
-      }}
-      className={canEdit ? '' : 'cursor-not-allowed'}
-    />
-  </form>
-  <form
+    formVar={isPublic}
+    onmsg={m.project_acts_isPublic_on()}
+    offmsg={m.project_acts_isPublic_off()}
+    title={{ key: 'project_visibility_title' }}
+    message={{ key: 'project_visibility_description' }}
+    onIcon="mdi:lock-open-variant"
+    offIcon="mdi:lock"
+  />
+
+  <ToggleForm
+    name="allowDownloads"
     method="POST"
     action="?/{downloadEndpoint}"
-    use:enhance={() =>
-      ({ update, result }) => {
-        if (result.type === 'success') {
-          const res = result.data as ActionData;
-          if (res?.ok) {
-            if (downloadInput.checked) {
-              toast('success', m.project_acts_downloads_on());
-            } else {
-              toast('success', m.project_acts_downloads_off());
-            }
-          } else {
-            toast('error', m.errors_generic({ errorMessage: '' }));
-            downloadInput.checked = !downloadInput.checked;
-          }
-        }
-        update({ reset: false });
-      }}
-  >
-    <InputWithMessage
-      title={{ key: 'project_orgDownloads_title' }}
-      message={{ key: 'project_orgDownloads_description' }}
-      className={canEdit ? '' : 'cursor-not-allowed'}
-    >
-      <input
-        bind:this={downloadInput}
-        type="checkbox"
-        name="allowDownloads"
-        class="toggle toggle-accent ml-4"
-        checked={project.AllowDownloads}
-        onchange={() => {
-          downloadInput.form?.requestSubmit();
-        }}
-        disabled={!canEdit}
-      />
-    </InputWithMessage>
-  </form>
+    title={{ key: 'project_orgDownloads_title' }}
+    message={{ key: 'project_orgDownloads_description' }}
+    onmsg={m.project_acts_downloads_on()}
+    offmsg={m.project_acts_downloads_off()}
+    formVar={allowDownloads}
+  />
+
+  <ToggleForm
+    name="autoRebuildOnSoftwareUpdate"
+    method="POST"
+    action="?/{rebuildEndpoint}"
+    title={{ key: 'project_autoRebuild_on_update_title' }}
+    message={{ key: 'project_autoRebuild_on_update_description' }}
+    onmsg={m.project_acts_autoBuilds_on()}
+    offmsg={m.project_acts_autoBuilds_off()}
+    formVar={autoRebuild}
+  />
+
+  <ToggleForm
+    name="autoPublishOnRebuild"
+    method="POST"
+    action="?/{publishEndpoint}"
+    title={{ key: 'project_autoPublish_title' }}
+    message={{ key: 'project_autoPublish_description' }}
+    onmsg={m.project_acts_autoPublish_on()}
+    offmsg={m.project_acts_autoPublish_off()}
+    formVar={autoPublish}
+  />
 </div>
diff --git a/src/routes/(authenticated)/projects/new/[id=idNumber]/+page.svelte b/src/routes/(authenticated)/projects/new/[id=idNumber]/+page.svelte
index 3693ae9ce..9476211b8 100644
--- a/src/routes/(authenticated)/projects/new/[id=idNumber]/+page.svelte
+++ b/src/routes/(authenticated)/projects/new/[id=idNumber]/+page.svelte
@@ -5,7 +5,7 @@
   import BlockIfJobsUnavailable from '$lib/components/BlockIfJobsUnavailable.svelte';
   import LanguageCodeTypeahead from '$lib/components/LanguageCodeTypeahead.svelte';
   import LabeledFormInput from '$lib/components/settings/LabeledFormInput.svelte';
-  import PublicPrivateToggle from '$lib/components/settings/PublicPrivateToggle.svelte';
+  import Toggle from '$lib/components/settings/Toggle.svelte';
   import { m } from '$lib/paraglide/messages';
   import { getLocale, localizeHref } from '$lib/paraglide/runtime';
   import { toast } from '$lib/utils';
@@ -84,7 +84,7 @@
             bind:value={$form.Description}
           ></textarea>
         </LabeledFormInput>
-        <PublicPrivateToggle
+        <Toggle
           title={{ key: 'project_public' }}
           message={{ key: 'project_visibilityDescription' }}
           className="py-2 md:max-w-xs"