diff --git a/app/assets/css/preferences.css b/app/assets/css/preferences.css
new file mode 100644
index 00000000..db14e217
--- /dev/null
+++ b/app/assets/css/preferences.css
@@ -0,0 +1,36 @@
+.settings-field {
+    display: flex;
+    justify-content: space-between;
+}
+
+.settings-description-title {
+    font-weight: bold;
+    padding-bottom: 1em;
+}
+
+.setting-description-text {
+    font-size: 0.85em;
+    color: gray;
+}
+
+.settings-control {
+    display: flex;
+    justify-content: flex-end;
+    min-width: fit-content;
+}
+
+.preferences-update-btn {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 1em;
+}
+
+.preferences-dialog-header .p-dialog-header {
+    padding-bottom: 0
+}
+
+.autostart-interval-input {
+    min-width: unset;
+    height: 2.5em;
+    width: 8em;
+}
diff --git a/app/components/analysis/AnalysesTable.vue b/app/components/analysis/AnalysesTable.vue
index f25a4a35..ebfcff7f 100644
--- a/app/components/analysis/AnalysesTable.vue
+++ b/app/components/analysis/AnalysesTable.vue
@@ -15,31 +15,29 @@ import AnalysisControlButtons from "./AnalysisControlButtons.vue";
 import {
   getApprovalStatusSeverity,
   getBuildStatusSeverity,
-  getRunStatusSeverity,
+  getExecutionStatusSeverity,
 } from "~/utils/status-tag-severity";
 import {
   type AnalysisNode,
+  type AnalysisStatus,
   type ListRoutes,
+  type PodProgressResponse,
   PodStatus,
   type Project,
   type Route,
-  type StatusResponse,
 } from "~/services/Api";
-import { AnalysisBuildStatus, AnalysisNodeRunStatus } from "~/types/analysis";
 import { ApprovalStatus } from "~/types/node";
 import ContainerCounter from "~/components/analysis/ContainerCounter.vue";
 import { useDatastoreRequirement } from "~/composables/useDatastoreRequirement";
 import type { ModifiedAnalysisNode } from "~/services/modifiedApiInterfaces";
+import { ProcessStatus } from "~/types/analysis";
 
 const toast = useToast();
 const tableLoading = ref(true);
 
 // Data Store Requirement Check
-const { datastoreState } = await useDatastoreRequirement();
-const datastoreRequired = computed(
-  () => datastoreState.value.datastoreRequired,
-);
-const nodeType = computed(() => datastoreState.value.nodeType);
+const { nodeType, requireDataStore: datastoreRequired } =
+  useDatastoreRequirement();
 
 const datastoreBadgeSeverity = computed(() =>
   datastoreRequired.value ? "danger" : "secondary",
@@ -79,9 +77,9 @@ let currentOffset = 50; // Start with query limit and will increment by same amo
 const kongRoutes = ref<Set<string>>(new Set());
 
 // Imported values
-const runStatuses = Object.values(AnalysisNodeRunStatus);
 const approvalStatuses = Object.values(ApprovalStatus);
-const buildStatuses = Object.values(AnalysisBuildStatus);
+const processStatuses = Object.values(ProcessStatus);
+const podStatuses = Object.values(PodStatus);
 
 const { data: analysisNodeResp, status, refresh } = await getAnalysisNodes(); // Get the first batch of 50
 
@@ -137,7 +135,25 @@ async function parseProjects() {
   }
 }
 
-async function getRunStatusesFromPodOrc(): Promise<StatusResponse | undefined> {
+// /**
+//  * Changes to "executing" to "running" and "executed" to "finished" which is simpler language.
+//  * @param status
+//  */
+// function useCommonLanguage(
+//   status: PodStatus,
+// ): PodStatus | "running" | "finished" {
+//   if (status === PodStatus.Executing) {
+//     return "running";
+//   } else if (status === PodStatus.Executed) {
+//     return "finished";
+//   } else {
+//     return status;
+//   }
+// }
+
+async function getExecutionStatusesFromPodOrc(): Promise<
+  PodProgressResponse | undefined
+> {
   const podOrcResponse = (await useNuxtApp()
     .$hubApi("/po/status", {
       method: "GET",
@@ -150,17 +166,17 @@ async function getRunStatusesFromPodOrc(): Promise<StatusResponse | undefined> {
           "Unable to retrieve pod statuses from the PO, relying on information from the Hub",
         life: 3000,
       });
-    })) as StatusResponse;
+    })) as PodProgressResponse;
   podOrcUnreacheable.value = !podOrcResponse;
   return podOrcResponse;
 }
 
 async function checkForUpdatesFromPodOrc() {
   if (!podOrcUnreacheable.value) {
-    const newStatuses = await getRunStatusesFromPodOrc();
+    const newStatuses = await getExecutionStatusesFromPodOrc();
     if (newStatuses) {
-      for (const [analysisId, status] of Object.entries(newStatuses)) {
-        updateAnalysisRun(analysisId, status);
+      for (const [analysisId, progressData] of Object.entries(newStatuses)) {
+        updateAnalysisRun(analysisId, progressData);
       }
     }
   }
@@ -168,14 +184,19 @@ async function checkForUpdatesFromPodOrc() {
 
 function setProgress(analysis: ModifiedAnalysisNode): ModifiedAnalysisNode {
   // For testing: Math.round(Math.random() * 100);
-  analysis.progress = analysis.progress ? analysis.progress : 0;
+  analysis.execution_progress = analysis.execution_progress
+    ? analysis.execution_progress
+    : 0;
 
-  const currentRunStatus = analysis.run_status;
+  const currentRunStatus = analysis.execution_status;
   if (currentRunStatus) {
-    if (currentRunStatus === AnalysisNodeRunStatus.Failed) {
-      analysis.progress = 0;
-    } else if (currentRunStatus === AnalysisNodeRunStatus.Finished) {
-      analysis.progress = 100;
+    if (currentRunStatus === PodStatus.Failed) {
+      analysis.execution_progress = 0;
+    } else if (
+      currentRunStatus === PodStatus.Executed ||
+      currentRunStatus === PodStatus.Finished // deprecated
+    ) {
+      analysis.execution_progress = 100;
     }
   }
   return analysis;
@@ -201,7 +222,7 @@ function determineProgressBarColor(progress: number) {
 
 function parseAnalysis(
   analysisEntry: ModifiedAnalysisNode,
-  runStatuses: StatusResponse | undefined,
+  executionStatuses: PodProgressResponse | undefined,
 ): ModifiedAnalysisNode {
   const projId = analysisEntry.analysis?.project_id;
   const analysisId = analysisEntry.analysis_id;
@@ -212,15 +233,15 @@ function parseAnalysis(
   // If PodOrc status update returns undefined -> use hub info since it's all we have
   // If status from PodOrc -> use it
   // If no run status reported by PodOrc, and it's not failed/finished -> set to null (wrong hub info)
-  if (runStatuses) {
-    if (analysisId in runStatuses) {
-      analysisEntry.run_status = runStatuses[analysisId] ?? null;
+  if (executionStatuses) {
+    if (analysisId in executionStatuses) {
+      analysisEntry.execution_status = executionStatuses[analysisId]!.status;
     } else {
       if (
-        analysisEntry.run_status != AnalysisNodeRunStatus.Failed &&
-        analysisEntry.run_status != AnalysisNodeRunStatus.Finished
+        analysisEntry.execution_status != PodStatus.Failed &&
+        analysisEntry.execution_status != PodStatus.Executed
       ) {
-        analysisEntry.run_status = null;
+        analysisEntry.execution_status = null;
       }
     }
   }
@@ -235,7 +256,8 @@ async function compileAnalysisTable(
   await parseProjects();
   await getKongRoutes();
   const parsedAnalyses = new Map<string, ModifiedAnalysisNode>();
-  const currentRunStatuses = await getRunStatusesFromPodOrc();
+  const currentExecutionStatuses: PodProgressResponse | undefined =
+    await getExecutionStatusesFromPodOrc();
 
   let analysisData: AnalysisNode[] | undefined;
   if (respStatus === "success") {
@@ -250,12 +272,12 @@ async function compileAnalysisTable(
     analysisData,
     ["created_at", "updated_at"],
     expandRowEntries,
-  );
-  if (projMap.size > 0) {
+  ) as ModifiedAnalysisNode[];
+  if (formattedAnalyses && projMap.size > 0) {
     formattedAnalyses.forEach((analysisEntry: ModifiedAnalysisNode) => {
       parsedAnalyses.set(
         analysisEntry.analysis_id,
-        parseAnalysis(analysisEntry, currentRunStatuses),
+        parseAnalysis(analysisEntry, currentExecutionStatuses),
       );
     });
     analysesMap.value = parsedAnalyses;
@@ -327,7 +349,7 @@ const defaultFilters = {
   global: { value: undefined, matchMode: FilterMatchMode.CONTAINS },
   approval_status: { value: undefined, matchMode: FilterMatchMode.EQUALS },
   "analysis.build_status": { value: undefined, matchMode: FilterMatchMode.IN },
-  run_status: { value: undefined, matchMode: FilterMatchMode.IN },
+  execution_status: { value: undefined, matchMode: FilterMatchMode.IN },
 };
 filters.value = defaultFilters;
 
@@ -346,35 +368,41 @@ const updateFilters = (filterText: string) => {
   filters.value.global.value = filterText;
 };
 
-function updateAnalysisRun(analysisId: string, newStatus: PodStatus | null) {
+function updateAnalysisRun(
+  analysisId: string,
+  newStatusData: AnalysisStatus | undefined,
+) {
   if (analysesMap.value.has(analysisId)) {
     const analysisToUpdate = analysesMap.value.get(analysisId)!; // Tell typescript we are sure there is a value
-    analysisToUpdate.run_status = newStatus;
+    if (newStatusData) {
+      analysisToUpdate.execution_status = newStatusData.status;
+      analysisToUpdate.execution_progress = newStatusData.progress || 0;
+    }
     analysesMap.value.set(analysisId, setProgress(analysisToUpdate));
   }
 }
 
-function updateRunStatusFilter(filterText: string) {
-  const currentRunStatusFilters = filters.value.run_status.value;
-  if (!currentRunStatusFilters) {
-    // If value is undefined then initialize with filter in array
-    filters.value.run_status.value = [filterText];
+function updateExecutionStatusFilter(filterText: string) {
+  const currentExecutionStatusFilters = filters.value.execution_status.value;
+  if (!currentExecutionStatusFilters) {
+    // If value is null then initialize with filter in array
+    filters.value.execution_status.value = [filterText];
   } else {
     // Already run status filters present
-    if (currentRunStatusFilters.includes(filterText)) {
+    if (currentExecutionStatusFilters.includes(filterText)) {
       // If filter already there, then remove it
-      const filteredStatuses = currentRunStatusFilters.filter(
+      const filteredStatuses = currentExecutionStatusFilters.filter(
         (item) => item !== filterText,
       );
       if (filteredStatuses.length == 0) {
-        // If empty array after filtering then set to undefined
-        filters.value.run_status.value = undefined;
+        // If empty array after filtering then set to null
+        filters.value.execution_status.value = undefined;
       } else {
-        filters.value.run_status.value = filteredStatuses;
+        filters.value.execution_status.value = filteredStatuses;
       }
     } else {
       // Apply filter since it isn't present
-      filters.value.run_status.value.push(filterText);
+      filters.value.execution_status.value.push(filterText);
     }
   }
 }
@@ -445,7 +473,7 @@ const onCloseNavToast = () => {
               If the image for the analysis is not yet
               <Tag
                 :severity="'success'"
-                :value="'finished'"
+                :value="PodStatus.Running"
                 style="margin-left: 0.5em; margin-right: 0.5em"
               />
               (see Build Status) or if a data store does not exist for the
@@ -456,7 +484,7 @@ const onCloseNavToast = () => {
             <ContainerCounter
               :activeFilters="filters"
               :analyses="analyses"
-              @applyRunStatusFilter="updateRunStatusFilter"
+              @applyExecutionStatusFilter="updateExecutionStatusFilter"
             />
           </div>
         </div>
@@ -580,7 +608,7 @@ const onCloseNavToast = () => {
             <template #filter="{ filterModel, filterCallback }">
               <MultiSelect
                 v-model="filterModel.value"
-                :options="buildStatuses"
+                :options="processStatuses"
                 class="p-column-filter"
                 display="chip"
                 optionLabel=""
@@ -605,8 +633,8 @@ const onCloseNavToast = () => {
             :showClearButton="false"
             :showFilterMatchModes="false"
             :showFilterOperator="false"
-            field="run_status"
-            filterField="run_status"
+            field="execution_status"
+            filterField="execution_status"
           >
             <template #header>
               <span
@@ -618,15 +646,15 @@ const onCloseNavToast = () => {
             </template>
             <template #body="{ data }">
               <Tag
-                v-if="data.run_status"
-                :severity="getRunStatusSeverity(data.run_status)"
-                :value="data.run_status"
+                v-if="data.execution_status"
+                :severity="getExecutionStatusSeverity(data.execution_status)"
+                :value="data.execution_status"
               />
             </template>
             <template #filter="{ filterModel, filterCallback }">
               <MultiSelect
                 v-model="filterModel.value"
-                :options="runStatuses"
+                :options="podStatuses"
                 class="p-column-filter"
                 optionLabel=""
                 placeholder="Any"
@@ -636,7 +664,7 @@ const onCloseNavToast = () => {
                   <div class="flex align-items-center gap-2">
                     <Tag
                       v-if="slotProps.option"
-                      :severity="getRunStatusSeverity(slotProps.option)"
+                      :severity="getExecutionStatusSeverity(slotProps.option)"
                       :value="slotProps.option"
                     />
                   </div>
@@ -734,13 +762,14 @@ const onCloseNavToast = () => {
             <template #body="{ data }">
               <ProgressBar
                 :mode="
-                  data.run_status === AnalysisNodeRunStatus.Running &&
-                  !data.progress
+                  (data.execution_status === PodStatus.Executing ||
+                    data.execution_status === PodStatus.Running) &&
+                  !data.execution_progress
                     ? 'indeterminate'
                     : 'determinate'
                 "
-                :style="determineProgressBarColor(data.progress)"
-                :value="data.progress"
+                :style="determineProgressBarColor(data.execution_progress)"
+                :value="data.execution_progress"
               />
             </template>
           </Column>
@@ -762,7 +791,7 @@ const onCloseNavToast = () => {
                   :analysisBuildStatus="slotProps.data.analysis.build_status"
                   :analysisId="slotProps.data.analysis_id"
                   :analysisNodeId="slotProps.data.id"
-                  :analysisRunStatus="slotProps.data.run_status"
+                  :analysisExecutionStatus="slotProps.data.execution_status"
                   :datastore="slotProps.data.datastore"
                   :nodeId="slotProps.data.node_id"
                   :requireDatastore="datastoreRequired!"
diff --git a/app/components/analysis/AnalysisControlButtons.vue b/app/components/analysis/AnalysisControlButtons.vue
index 578e1f8e..33ffe1ad 100644
--- a/app/components/analysis/AnalysisControlButtons.vue
+++ b/app/components/analysis/AnalysisControlButtons.vue
@@ -2,8 +2,12 @@
 import AnalysisUpdateButton from "./AnalysisUpdateButton.vue";
 import { useToast } from "primevue/usetoast";
 import { useNuxtApp } from "nuxt/app";
-import { AnalysisBuildStatus, AnalysisNodeRunStatus } from "~/types/analysis";
-import { PodStatus, type StatusResponse } from "~/services/Api";
+import { ProcessStatus } from "~/types/analysis";
+import {
+  type PodProgressResponse,
+  PodStatus,
+  type StatusOnlyResponse,
+} from "~/services/Api";
 
 type ToastSeverity = "success" | "info" | "warn" | "error" | undefined;
 
@@ -16,7 +20,7 @@ interface ButtonStates {
 
 const props = defineProps({
   analysisBuildStatus: [String, null],
-  analysisRunStatus: {
+  analysisExecutionStatus: {
     type: [String, null],
     required: true,
   },
@@ -54,26 +58,29 @@ const loading = ref(false);
 const NOT_FOUND_STATUS = 404;
 const CONFLICT_STATUS = 409;
 
-const playButtonActiveStates = [undefined, null, ""];
+const playButtonActiveStates = [null, "", undefined];
 const rerunButtonActiveStates: Array<string | null | undefined> = [
-  AnalysisNodeRunStatus.Failed,
-  AnalysisNodeRunStatus.Finished,
-  AnalysisNodeRunStatus.Stopped,
-  AnalysisNodeRunStatus.Stopping,
+  PodStatus.Failed,
+  PodStatus.Executed,
+  PodStatus.Finished, // Deprecated
+  PodStatus.Stopped,
+  PodStatus.Stopping,
 ];
 const stopButtonActiveStates: Array<string | null | undefined> = [
-  AnalysisNodeRunStatus.Running,
-  AnalysisNodeRunStatus.Starting,
-  AnalysisNodeRunStatus.Started,
-  AnalysisNodeRunStatus.Stopping,
+  PodStatus.Executing,
+  PodStatus.Running, // Deprecated
+  PodStatus.Starting,
+  PodStatus.Started,
+  PodStatus.Stopping,
 ];
 const deleteButtonActiveStates: Array<string | null | undefined> = [
   PodStatus.Failed,
-  AnalysisNodeRunStatus.Stopped,
-  AnalysisNodeRunStatus.Stopping,
-  AnalysisNodeRunStatus.Running,
-  AnalysisNodeRunStatus.Starting,
-  AnalysisNodeRunStatus.Started,
+  PodStatus.Stopped,
+  PodStatus.Stopping,
+  PodStatus.Executing,
+  PodStatus.Running, // Deprecated
+  PodStatus.Starting,
+  PodStatus.Started,
 ];
 
 function getButtonStatuses(podStatus: string | null | undefined) {
@@ -86,14 +93,18 @@ function getButtonStatuses(podStatus: string | null | undefined) {
 }
 
 const buttonStatuses = computed<ButtonStates>(
-  () => getButtonStatuses(props.analysisRunStatus), // Changes buttons when new status update comes in
+  () => getButtonStatuses(props.analysisExecutionStatus), // Changes buttons when new status update comes in
 );
 
 function updatePodStatus(
   podStatus: string | null | undefined,
-  progressUpdate?: number | undefined,
+  progressUpdate?: number | null | undefined,
 ) {
-  emit("updateAnalysisRow", props.analysisId, podStatus, progressUpdate);
+  const analysisUpdate = {
+    status: podStatus,
+    progress: progressUpdate,
+  };
+  emit("updateAnalysisRow", props.analysisId, analysisUpdate);
 }
 
 const showToast = (severity: ToastSeverity, summary: string, msg: string) => {
@@ -114,23 +125,24 @@ const showStatusUnknownToast = () => {
 };
 
 async function checkPodStatus(): Promise<boolean> {
-  const podStatus: StatusResponse = (await useNuxtApp()
+  const podStatus: PodProgressResponse = (await useNuxtApp()
     .$hubApi(`/po/status/${props.analysisId}`, {
       method: "GET",
     })
-    .catch(() => undefined)) as StatusResponse; // Set the response to undefined if an error occurs
+    .catch(() => null)) as PodProgressResponse; // Set the response to undefined if an error occurs
 
   // If response is not undefined AND "status" in response AND "status" is not empty
   if (podStatus && props.analysisId in podStatus) {
-    const currentPodStatus = podStatus[props.analysisId];
+    const currentPodStatus = podStatus[props.analysisId]!.status;
+    const currentPodProgress = podStatus[props.analysisId]!.progress;
     // If the status is not empty and not FINISHED
-    if (currentPodStatus != AnalysisNodeRunStatus.Finished) {
+    if (currentPodStatus != PodStatus.Executed) {
       showToast(
         "warn",
         "Analysis already running",
         "The analysis is already running on this node, the controls have been updated",
       );
-      updatePodStatus(currentPodStatus); // Grab the first status update
+      updatePodStatus(currentPodStatus, currentPodProgress); // Grab the first status update
       return true;
     }
   }
@@ -144,23 +156,23 @@ async function onRerunAnalysis() {
 
 async function onStartAnalysis() {
   loading.value = true;
-  const originalRunStatus = props.analysisRunStatus;
-  updatePodStatus(AnalysisNodeRunStatus.Starting);
+  const originalExecutionStatus = props.analysisExecutionStatus;
+  updatePodStatus(PodStatus.Starting);
   let analysisProps = new FormData();
 
   analysisProps.append("analysis_id", props.analysisId!);
   analysisProps.append("project_id", props.projectId!);
 
-  let startPodResp: StatusResponse = (await useNuxtApp()
+  let startPodResp: StatusOnlyResponse = (await useNuxtApp()
     .$hubApi("/analysis/initialize", {
       method: "POST",
       body: analysisProps,
     })
     .catch((e) => {
-      updatePodStatus(undefined);
+      updatePodStatus(null);
       if (e.status == 408) {
         // Timed out waiting for image to pull
-        updatePodStatus(AnalysisNodeRunStatus.Started);
+        updatePodStatus(PodStatus.Started);
         showToast(
           "info",
           "Analysis submitted",
@@ -180,14 +192,14 @@ async function onStartAnalysis() {
       } else {
         showToast("error", "Start failure", "Failed to start the analysis");
       }
-    })) as StatusResponse;
+    })) as StatusOnlyResponse;
 
   if (startPodResp && props.analysisId in startPodResp) {
-    const currentRunStatus = startPodResp[props.analysisId];
-    updatePodStatus(currentRunStatus);
+    const currentExecutionStatus = startPodResp[props.analysisId];
+    updatePodStatus(currentExecutionStatus);
     showToast("success", "Start success", "Successfully started the container");
   } else {
-    updatePodStatus(originalRunStatus);
+    updatePodStatus(originalExecutionStatus);
   }
 
   loading.value = false;
@@ -195,10 +207,10 @@ async function onStartAnalysis() {
 
 async function onStopAnalysis() {
   loading.value = true;
-  const originalRunStatus = props.analysisRunStatus;
-  updatePodStatus(AnalysisNodeRunStatus.Stopping);
+  const originalExecutionStatus = props.analysisExecutionStatus;
+  updatePodStatus(PodStatus.Stopping);
 
-  const stopResp: StatusResponse = (await useNuxtApp()
+  const stopResp: StatusOnlyResponse = (await useNuxtApp()
     .$hubApi(`/po/stop/${props.analysisId}`, {
       method: "PUT",
     })
@@ -208,7 +220,7 @@ async function onStopAnalysis() {
         "Stop failure",
         "Failed to stop the analysis container",
       );
-    })) as StatusResponse;
+    })) as StatusOnlyResponse;
 
   // stopResp is undefined if error occurred
   if (stopResp) {
@@ -222,19 +234,19 @@ async function onStopAnalysis() {
       // No pod statuses returned from PO for analysis
       showStatusUnknownToast();
     }
-    updatePodStatus(AnalysisNodeRunStatus.Stopped);
+    updatePodStatus(PodStatus.Stopped);
   } else {
-    updatePodStatus(originalRunStatus);
+    updatePodStatus(originalExecutionStatus);
   }
   loading.value = false;
 }
 
 async function onDeleteAnalysis() {
   loading.value = true;
-  const originalRunStatus = props.analysisRunStatus;
-  updatePodStatus(AnalysisNodeRunStatus.Stopping);
+  const originalExecutionStatus = props.analysisExecutionStatus;
+  updatePodStatus(PodStatus.Stopping);
 
-  const deleteResp: StatusResponse = (await useNuxtApp()
+  const deleteResp: StatusOnlyResponse = (await useNuxtApp()
     .$hubApi(`/analysis/terminate/${props.analysisId}`, {
       method: "DELETE",
     })
@@ -244,7 +256,7 @@ async function onDeleteAnalysis() {
         "Terminate request failure",
         "Failed to terminate the analysis",
       );
-    })) as StatusResponse;
+    })) as StatusOnlyResponse;
 
   // deleteResp is undefined if error occurred
   if (deleteResp) {
@@ -257,9 +269,9 @@ async function onDeleteAnalysis() {
     } else {
       showStatusUnknownToast();
     }
-    updatePodStatus("");
+    updatePodStatus(null);
   } else {
-    updatePodStatus(originalRunStatus);
+    updatePodStatus(originalExecutionStatus);
   }
 
   loading.value = false;
@@ -273,7 +285,7 @@ async function onDeleteAnalysis() {
       v-tooltip.top="'Start the analysis'"
       :disabled="
         !buttonStatuses.playActive ||
-        !(props.analysisBuildStatus === AnalysisBuildStatus.Finished) ||
+        !(props.analysisBuildStatus === ProcessStatus.Executed) ||
         (!props.datastore && props.requireDatastore)
       "
       :loading="loading"
@@ -288,7 +300,7 @@ async function onDeleteAnalysis() {
       v-tooltip.top="'Rerun the analysis'"
       :disabled="
         !buttonStatuses.rerunActive ||
-        !(props.analysisBuildStatus === AnalysisBuildStatus.Finished) ||
+        !(props.analysisBuildStatus === ProcessStatus.Executed) ||
         (!props.datastore && props.requireDatastore)
       "
       :loading="loading"
@@ -302,7 +314,7 @@ async function onDeleteAnalysis() {
       v-tooltip.top="'Stop the analysis'"
       :disabled="
         !buttonStatuses.stopActive ||
-        !(props.analysisBuildStatus === AnalysisBuildStatus.Finished) ||
+        !(props.analysisBuildStatus === ProcessStatus.Executed) ||
         (!props.datastore && props.requireDatastore)
       "
       :loading="loading"
@@ -316,7 +328,7 @@ async function onDeleteAnalysis() {
       v-tooltip.top="'Delete the analysis container'"
       :disabled="
         !buttonStatuses.deleteActive ||
-        !(props.analysisBuildStatus === AnalysisBuildStatus.Finished) ||
+        !(props.analysisBuildStatus === ProcessStatus.Executed) ||
         (!props.datastore && props.requireDatastore)
       "
       :loading="loading"
diff --git a/app/components/analysis/AnalysisUpdateButton.vue b/app/components/analysis/AnalysisUpdateButton.vue
index de26903a..f5f582cc 100644
--- a/app/components/analysis/AnalysisUpdateButton.vue
+++ b/app/components/analysis/AnalysisUpdateButton.vue
@@ -2,7 +2,7 @@
 import { useNuxtApp } from "nuxt/app";
 import { useToast } from "primevue/usetoast";
 
-import { PodStatus, type StatusResponse } from "~/services/Api";
+import { type AnalysisStatus, type PodProgressResponse } from "~/services/Api";
 import { FetchError } from "ofetch";
 
 const props = defineProps({
@@ -16,16 +16,16 @@ const emit = defineEmits(["updateAnalysisRun"]);
 const loading = ref(false);
 const toast = useToast();
 
-async function getStatusUpdateFromPodOrc(): Promise<PodStatus | undefined> {
-  let analysisStatus: PodStatus | undefined = undefined;
+async function getStatusUpdateFromPodOrc(): Promise<
+  AnalysisStatus | undefined
+> {
+  let analysisStatus: AnalysisStatus | undefined = undefined;
 
   try {
-    const analysisStatusUpdate: StatusResponse = await useNuxtApp().$hubApi(
-      `/po/status/${props.analysisId}`,
-      {
+    const analysisStatusUpdate: PodProgressResponse =
+      await useNuxtApp().$hubApi(`/po/status/${props.analysisId}`, {
         method: "GET",
-      },
-    );
+      });
 
     if (analysisStatusUpdate && props.analysisId in analysisStatusUpdate) {
       analysisStatus = analysisStatusUpdate[props.analysisId];
diff --git a/app/components/analysis/ContainerCounter.vue b/app/components/analysis/ContainerCounter.vue
index 33314ca0..9e346be9 100644
--- a/app/components/analysis/ContainerCounter.vue
+++ b/app/components/analysis/ContainerCounter.vue
@@ -2,7 +2,7 @@
 import Badge from "primevue/badge";
 import { countAnalysisContainers } from "~/utils/count-analyses";
 import type { ModifiedAnalysisNode } from "~/services/modifiedApiInterfaces";
-import { AnalysisNodeRunStatus } from "~/types/analysis";
+import { PodStatus } from "~/services/Api";
 
 const props = defineProps({
   analyses: {
@@ -15,15 +15,23 @@ const props = defineProps({
   },
 });
 
-const currentFilters = ref(props.activeFilters.run_status);
+const currentFilters = ref(props.activeFilters.execution_status);
 const counts = computed(() =>
   countAnalysisContainers(props.analyses as ModifiedAnalysisNode[]),
 );
 
-const emit = defineEmits(["applyRunStatusFilter"]);
+const emit = defineEmits(["applyExecutionStatusFilter"]);
 
-function onApplyRunStatusFilter(runStatus: string) {
-  emit("applyRunStatusFilter", runStatus);
+function onApplyExecutionStatusFilter(executionStatus: PodStatus) {
+  emit("applyExecutionStatusFilter", executionStatus);
+
+  // Also emit the PO alternatives
+  if (executionStatus === PodStatus.Executing) {
+    emit("applyExecutionStatusFilter", PodStatus.Running);
+  }
+  if (executionStatus === PodStatus.Executed) {
+    emit("applyExecutionStatusFilter", PodStatus.Finished);
+  }
 }
 </script>
 
@@ -40,8 +48,7 @@ function onApplyRunStatusFilter(runStatus: string) {
               'opaque-badge':
                 currentFilters.value &&
                 !currentFilters.value.includes(
-                  AnalysisNodeRunStatus.Started ||
-                    AnalysisNodeRunStatus.Starting,
+                  PodStatus.Started || PodStatus.Starting,
                 ),
             }"
             class="container-counter container-counter-started"
@@ -51,7 +58,7 @@ function onApplyRunStatusFilter(runStatus: string) {
               class="counter-badge counter-badge-started"
               severity="info"
               size="xlarge"
-              @click="onApplyRunStatusFilter(AnalysisNodeRunStatus.Started)"
+              @click="onApplyExecutionStatusFilter(PodStatus.Started)"
             />
             <span class="counter-id-txt">Started</span>
           </div>
@@ -59,16 +66,16 @@ function onApplyRunStatusFilter(runStatus: string) {
             :class="{
               'opaque-badge':
                 currentFilters.value &&
-                !currentFilters.value.includes(AnalysisNodeRunStatus.Running),
+                !currentFilters.value.includes(PodStatus.Executing),
             }"
-            class="container-counter container-counter-running"
+            class="container-counter container-counter-executing"
           >
             <Badge
-              :value="counts.running || 0"
-              class="counter-badge counter-badge-running"
+              :value="counts.executing || 0"
+              class="counter-badge counter-badge-executing"
               severity="contrast"
               size="xlarge"
-              @click="onApplyRunStatusFilter(AnalysisNodeRunStatus.Running)"
+              @click="onApplyExecutionStatusFilter(PodStatus.Executing)"
             />
             <span class="counter-id-txt">Running</span>
           </div>
@@ -77,8 +84,7 @@ function onApplyRunStatusFilter(runStatus: string) {
               'opaque-badge':
                 currentFilters.value &&
                 !currentFilters.value.includes(
-                  AnalysisNodeRunStatus.Stopped ||
-                    AnalysisNodeRunStatus.Stopping,
+                  PodStatus.Stopped || PodStatus.Stopping,
                 ),
             }"
             class="container-counter container-counter-stopped"
@@ -88,7 +94,7 @@ function onApplyRunStatusFilter(runStatus: string) {
               class="counter-badge counter-badge-stopped"
               severity="warning"
               size="xlarge"
-              @click="onApplyRunStatusFilter(AnalysisNodeRunStatus.Stopped)"
+              @click="onApplyExecutionStatusFilter(PodStatus.Stopped)"
             />
             <span class="counter-id-txt">Stopped</span>
           </div>
@@ -96,7 +102,7 @@ function onApplyRunStatusFilter(runStatus: string) {
             :class="{
               'opaque-badge':
                 currentFilters.value &&
-                !currentFilters.value.includes(AnalysisNodeRunStatus.Failed),
+                !currentFilters.value.includes(PodStatus.Failed),
             }"
             class="container-counter container-counter-failed"
           >
@@ -105,7 +111,7 @@ function onApplyRunStatusFilter(runStatus: string) {
               class="counter-badge counter-badge-failed"
               severity="danger"
               size="xlarge"
-              @click="onApplyRunStatusFilter(AnalysisNodeRunStatus.Failed)"
+              @click="onApplyExecutionStatusFilter(PodStatus.Failed)"
             />
             <span class="counter-id-txt">Failed</span>
           </div>
@@ -113,16 +119,16 @@ function onApplyRunStatusFilter(runStatus: string) {
             :class="{
               'opaque-badge':
                 currentFilters.value &&
-                !currentFilters.value.includes(AnalysisNodeRunStatus.Finished),
+                !currentFilters.value.includes(PodStatus.Executed),
             }"
-            class="container-counter container-counter-finished"
+            class="container-counter container-counter-executed"
           >
             <Badge
-              :value="counts.finished || 0"
-              class="counter-badge counter-badge-finished"
+              :value="counts.executed || 0"
+              class="counter-badge counter-badge-executed"
               severity="success"
               size="xlarge"
-              @click="onApplyRunStatusFilter(AnalysisNodeRunStatus.Finished)"
+              @click="onApplyExecutionStatusFilter(PodStatus.Executed)"
             />
             <span class="counter-id-txt">Finished</span>
           </div>
diff --git a/app/components/data-stores/DataStoreList.vue b/app/components/data-stores/DataStoreList.vue
index 8bed16d9..16bd0db2 100644
--- a/app/components/data-stores/DataStoreList.vue
+++ b/app/components/data-stores/DataStoreList.vue
@@ -61,7 +61,7 @@ async function loadDetailedDataStoreTable(
     );
 
     formattedDataStores.forEach((store: ModifiedDetailedService) => {
-      if (store.routes!.length) {
+      if (store.routes) {
         store.routes = formatDataRow(
           store.routes,
           dataRowUnixCols,
diff --git a/app/components/header/AvatarButton.vue b/app/components/header/AvatarButton.vue
index c03d390f..d89e9c70 100644
--- a/app/components/header/AvatarButton.vue
+++ b/app/components/header/AvatarButton.vue
@@ -1,34 +1,31 @@
 <script lang="ts" setup>
 import Menu from "primevue/menu";
-import ToggleSwitch from "primevue/toggleswitch";
 import Button from "primevue/button";
 import { useRuntimeConfig } from "nuxt/app";
 import CleanupDialog from "~/components/header/CleanupDialog.vue";
-import { useDatastoreRequirement } from "~/composables/useDatastoreRequirement";
 
 const { signIn, signOut } = useAuth();
 const { status: authStatus, data: authData } = useAuthState();
 
 const menu = ref();
-
-const { datastoreState, setDatastoreRequired } =
-  await useDatastoreRequirement();
-const datastoreRequired = computed(
-  () => datastoreState.value.datastoreRequired,
-);
+const showCleanupDialog = ref(false);
+const showPreferencesDialog = ref(false);
 
 const config = useRuntimeConfig();
 const baseUrl = new URL(config.public.baseUrl as string).origin;
 const idpProvider = config.public.idpProvider;
 
 const isAuthenticated = computed(() => authStatus.value === "authenticated");
-const showCleanupDialog = ref(false);
 
 const userActionLabel = isAuthenticated.value ? "Logout" : "Login";
 const userActionIcon = isAuthenticated.value
   ? "pi pi-sign-in"
   : "pi pi-sign-out";
 
+const toggle = (event) => {
+  menu.value.toggle(event);
+};
+
 const menuItems = ref([
   {
     label: "Options",
@@ -53,20 +50,21 @@ const menuItems = ref([
         command: () => {
           showCleanupDialog.value = true;
         },
+        visible: isAuthenticated.value,
         disabled: !isAuthenticated.value,
       },
       {
-        label: "Require Data Store",
-        icon: "pi pi-database",
-        isToggle: true, // custom flag to identify it in the slot
+        label: "Preferences",
+        icon: "pi pi-cog",
+        command: () => {
+          showPreferencesDialog.value = true;
+        },
+        visible: isAuthenticated.value,
+        disabled: !isAuthenticated.value,
       },
     ],
   },
 ]);
-
-const toggle = (event) => {
-  menu.value.toggle(event);
-};
 </script>
 
 <template>
@@ -107,22 +105,6 @@ const toggle = (event) => {
     >
       <template #item="{ item, props }">
         <a
-          v-if="item.isToggle"
-          v-ripple
-          class="flex items-center"
-          v-bind="props.action"
-          @click.prevent="setDatastoreRequired(!datastoreRequired)"
-        >
-          <i :class="item.icon" />
-          <span class="ml-2 menu-item-label">{{ item.label }}</span>
-          <ToggleSwitch
-            :modelValue="datastoreRequired ?? false"
-            class="ml-auto"
-            @click.stop="setDatastoreRequired(!datastoreRequired)"
-          />
-        </a>
-        <a
-          v-else
           v-ripple
           :href="item.url"
           :target="item.target"
@@ -135,6 +117,7 @@ const toggle = (event) => {
     </Menu>
   </div>
   <CleanupDialog v-model:cleanUpVisible="showCleanupDialog" />
+  <PreferencesDialog v-model:preferencesVisible="showPreferencesDialog" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/app/components/preferences/AutostartField.vue b/app/components/preferences/AutostartField.vue
new file mode 100644
index 00000000..40c161b8
--- /dev/null
+++ b/app/components/preferences/AutostartField.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import ToggleSwitch from "primevue/toggleswitch";
+import type { AutostartSettings } from "~/services/Api";
+import Divider from "primevue/divider";
+
+const autostartModel = defineModel<AutostartSettings>({ required: true });
+</script>
+
+<template>
+  <div class="settings-field autostart-enabled-field">
+    <div class="settings-description">
+      <h3 class="settings-description-title">Autostart Analyses</h3>
+      <span class="setting-description-text"
+        >Immediately start an analysis as soon as it is detected in the hub for
+        the current node. If a data store is required for the analysis to run
+        and is not yet configured, it will not be started.</span
+      >
+    </div>
+    <div class="settings-control autostart-toggle">
+      <ToggleSwitch
+        v-model="autostartModel.enabled!"
+        label="Autostart Analyses"
+      />
+    </div>
+  </div>
+  <Divider />
+  <div class="settings-field autostart-interval-field">
+    <div class="settings-description">
+      <h3 class="settings-description-title">Autostart Interval</h3>
+      <span class="setting-description-text"
+        >How often (in seconds) the Hub should be queried to check for new
+        analyses.</span
+      >
+    </div>
+    <div class="settings-control autostart-interval-input">
+      <InputNumber
+        v-model="autostartModel.interval"
+        v-tooltip.top="{
+          value: 'Autostart is disabled!',
+          disabled: autostartModel.enabled,
+        }"
+        :disabled="!autostartModel.enabled"
+        :min="1"
+        :invalid="autostartModel.enabled === null"
+        label="Autostart Analyses"
+        fluid
+      />
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/app/components/preferences/PreferencesDialog.vue b/app/components/preferences/PreferencesDialog.vue
new file mode 100644
index 00000000..2c8977fd
--- /dev/null
+++ b/app/components/preferences/PreferencesDialog.vue
@@ -0,0 +1,89 @@
+<script setup lang="ts">
+import RequireDataStoreField from "~/components/preferences/RequireDataStoreField.vue";
+import AutostartField from "~/components/preferences/AutostartField.vue";
+import Button from "primevue/button";
+import Divider from "primevue/divider";
+import { useNodeSettingsStore } from "~/stores/nodeSettingsStore";
+import { useToast } from "primevue/usetoast";
+import type { AutostartSettings } from "~/services/Api";
+
+const preferencesVisible = defineModel<boolean>("preferencesVisible");
+const loading = ref(false);
+const toast = useToast();
+const store = useNodeSettingsStore();
+
+const draftRequireDataStore = ref(store.requireDataStore);
+const draftAutostart = ref<AutostartSettings>({
+  enabled: store.autostartEnabled,
+  interval: store.autostartInterval,
+});
+
+watch(preferencesVisible, (visible) => {
+  if (visible) {
+    draftRequireDataStore.value = store.requireDataStore;
+    draftAutostart.value.enabled = store.autostartEnabled;
+    draftAutostart.value.interval = store.autostartInterval;
+  }
+});
+
+async function onSubmitPreferences() {
+  loading.value = true;
+
+  const updated = await store.updateSettings({
+    require_data_store: draftRequireDataStore.value,
+    autostart: {
+      enabled: draftAutostart.value.enabled,
+      interval: draftAutostart.value.interval,
+    },
+  });
+
+  if (updated) {
+    toast.add({
+      severity: "success",
+      summary: "Update Success",
+      detail: "Settings were successfully updated",
+      life: 5000,
+    });
+  } else {
+    toast.add({
+      severity: "error",
+      summary: "Update Failed",
+      detail: "Settings could not be updated",
+      life: 5000,
+    });
+  }
+
+  loading.value = false;
+}
+</script>
+
+<template>
+  <div class="preferences-dialog-container">
+    <Dialog
+      v-model:visible="preferencesVisible"
+      modal
+      header="Node Settings"
+      class="preferences-dialog-header"
+      :style="{ width: '40rem' }"
+    >
+      <Divider />
+      <div class="data-store-requirement-section">
+        <RequireDataStoreField v-model="draftRequireDataStore" />
+      </div>
+      <Divider />
+      <div class="autostart-section">
+        <AutostartField v-model="draftAutostart" />
+      </div>
+      <div class="preferences-update-btn">
+        <Button
+          label="Update"
+          severity="contrast"
+          size="small"
+          icon="pi pi-save"
+          :loading="loading"
+          @click="onSubmitPreferences()"
+        ></Button>
+      </div>
+    </Dialog>
+  </div>
+</template>
diff --git a/app/components/preferences/RequireDataStoreField.vue b/app/components/preferences/RequireDataStoreField.vue
new file mode 100644
index 00000000..e7262f9d
--- /dev/null
+++ b/app/components/preferences/RequireDataStoreField.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+import ToggleSwitch from "primevue/toggleswitch";
+
+const model = defineModel<boolean>({ required: true });
+</script>
+
+<template>
+  <div class="settings-field data-store-requirement-field">
+    <div class="settings-description data-store-requirement-toggle-icon">
+      <h3 class="settings-description-title">Require Data Store</h3>
+      <span class="setting-description-text"
+        >Toggle to control whether an analysis requires a data store before
+        being started.</span
+      >
+    </div>
+    <div class="settings-control data-store-requirement-toggle">
+      <ToggleSwitch v-model="model" label="Require Data Store" />
+    </div>
+  </div>
+</template>
diff --git a/app/composables/useDatastoreRequirement.ts b/app/composables/useDatastoreRequirement.ts
index d94a7588..3fabcac6 100644
--- a/app/composables/useDatastoreRequirement.ts
+++ b/app/composables/useDatastoreRequirement.ts
@@ -1,68 +1,8 @@
-import { type NodeSettings, type NodeTypeResponse } from "~/services/Api";
-import { useNuxtApp, useRoute, useState } from "nuxt/app";
+import { useNodeSettingsStore } from "~/stores/nodeSettingsStore";
+import { storeToRefs } from "pinia";
 
-interface DatastoreState {
-  datastoreRequired: boolean | undefined | null;
-  nodeType: string | undefined;
-}
-
-export async function useDatastoreRequirement() {
-  const route = useRoute();
-
-  const datastoreState = useState<DatastoreState>("datastoreRequired", () => ({
-    datastoreRequired: undefined,
-    nodeType: undefined,
-  }));
-
-  // If both populated then just return it
-  if (datastoreState.value.datastoreRequired && datastoreState.value.nodeType) {
-    return { datastoreState, setDatastoreRequired };
-  }
-
-  // Don't both trying to get it until they leave the landing page (which means they are authenticated)
-  if (route.path !== "/") {
-    let dataRequired: boolean = datastoreState.value.datastoreRequired || true; // Assume it's required if not set
-
-    // If no setting for this requirement, fetch it
-    if (datastoreState.value.datastoreRequired == undefined) {
-      const nodeConfigResp = (await useNuxtApp()
-        .$hubApi("/node/settings", {
-          method: "GET",
-        })
-        .catch(() => undefined)) as NodeSettings;
-      if (nodeConfigResp) {
-        dataRequired = Boolean(nodeConfigResp.data_required);
-      }
-    }
-
-    // If node type not set, fetch it
-    if (datastoreState.value.nodeType == undefined) {
-      const nodeResp = (await useNuxtApp()
-        .$hubApi("/node-type", {
-          method: "GET",
-        })
-        .catch(() => undefined)) as NodeTypeResponse;
-      if (nodeResp && nodeResp.type) {
-        datastoreState.value.nodeType = nodeResp.type;
-        datastoreState.value.datastoreRequired =
-          nodeResp.type !== "aggregator" && dataRequired;
-      }
-    }
-  }
-
-  async function setDatastoreRequired(updatedRequirement: boolean) {
-    const nodeConfigResp = (await useNuxtApp()
-      .$hubApi("/node/settings", {
-        method: "POST",
-        body: { data_required: updatedRequirement },
-      })
-      .catch(() => undefined)) as NodeSettings;
-    if (nodeConfigResp) {
-      datastoreState.value.datastoreRequired = Boolean(
-        nodeConfigResp.data_required,
-      );
-    }
-  }
-
-  return { datastoreState, setDatastoreRequired };
+export function useDatastoreRequirement() {
+  const store = useNodeSettingsStore();
+  const { nodeType, requireDataStore } = storeToRefs(store);
+  return { nodeType, requireDataStore };
 }
diff --git a/app/plugins/nodeSettings.client.ts b/app/plugins/nodeSettings.client.ts
new file mode 100644
index 00000000..22243eb7
--- /dev/null
+++ b/app/plugins/nodeSettings.client.ts
@@ -0,0 +1,16 @@
+import { useNodeSettingsStore } from "~/stores/nodeSettingsStore";
+
+export default defineNuxtPlugin(() => {
+  const { status } = useAuthState();
+  const nodeSettingsStore = useNodeSettingsStore();
+
+  watch(
+    status,
+    (newStatus) => {
+      if (newStatus === "authenticated") {
+        nodeSettingsStore.fetchSettings();
+      }
+    },
+    { immediate: true },
+  );
+});
diff --git a/app/services/Api.ts b/app/services/Api.ts
index c664f52a..751f98e9 100644
--- a/app/services/Api.ts
+++ b/app/services/Api.ts
@@ -29,11 +29,13 @@ export enum ProtocolCode {
 export enum PodStatus {
   Starting = "starting",
   Started = "started",
-  Stuck = "stuck",
-  Running = "running",
   Stopping = "stopping",
   Stopped = "stopped",
+  Running = "running",
   Finished = "finished",
+  Executing = "executing",
+  Executed = "executed",
+  Stuck = "stuck",
   Failed = "failed",
 }
 
@@ -77,6 +79,13 @@ export enum CleanUpType {
   Zombies = "zombies",
 }
 
+/** AnalysisBucketType */
+export enum AnalysisBucketType {
+  CODE = "CODE",
+  RESULT = "RESULT",
+  TEMP = "TEMP",
+}
+
 /**
  * ACL
  * ACL entities are used to control access to a resource. An ACL can be applied to a Consumer
@@ -133,29 +142,66 @@ export interface Analysis {
    * @format uuid
    */
   id: string;
-  /** Configuration Locked */
-  configuration_locked: boolean;
   /** Nodes */
   nodes: number;
+  /** Nodes Approved */
+  nodes_approved: number;
+  /** Configuration Locked */
+  configuration_locked: boolean;
+  /** Configuration Entrypoint Valid */
+  configuration_entrypoint_valid: boolean;
+  /** Configuration Image Valid */
+  configuration_image_valid: boolean;
+  /** Configuration Node Aggregator Valid */
+  configuration_node_aggregator_valid: boolean;
+  /** Configuration Node Default Valid */
+  configuration_node_default_valid: boolean;
+  /** Configuration Nodes Valid */
+  configuration_nodes_valid: boolean;
   /** Build Status */
   build_status:
     | "starting"
     | "started"
     | "stopping"
     | "stopped"
-    | "finished"
+    | "executing"
+    | "executed"
     | "failed"
     | null;
-  /** Run Status */
-  run_status:
+  /** Build Nodes Valid */
+  build_nodes_valid: boolean;
+  /** Build Progress */
+  build_progress: number | null;
+  /** Build Hash */
+  build_hash: string | null;
+  /** Build Os */
+  build_os: string | null;
+  /** Build Size */
+  build_size: number | null;
+  /** Distribution Status */
+  distribution_status:
     | "starting"
     | "started"
-    | "running"
     | "stopping"
     | "stopped"
-    | "finished"
+    | "executing"
+    | "executed"
     | "failed"
     | null;
+  /** Distribution Progress */
+  distribution_progress: number | null;
+  /** Execution Status */
+  execution_status:
+    | "starting"
+    | "started"
+    | "stopping"
+    | "stopped"
+    | "executing"
+    | "executed"
+    | "failed"
+    | null;
+  /** Execution Progress */
+  execution_progress: number | null;
   /**
    * Created At
    * @format date-time
@@ -183,15 +229,22 @@ export interface Analysis {
 
 /** AnalysisBucket */
 export interface AnalysisBucket {
+  type: AnalysisBucketType;
+  /**
+   * Bucket Id
+   * @format uuid
+   */
+  bucket_id: string;
+  /**
+   * Analysis Id
+   * @format uuid
+   */
+  analysis_id: string;
   /**
    * Id
    * @format uuid
    */
   id: string;
-  /** Type */
-  type: "CODE" | "RESULT" | "TEMP";
-  /** External Id */
-  external_id: string | null;
   /**
    * Created At
    * @format date-time
@@ -202,11 +255,6 @@ export interface AnalysisBucket {
    * @format date-time
    */
   updated_at: string;
-  /**
-   * Analysis Id
-   * @format uuid
-   */
-  analysis_id: string;
   analysis?: Analysis;
   /**
    * Realm Id
@@ -252,16 +300,18 @@ export interface AnalysisNode {
   id: string;
   /** Approval Status */
   approval_status: "rejected" | "approved" | null;
-  /** Run Status */
-  run_status:
+  /** Execution Status */
+  execution_status:
     | "starting"
     | "started"
     | "stopping"
     | "stopped"
-    | "running"
-    | "finished"
+    | "executing"
+    | "executed"
     | "failed"
     | null;
+  /** Execution Progress */
+  execution_progress: number | null;
   /** Comment */
   comment: string | null;
   /** Artifact Tag */
@@ -292,6 +342,34 @@ export interface AnalysisNode {
   node_realm_id: string;
 }
 
+/**
+ * AnalysisStatus
+ * Status report for an analysis from the PodOrchestrator
+ */
+export interface AnalysisStatus {
+  /** Custom PO run statuses. */
+  status: PodStatus;
+  /** Progress */
+  progress?: number | null;
+}
+
+/**
+ * AutostartSettings
+ * Autostart Settings.
+ */
+export interface AutostartSettings {
+  /**
+   * Enabled
+   * @default false
+   */
+  enabled?: boolean | null;
+  /**
+   * Interval
+   * @default 60
+   */
+  interval?: number | null;
+}
+
 /** Body_auth_token_get_token_post */
 export interface BodyAuthTokenGetTokenPost {
   /**
@@ -414,15 +492,13 @@ export interface BodyKongProjectCreateKongProjectPost {
   /**
    * Methods
    * List of acceptable HTTP methods
-   * @default ["GET"]
    */
-  methods?: HttpMethodCode[];
+  methods?: HttpMethodCode[] | null;
   /**
    * Protocols
    * List of acceptable transfer protocols. A combo of 'http', 'grpc', 'grpcs', 'tls', 'tcp'
-   * @default ["http"]
    */
-  protocols?: ProtocolCode[];
+  protocols?: ProtocolCode[] | null;
   /**
    * Data store type. Either 's3' or 'fhir'
    * @default "fhir"
@@ -546,29 +622,66 @@ export interface DetailedAnalysis {
    * @format uuid
    */
   id: string;
-  /** Configuration Locked */
-  configuration_locked: boolean;
   /** Nodes */
   nodes: number;
+  /** Nodes Approved */
+  nodes_approved: number;
+  /** Configuration Locked */
+  configuration_locked: boolean;
+  /** Configuration Entrypoint Valid */
+  configuration_entrypoint_valid: boolean;
+  /** Configuration Image Valid */
+  configuration_image_valid: boolean;
+  /** Configuration Node Aggregator Valid */
+  configuration_node_aggregator_valid: boolean;
+  /** Configuration Node Default Valid */
+  configuration_node_default_valid: boolean;
+  /** Configuration Nodes Valid */
+  configuration_nodes_valid: boolean;
   /** Build Status */
   build_status:
     | "starting"
     | "started"
     | "stopping"
     | "stopped"
-    | "finished"
+    | "executing"
+    | "executed"
+    | "failed"
+    | null;
+  /** Build Nodes Valid */
+  build_nodes_valid: boolean;
+  /** Build Progress */
+  build_progress: number | null;
+  /** Build Hash */
+  build_hash: string | null;
+  /** Build Os */
+  build_os: string | null;
+  /** Build Size */
+  build_size: number | null;
+  /** Distribution Status */
+  distribution_status:
+    | "starting"
+    | "started"
+    | "stopping"
+    | "stopped"
+    | "executing"
+    | "executed"
     | "failed"
     | null;
-  /** Run Status */
-  run_status:
+  /** Distribution Progress */
+  distribution_progress: number | null;
+  /** Execution Status */
+  execution_status:
     | "starting"
     | "started"
-    | "running"
     | "stopping"
     | "stopped"
-    | "finished"
+    | "executing"
+    | "executed"
     | "failed"
     | null;
+  /** Execution Progress */
+  execution_progress: number | null;
   /**
    * Created At
    * @format date-time
@@ -1010,6 +1123,18 @@ export interface MasterImage {
   virtual_path: string;
   /** Group Virtual Path */
   group_virtual_path: string;
+  /** Build Status */
+  build_status:
+    | "starting"
+    | "started"
+    | "stopping"
+    | "stopped"
+    | "executing"
+    | "executed"
+    | "failed"
+    | null;
+  /** Build Progress */
+  build_progress: number | null;
   /** Name */
   name: string;
   /** Command */
@@ -1109,11 +1234,10 @@ export interface Node {
   /** Registry Project Id */
   registry_project_id: string | null;
   registry_project?: RegistryProject | null;
-  /**
-   * Robot Id
-   * @format uuid
-   */
-  robot_id: string;
+  /** Robot Id */
+  robot_id: string | null;
+  /** Client Id */
+  client_id: string | null;
   /**
    * Created At
    * @format date-time
@@ -1126,22 +1250,22 @@ export interface Node {
   updated_at: string;
 }
 
-/** NodeSettings */
-export interface NodeSettings {
-  /**
-   * Data Required
-   * @default true
-   */
-  data_required?: boolean | null;
-}
-
 /** NodeTypeResponse */
 export interface NodeTypeResponse {
   /** Type */
   type: "aggregator" | "default";
 }
 
-/** PodResponse */
+/**
+ * PodProgressResponse
+ * Response with dynamic UUID keys and dynamic analysis keys with progress/status
+ */
+export type PodProgressResponse = Record<any, AnalysisStatus>;
+
+/**
+ * PodResponse
+ * Response with a list of running pods for a given analysis ID
+ */
 export type PodResponse = Record<any, (string | null)[]>;
 
 /** Project */
@@ -1623,10 +1747,10 @@ export interface ServiceRequest {
 }
 
 /**
- * StatusResponse
+ * StatusOnlyResponse
  * Response with dynamic UUID keys and dynamic analysis keys
  */
-export type StatusResponse = Record<any, PodStatus>;
+export type StatusOnlyResponse = Record<any, PodStatus>;
 
 /**
  * Token
@@ -1645,6 +1769,20 @@ export interface Token {
   refresh_expires_in?: number | null;
 }
 
+/**
+ * UserSettings
+ * Node configuration settings set by the user.
+ */
+export interface UserSettings {
+  /**
+   * Require Data Store
+   * @default true
+   */
+  require_data_store?: boolean | null;
+  /** @default {"enabled":false,"interval":60} */
+  autostart?: AutostartSettings | null;
+}
+
 /** ValidationError */
 export interface ValidationError {
   /** Location */
@@ -1653,6 +1791,10 @@ export interface ValidationError {
   msg: string;
   /** Error Type */
   type: string;
+  /** Input */
+  input?: any;
+  /** Context */
+  ctx?: object;
 }
 
 export type QueryParamsType = Record<string | number, any>;
@@ -1708,7 +1850,7 @@ export enum ContentType {
 }
 
 export class HttpClient<SecurityDataType = unknown> {
-  public baseUrl: string = "";
+  public baseUrl: string = "/api";
   private securityData: SecurityDataType | null = null;
   private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
   private abortControllers = new Map<CancelToken, AbortController>();
@@ -1911,11 +2053,13 @@ export class HttpClient<SecurityDataType = unknown> {
 }
 
 /**
- * @title FLAME API
+ * @title FLAME Hub Adapter API
  * @version 0.1.0
  * @license Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0.html)
+ * @baseUrl /api
+ * @contact Bruce Schultz <bschultz013@gmail.com> (https://docs.privateaim.net/about/team.html)
  *
- * FLAME project API for interacting with various microservices within the node for the UI.
+ * FLAME Hub Adapter gateway API for interacting with downstream services.
  */
 export class Api<
   SecurityDataType extends unknown,
@@ -1934,7 +2078,7 @@ export class Api<
       data: BodyPodorcPodsCreatePoPost,
       params: RequestParams = {},
     ) =>
-      this.request<StatusResponse, void | HTTPValidationError>({
+      this.request<StatusOnlyResponse, void | HTTPValidationError>({
         path: `/po`,
         method: "POST",
         body: data,
@@ -2032,7 +2176,7 @@ export class Api<
      * @secure
      */
     podorcStatusGetPoStatusGet: (params: RequestParams = {}) =>
-      this.request<StatusResponse, void>({
+      this.request<PodProgressResponse, void>({
         path: `/po/status`,
         method: "GET",
         secure: true,
@@ -2053,7 +2197,7 @@ export class Api<
       analysisId: string | null,
       params: RequestParams = {},
     ) =>
-      this.request<StatusResponse, void | HTTPValidationError>({
+      this.request<PodProgressResponse, void | HTTPValidationError>({
         path: `/po/status/${analysisId}`,
         method: "GET",
         secure: true,
@@ -2110,7 +2254,7 @@ export class Api<
      * @secure
      */
     podorcPodsStopPoStopPut: (params: RequestParams = {}) =>
-      this.request<StatusResponse, void>({
+      this.request<StatusOnlyResponse, void>({
         path: `/po/stop`,
         method: "PUT",
         secure: true,
@@ -2131,7 +2275,7 @@ export class Api<
       analysisId: string | null,
       params: RequestParams = {},
     ) =>
-      this.request<StatusResponse, void | HTTPValidationError>({
+      this.request<StatusOnlyResponse, void | HTTPValidationError>({
         path: `/po/stop/${analysisId}`,
         method: "PUT",
         secure: true,
@@ -2149,7 +2293,7 @@ export class Api<
      * @secure
      */
     podorcPodsDeletePoDeleteDelete: (params: RequestParams = {}) =>
-      this.request<StatusResponse, void>({
+      this.request<StatusOnlyResponse, void>({
         path: `/po/delete`,
         method: "DELETE",
         secure: true,
@@ -2170,7 +2314,7 @@ export class Api<
       analysisId: string | null,
       params: RequestParams = {},
     ) =>
-      this.request<StatusResponse, void | HTTPValidationError>({
+      this.request<StatusOnlyResponse, void | HTTPValidationError>({
         path: `/po/delete/${analysisId}`,
         method: "DELETE",
         secure: true,
@@ -2213,7 +2357,7 @@ export class Api<
       data: InitializeAnalysis,
       params: RequestParams = {},
     ) =>
-      this.request<StatusResponse, void | HTTPValidationError>({
+      this.request<StatusOnlyResponse, void | HTTPValidationError>({
         path: `/analysis/initialize`,
         method: "POST",
         body: data,
@@ -2236,7 +2380,7 @@ export class Api<
       analysisId: string,
       params: RequestParams = {},
     ) =>
-      this.request<StatusResponse, void | HTTPValidationError>({
+      this.request<StatusOnlyResponse, void | HTTPValidationError>({
         path: `/analysis/terminate/${analysisId}`,
         method: "DELETE",
         secure: true,
@@ -2278,7 +2422,7 @@ export class Api<
      * @secure
      */
     nodeSettingsGetNodeSettingsGet: (params: RequestParams = {}) =>
-      this.request<NodeSettings, void>({
+      this.request<UserSettings, void>({
         path: `/node/settings`,
         method: "GET",
         secure: true,
@@ -2287,7 +2431,7 @@ export class Api<
       }),
 
     /**
-     * @description Update the node configuration settings.
+     * @description Update the node configuration settings with partial data. Raises ------ HTTPException 422: If unknown settings keys are provided.
      *
      * @tags Node
      * @name NodeSettingsUpdateNodeSettingsPost
@@ -2296,10 +2440,10 @@ export class Api<
      * @secure
      */
     nodeSettingsUpdateNodeSettingsPost: (
-      data: NodeSettings,
+      data: UserSettings,
       params: RequestParams = {},
     ) =>
-      this.request<NodeSettings, void | HTTPValidationError>({
+      this.request<UserSettings, void | HTTPValidationError>({
         path: `/node/settings`,
         method: "POST",
         body: data,
@@ -2728,7 +2872,7 @@ export class Api<
      * @tags Storage
      * @name StorageLocalDeleteLocalDelete
      * @summary Storage.Local.Delete
-     * @request DELETE:/local/
+     * @request DELETE:/local
      * @secure
      */
     storageLocalDeleteLocalDelete: (
@@ -2742,7 +2886,7 @@ export class Api<
       params: RequestParams = {},
     ) =>
       this.request<any, void | HTTPValidationError>({
-        path: `/local/`,
+        path: `/local`,
         method: "DELETE",
         query: query,
         secure: true,
diff --git a/app/services/hub_adapter_swagger.json b/app/services/hub_adapter_swagger.json
index 14c7f543..283e3539 100644
--- a/app/services/hub_adapter_swagger.json
+++ b/app/services/hub_adapter_swagger.json
@@ -1,15 +1,23 @@
 {
   "openapi": "3.1.0",
   "info": {
-    "title": "FLAME API",
-    "description": "FLAME project API for interacting with various microservices within the node for the UI.",
+    "title": "FLAME Hub Adapter API",
+    "description": "FLAME Hub Adapter gateway API for interacting with downstream services.",
+    "contact": {
+      "name": "Bruce Schultz",
+      "url": "https://docs.privateaim.net/about/team.html",
+      "email": "bschultz013@gmail.com"
+    },
     "license": {
       "name": "Apache 2.0",
-      "identifier": "Apache-2.0",
       "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
     "version": "0.1.0"
   },
+  "servers": [
+    { "url": "/api" },
+    { "url": "http://localhost:5000", "description": "api" }
+  ],
   "paths": {
     "/po": {
       "post": {
@@ -32,31 +40,21 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/StatusResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/po/logs": {
@@ -70,21 +68,13 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/LogResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/LogResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/po/logs/{analysis_id}": {
@@ -93,11 +83,7 @@
         "summary": "Podorc.Logs.Get",
         "description": "Get the analysis pod logs.",
         "operationId": "podorc_logs_get_po_logs__analysis_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_id",
@@ -117,22 +103,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/LogResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/LogResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -150,21 +130,13 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/LogResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/LogResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/po/history/{analysis_id}": {
@@ -173,11 +145,7 @@
         "summary": "Podorc.History.Get",
         "description": "Get the previous analysis pod logs.",
         "operationId": "podorc_history_get_po_history__analysis_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_id",
@@ -185,13 +153,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "null"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "null" }
               ],
               "description": "UUID of the analysis.",
               "title": "Analysis Id"
@@ -204,22 +167,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/LogResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/LogResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -237,21 +194,13 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/StatusResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/PodProgressResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/po/status/{analysis_id}": {
@@ -260,11 +209,7 @@
         "summary": "Podorc.Status.Get",
         "description": "Get a specific analysis pod run status.",
         "operationId": "podorc_status_get_po_status__analysis_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_id",
@@ -272,13 +217,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "null"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "null" }
               ],
               "description": "UUID of the analysis.",
               "title": "Analysis Id"
@@ -291,22 +231,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/StatusResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/PodProgressResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -324,21 +258,13 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/PodResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/PodResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/po/pods/{analysis_id}": {
@@ -347,11 +273,7 @@
         "summary": "Podorc.Pods.Get",
         "description": "Get information on a specific running analysis pod in the k8s cluster.",
         "operationId": "podorc_pods_get_po_pods__analysis_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_id",
@@ -359,13 +281,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "null"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "null" }
               ],
               "description": "UUID of the analysis.",
               "title": "Analysis Id"
@@ -378,22 +295,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/PodResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/PodResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -411,21 +322,13 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/StatusResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/po/stop/{analysis_id}": {
@@ -434,11 +337,7 @@
         "summary": "Podorc.Pods.Stop",
         "description": "Stop a specific analysis run.",
         "operationId": "podorc_pods_stop_po_stop__analysis_id__put",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_id",
@@ -446,13 +345,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "null"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "null" }
               ],
               "description": "UUID of the analysis.",
               "title": "Analysis Id"
@@ -465,22 +359,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/StatusResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -498,21 +386,13 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/StatusResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/po/delete/{analysis_id}": {
@@ -521,11 +401,7 @@
         "summary": "Podorc.Pods.Delete",
         "description": "Delete a specific analysis run.",
         "operationId": "podorc_pods_delete_po_delete__analysis_id__delete",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_id",
@@ -533,13 +409,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "null"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "null" }
               ],
               "description": "UUID of the analysis.",
               "title": "Analysis Id"
@@ -552,22 +423,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/StatusResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -580,11 +445,7 @@
         "summary": "Podorc.Cleanup",
         "description": "Delete specific types of resources.\n\nShould be a comma separated combination of the following entries:\n'all', 'analyzes', 'services', 'mb', 'rs', 'keycloak'",
         "operationId": "podorc_cleanup_po_cleanup__cleanup_type__delete",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "cleanup_type",
@@ -602,22 +463,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/CleanupPodResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/CleanupPodResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -646,31 +501,21 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/StatusResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/analysis/terminate/{analysis_id}": {
@@ -679,11 +524,7 @@
         "summary": "Meta.Terminate",
         "description": "Perform the required checks to stop an analysis and delete it and its components.\n\nThis method will first delete the kong consumer and then send the delete command to the PO.",
         "operationId": "meta_terminate_analysis_terminate__analysis_id__delete",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_id",
@@ -691,13 +532,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "string",
-                  "format": "uuid"
-                }
+                { "type": "string" },
+                { "type": "string", "format": "uuid" }
               ],
               "description": "Analysis UUID that should be terminated",
               "title": "Analysis Id"
@@ -710,22 +546,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/StatusResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -743,33 +573,25 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/NodeSettings"
-                }
+                "schema": { "$ref": "#/components/schemas/UserSettings" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       },
       "post": {
         "tags": ["Node"],
         "summary": "Node.Settings.Update",
-        "description": "Update the node configuration settings.",
+        "description": "Update the node configuration settings with partial data.\n\nRaises\n------\nHTTPException\n    422: If unknown settings keys are provided.",
         "operationId": "node_settings_update_node_settings_post",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/NodeSettings",
-                "description": "Required information to start analysis"
+                "$ref": "#/components/schemas/UserSettings",
+                "description": "Partial settings to update"
               }
             }
           },
@@ -780,31 +602,21 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/NodeSettings"
-                }
+                "schema": { "$ref": "#/components/schemas/UserSettings" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/projects": {
@@ -819,24 +631,16 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "items": {
-                    "$ref": "#/components/schemas/Project"
-                  },
+                  "items": { "$ref": "#/components/schemas/Project" },
                   "type": "array",
                   "title": "Response Hub Project Get Projects Get"
                 }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/projects/{project_id}": {
@@ -845,11 +649,7 @@
         "summary": "List a specific project",
         "description": "List project for a given UUID.",
         "operationId": "hub_project_get_projects__project_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "project_id",
@@ -857,13 +657,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "Project UUID.",
               "title": "Project Id"
@@ -876,22 +671,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Project"
-                }
+                "schema": { "$ref": "#/components/schemas/Project" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -904,11 +693,7 @@
         "summary": "List all of the project proposals",
         "description": "List project proposals.",
         "operationId": "hub_project_node_get_project_nodes_get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "force_refresh",
@@ -928,24 +713,18 @@
               "application/json": {
                 "schema": {
                   "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/ProjectNode"
-                  },
+                  "items": { "$ref": "#/components/schemas/ProjectNode" },
                   "title": "Response Hub Project Node Get Project Nodes Get"
                 }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -958,11 +737,7 @@
         "summary": "List a specific project proposal",
         "description": "Set the approval status of a project proposal.",
         "operationId": "hub_project_node_get_project_nodes__project_node_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "project_node_id",
@@ -970,13 +745,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "Proposal object UUID.",
               "title": "Project Node Id"
@@ -989,22 +759,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProjectNode"
-                }
+                "schema": { "$ref": "#/components/schemas/ProjectNode" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -1015,11 +779,7 @@
         "summary": "Update a specific project proposal",
         "description": "Set the approval status of a project proposal.",
         "operationId": "hub_project_node_update_project_nodes__project_node_id__post",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "project_node_id",
@@ -1027,13 +787,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "Proposal object UUID.",
               "title": "Project Node Id"
@@ -1056,22 +811,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProjectNode"
-                }
+                "schema": { "$ref": "#/components/schemas/ProjectNode" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -1084,11 +833,7 @@
         "summary": "List all of the analysis proposals",
         "description": "List all analysis nodes for give node.",
         "operationId": "hub_analysis_node_get_analysis_nodes_get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "force_refresh",
@@ -1108,24 +853,18 @@
               "application/json": {
                 "schema": {
                   "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/AnalysisNode"
-                  },
+                  "items": { "$ref": "#/components/schemas/AnalysisNode" },
                   "title": "Response Hub Analysis Node Get Analysis Nodes Get"
                 }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -1138,11 +877,7 @@
         "summary": "List a specific analysis node",
         "description": "List a specific analysis node.",
         "operationId": "hub_analysis_node_get_analysis_nodes__analysis_node_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_node_id",
@@ -1150,13 +885,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "Analysis Node UUID.",
               "title": "Analysis Node Id"
@@ -1169,22 +899,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AnalysisNode"
-                }
+                "schema": { "$ref": "#/components/schemas/AnalysisNode" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -1195,11 +919,7 @@
         "summary": "Update a specific analysis proposal",
         "description": "Set the approval status of an analysis proposal.",
         "operationId": "hub_analysis_node_update_analysis_nodes__analysis_node_id__post",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_node_id",
@@ -1207,13 +927,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "Analysis Node UUID (not analysis_id).",
               "title": "Analysis Node Id"
@@ -1236,22 +951,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AnalysisNode"
-                }
+                "schema": { "$ref": "#/components/schemas/AnalysisNode" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -1270,24 +979,16 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "items": {
-                    "$ref": "#/components/schemas/Analysis"
-                  },
+                  "items": { "$ref": "#/components/schemas/Analysis" },
                   "type": "array",
                   "title": "Response Hub Analysis Get Analyses Get"
                 }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/analyses/{analysis_id}": {
@@ -1296,11 +997,7 @@
         "summary": "List a specific analysis",
         "description": "List a specific analysis.",
         "operationId": "hub_analysis_get_analyses__analysis_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_id",
@@ -1308,13 +1005,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "Analysis UUID.",
               "title": "Analysis Id"
@@ -1327,22 +1019,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Analysis"
-                }
+                "schema": { "$ref": "#/components/schemas/Analysis" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -1353,11 +1039,7 @@
         "summary": "Update a specific analysis proposal",
         "description": "Update analysis with a given UUID.",
         "operationId": "hub_analysis_update_analyses__analysis_id__post",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_id",
@@ -1365,13 +1047,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "Analysis UUID.",
               "title": "Analysis Id"
@@ -1396,22 +1073,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/DetailedAnalysis"
-                }
+                "schema": { "$ref": "#/components/schemas/DetailedAnalysis" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -1430,24 +1101,16 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "items": {
-                    "$ref": "#/components/schemas/Node"
-                  },
+                  "items": { "$ref": "#/components/schemas/Node" },
                   "type": "array",
                   "title": "Response Hub Node Get Nodes Get"
                 }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/nodes/{node_id}": {
@@ -1456,11 +1119,7 @@
         "summary": "List a specific node",
         "description": "List a specific node.",
         "operationId": "hub_node_get_nodes__node_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "node_id",
@@ -1468,13 +1127,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "Node UUID.",
               "title": "Node Id"
@@ -1487,22 +1141,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Node"
-                }
+                "schema": { "$ref": "#/components/schemas/Node" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -1520,21 +1168,13 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/NodeTypeResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/NodeTypeResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/registry-projects/{registry_project_id}": {
@@ -1543,25 +1183,16 @@
         "summary": "Get registry project",
         "description": "List registry data for a project.",
         "operationId": "hub_registry_metadata_get_registry_projects__registry_project_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
-        "parameters": [
+        "security": [{ "JWT": [] }],
+        "parameters": [
           {
             "name": "registry_project_id",
             "in": "path",
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "Registry project UUID.",
               "title": "Registry Project Id"
@@ -1574,22 +1205,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/RegistryProject"
-                }
+                "schema": { "$ref": "#/components/schemas/RegistryProject" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -1617,31 +1242,21 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AnalysisImageUrl"
-                }
+                "schema": { "$ref": "#/components/schemas/AnalysisImageUrl" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/analysis-buckets": {
@@ -1653,21 +1268,11 @@
         "responses": {
           "200": {
             "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {}
-              }
-            }
+            "content": { "application/json": { "schema": {} } }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/analysis-buckets/{analysis_bucket_id}": {
@@ -1676,11 +1281,7 @@
         "summary": "List a specific analysis bucket",
         "description": "List a specific analysis bucket.",
         "operationId": "hub_analysis_bucket_get_analysis_buckets__analysis_bucket_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_bucket_id",
@@ -1688,13 +1289,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "Bucket UUID.",
               "title": "Analysis Bucket Id"
@@ -1707,22 +1303,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/AnalysisBucket"
-                }
+                "schema": { "$ref": "#/components/schemas/AnalysisBucket" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -1738,21 +1328,11 @@
         "responses": {
           "200": {
             "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {}
-              }
-            }
+            "content": { "application/json": { "schema": {} } }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/analysis-bucket-files/{analysis_bucket_file_id}": {
@@ -1761,11 +1341,7 @@
         "summary": "List partial analysis bucket files.",
         "description": "List specific partial analysis bucket file.",
         "operationId": "hub_analysis_bucket_file_get_analysis_bucket_files__analysis_bucket_file_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_bucket_file_id",
@@ -1773,13 +1349,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "Bucket file UUID.",
               "title": "Analysis Bucket File Id"
@@ -1790,39 +1361,27 @@
         "responses": {
           "200": {
             "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {}
-              }
-            }
-          },
-          "404": {
-            "description": "Not found"
+            "content": { "application/json": { "schema": {} } }
           },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
         }
       }
     },
-    "/local/": {
+    "/local": {
       "delete": {
         "tags": ["Storage"],
         "summary": "Storage.Local.Delete",
         "description": "Delete all objects in MinIO and all Postgres database entries related to the specified project.\n\nReturns a 200 on success, a 400 if the project is still available on the Hub and a 403 if it is not the\nHub Adapter client that sends the request. In both error cases nothing is deleted at all.",
-        "operationId": "storage_local_delete_local__delete",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "operationId": "storage_local_delete_local_delete",
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "project_id",
@@ -1830,13 +1389,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "UUID of the associated project.",
               "title": "Project Id"
@@ -1847,22 +1401,14 @@
         "responses": {
           "200": {
             "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {}
-              }
-            }
-          },
-          "404": {
-            "description": "Not found"
+            "content": { "application/json": { "schema": {} } }
           },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -1875,11 +1421,7 @@
         "summary": "Kong.Datastore.Get",
         "description": "List all available data stores (referred to as services by kong).",
         "operationId": "kong_datastore_get_kong_datastore_get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "detailed",
@@ -1899,22 +1441,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ListServices"
-                }
+                "schema": { "$ref": "#/components/schemas/ListServices" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -1925,11 +1461,7 @@
         "summary": "Kong.Datastore.Create",
         "description": "Create a datastore (referred to as services by kong) by providing necessary metadata.",
         "operationId": "kong_datastore_create_kong_datastore_post",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "requestBody": {
           "required": true,
           "content": {
@@ -1945,22 +1477,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Service"
-                }
+                "schema": { "$ref": "#/components/schemas/Service" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -1973,11 +1499,7 @@
         "summary": "Kong.Datastore.Get",
         "description": "Retrieve a specific data store using the project UUID",
         "operationId": "kong_datastore_get_kong_datastore__project_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "project_id",
@@ -1985,13 +1507,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "UUID of the associated project.",
               "title": "Project Id"
@@ -2016,22 +1533,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ListServices"
-                }
+                "schema": { "$ref": "#/components/schemas/ListServices" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -2044,11 +1555,7 @@
         "summary": "Kong.Datastore.Delete",
         "description": "Delete the listed data store (referred to as services by kong).",
         "operationId": "kong_datastore_delete_kong_datastore__data_store_name__delete",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "data_store_name",
@@ -2065,22 +1572,14 @@
         "responses": {
           "200": {
             "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {}
-              }
-            }
-          },
-          "404": {
-            "description": "Not found"
+            "content": { "application/json": { "schema": {} } }
           },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -2093,11 +1592,7 @@
         "summary": "Kong.Project.Get",
         "description": "List all projects (referred to as routes by kong) available, can be filtered by project_id.\n\nSet \"detailed\" to True to include detailed information on the linked kong service.",
         "operationId": "kong_project_get_kong_project_get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "detailed",
@@ -2117,22 +1612,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ListRoutes"
-                }
+                "schema": { "$ref": "#/components/schemas/ListRoutes" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -2143,11 +1632,7 @@
         "summary": "Kong.Project.Create",
         "description": "Connect a project to a data store (referred to as a route by kong).",
         "operationId": "kong_project_create_kong_project_post",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "requestBody": {
           "required": true,
           "content": {
@@ -2169,16 +1654,12 @@
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -2191,11 +1672,7 @@
         "summary": "Kong.Project.Get",
         "description": "List a specific projects (referred to as routes by kong) using the project UUID.\n\nSet \"detailed\" to True to include detailed information on the linked kong service.",
         "operationId": "kong_project_get_kong_project__project_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "project_id",
@@ -2203,13 +1680,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" }
               ],
               "description": "UUID of the associated project.",
               "title": "Project Id"
@@ -2234,22 +1706,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ListRoutes"
-                }
+                "schema": { "$ref": "#/components/schemas/ListRoutes" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -2283,25 +1749,17 @@
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/kong/project/{project_route_id}": {
@@ -2310,11 +1768,7 @@
         "summary": "Kong.Project.Delete",
         "description": "Disconnect a project (route) from all data stores (services) and delete associated analyses (consumers).",
         "operationId": "kong_project_delete_kong_project__project_route_id__delete",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "project_route_id",
@@ -2333,22 +1787,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/DeleteProject"
-                }
+                "schema": { "$ref": "#/components/schemas/DeleteProject" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -2361,25 +1809,14 @@
         "summary": "Kong.Analysis.Get",
         "description": "List all analyses (referred to as consumers by kong) available. Can be filtered by project UUID using tag.",
         "operationId": "kong_analysis_get_kong_analysis_get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "tag",
             "in": "query",
             "required": false,
             "schema": {
-              "anyOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "null"
-                }
-              ],
+              "anyOf": [{ "type": "string" }, { "type": "null" }],
               "description": "Filter consumers by project using the project UUID",
               "title": "Tag"
             },
@@ -2391,22 +1828,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ListConsumers"
-                }
+                "schema": { "$ref": "#/components/schemas/ListConsumers" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -2417,11 +1848,7 @@
         "summary": "Kong.Analysis.Create",
         "description": "Create a new analysis and link it to a project.",
         "operationId": "kong_analysis_create_kong_analysis_post",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "requestBody": {
           "required": true,
           "content": {
@@ -2437,22 +1864,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/LinkProjectAnalysis"
-                }
+                "schema": { "$ref": "#/components/schemas/LinkProjectAnalysis" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -2465,11 +1886,7 @@
         "summary": "Kong.Analysis.Get",
         "description": "List all analyses (referred to as consumers by kong) available.",
         "operationId": "kong_analysis_get_kong_analysis__analysis_id__get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_id",
@@ -2477,16 +1894,9 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "null"
-                }
+                { "type": "string", "format": "uuid" },
+                { "type": "string" },
+                { "type": "null" }
               ],
               "description": "UUID of the analysis.",
               "title": "Analysis Id"
@@ -2498,14 +1908,7 @@
             "in": "query",
             "required": false,
             "schema": {
-              "anyOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "null"
-                }
-              ],
+              "anyOf": [{ "type": "string" }, { "type": "null" }],
               "description": "Filter consumers by project using the project UUID",
               "title": "Tag"
             },
@@ -2517,22 +1920,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ListConsumers"
-                }
+                "schema": { "$ref": "#/components/schemas/ListConsumers" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -2543,11 +1940,7 @@
         "summary": "Kong.Analysis.Delete",
         "description": "Delete the listed analysis.",
         "operationId": "kong_analysis_delete_kong_analysis__analysis_id__delete",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "analysis_id",
@@ -2564,22 +1957,14 @@
         "responses": {
           "200": {
             "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {}
-              }
-            }
-          },
-          "404": {
-            "description": "Not found"
+            "content": { "application/json": { "schema": {} } }
           },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -2592,11 +1977,7 @@
         "summary": "Kong.Probe",
         "description": "Test whether Kong can read the requested data source.\n\nBecause we use the key-auth plugin, a consumer is required for pinging the data service.",
         "operationId": "kong_probe_kong_project__project_id___ds_type__health_get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "project_id",
@@ -2604,13 +1985,8 @@
             "required": true,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "string",
-                  "format": "uuid"
-                }
+                { "type": "string" },
+                { "type": "string", "format": "uuid" }
               ],
               "description": "UUID or unique name of the project.",
               "title": "Project Id"
@@ -2631,22 +2007,14 @@
         "responses": {
           "200": {
             "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {}
-              }
-            }
-          },
-          "404": {
-            "description": "Not found"
+            "content": { "application/json": { "schema": {} } }
           },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -2664,9 +2032,7 @@
             "description": "Return HTTP Status Code 200 (OK)",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HealthCheck"
-                }
+                "schema": { "$ref": "#/components/schemas/HealthCheck" }
               }
             }
           }
@@ -2714,22 +2080,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Token"
-                }
+                "schema": { "$ref": "#/components/schemas/Token" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -2742,25 +2102,14 @@
         "summary": "Events.Get",
         "description": "Retrieve a selection of logged events.",
         "operationId": "events_get_events_get",
-        "security": [
-          {
-            "JWT": []
-          }
-        ],
+        "security": [{ "JWT": [] }],
         "parameters": [
           {
             "name": "limit",
             "in": "query",
             "required": false,
             "schema": {
-              "anyOf": [
-                {
-                  "type": "integer"
-                },
-                {
-                  "type": "null"
-                }
-              ],
+              "anyOf": [{ "type": "integer" }, { "type": "null" }],
               "description": "Maximum number of events to return",
               "title": "Limit"
             },
@@ -2771,14 +2120,7 @@
             "in": "query",
             "required": false,
             "schema": {
-              "anyOf": [
-                {
-                  "type": "integer"
-                },
-                {
-                  "type": "null"
-                }
-              ],
+              "anyOf": [{ "type": "integer" }, { "type": "null" }],
               "description": "Number of events to offset by",
               "default": 0,
               "title": "Offset"
@@ -2790,14 +2132,7 @@
             "in": "query",
             "required": false,
             "schema": {
-              "anyOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "null"
-                }
-              ],
+              "anyOf": [{ "type": "string" }, { "type": "null" }],
               "description": "Filter events by service tag",
               "title": "Service Tag"
             },
@@ -2808,14 +2143,7 @@
             "in": "query",
             "required": false,
             "schema": {
-              "anyOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "null"
-                }
-              ],
+              "anyOf": [{ "type": "string" }, { "type": "null" }],
               "description": "Filter events by event name",
               "title": "Event Name"
             },
@@ -2826,14 +2154,7 @@
             "in": "query",
             "required": false,
             "schema": {
-              "anyOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "null"
-                }
-              ],
+              "anyOf": [{ "type": "string" }, { "type": "null" }],
               "description": "Filter events by username",
               "title": "Username"
             },
@@ -2845,13 +2166,8 @@
             "required": false,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "date-time"
-                },
-                {
-                  "type": "null"
-                }
+                { "type": "string", "format": "date-time" },
+                { "type": "null" }
               ],
               "description": "Filter events by start date using ISO8601 format",
               "title": "Start Date"
@@ -2864,13 +2180,8 @@
             "required": false,
             "schema": {
               "anyOf": [
-                {
-                  "type": "string",
-                  "format": "date-time"
-                },
-                {
-                  "type": "null"
-                }
+                { "type": "string", "format": "date-time" },
+                { "type": "null" }
               ],
               "description": "Filter events by end date using ISO8601 format",
               "title": "End Date"
@@ -2883,22 +2194,16 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/EventLogResponse"
-                }
+                "schema": { "$ref": "#/components/schemas/EventLogResponse" }
               }
             }
           },
-          "404": {
-            "description": "Not found"
-          },
+          "404": { "description": "Not found" },
           "422": {
             "description": "Validation Error",
             "content": {
               "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
+                "schema": { "$ref": "#/components/schemas/HTTPValidationError" }
               }
             }
           }
@@ -2914,21 +2219,11 @@
         "responses": {
           "201": {
             "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {}
-              }
-            }
+            "content": { "application/json": { "schema": {} } }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     },
     "/events/signout": {
@@ -2940,21 +2235,11 @@
         "responses": {
           "201": {
             "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {}
-              }
-            }
+            "content": { "application/json": { "schema": {} } }
           },
-          "404": {
-            "description": "Not found"
-          }
+          "404": { "description": "Not found" }
         },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
+        "security": [{ "JWT": [] }]
       }
     }
   },
@@ -2964,60 +2249,28 @@
         "properties": {
           "consumer": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/ACLConsumer"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/ACLConsumer" },
+              { "type": "null" }
             ]
           },
           "created_at": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Created At",
             "description": "Unix epoch when the resource was created."
           },
           "id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Id"
           },
           "group": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Group",
             "description": "The group that this ACL represents."
           },
           "tags": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Tags",
             "description": "An optional set of strings associated with the ACL for grouping and filtering."
@@ -3030,14 +2283,7 @@
       "ACLConsumer": {
         "properties": {
           "id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Id"
           }
         },
@@ -3048,25 +2294,11 @@
       "Analysis": {
         "properties": {
           "description": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Description"
           },
           "name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Name"
           },
           "project_id": {
@@ -3076,25 +2308,15 @@
           },
           "master_image_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "null" }
             ],
             "title": "Master Image Id"
           },
           "registry_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "null" }
             ],
             "title": "Registry Id"
           },
@@ -3105,18 +2327,32 @@
             "type": "array",
             "title": "Image Command Arguments"
           },
-          "id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "Id"
-          },
+          "id": { "type": "string", "format": "uuid", "title": "Id" },
+          "nodes": { "type": "integer", "title": "Nodes" },
+          "nodes_approved": { "type": "integer", "title": "Nodes Approved" },
           "configuration_locked": {
             "type": "boolean",
             "title": "Configuration Locked"
           },
-          "nodes": {
-            "type": "integer",
-            "title": "Nodes"
+          "configuration_entrypoint_valid": {
+            "type": "boolean",
+            "title": "Configuration Entrypoint Valid"
+          },
+          "configuration_image_valid": {
+            "type": "boolean",
+            "title": "Configuration Image Valid"
+          },
+          "configuration_node_aggregator_valid": {
+            "type": "boolean",
+            "title": "Configuration Node Aggregator Valid"
+          },
+          "configuration_node_default_valid": {
+            "type": "boolean",
+            "title": "Configuration Node Default Valid"
+          },
+          "configuration_nodes_valid": {
+            "type": "boolean",
+            "title": "Configuration Nodes Valid"
           },
           "build_status": {
             "anyOf": [
@@ -3127,35 +2363,78 @@
                   "started",
                   "stopping",
                   "stopped",
-                  "finished",
+                  "executing",
+                  "executed",
                   "failed"
                 ]
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ],
             "title": "Build Status"
           },
-          "run_status": {
+          "build_nodes_valid": {
+            "type": "boolean",
+            "title": "Build Nodes Valid"
+          },
+          "build_progress": {
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "title": "Build Progress"
+          },
+          "build_hash": {
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "title": "Build Hash"
+          },
+          "build_os": {
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "title": "Build Os"
+          },
+          "build_size": {
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "title": "Build Size"
+          },
+          "distribution_status": {
             "anyOf": [
               {
                 "type": "string",
                 "enum": [
                   "starting",
                   "started",
-                  "running",
                   "stopping",
                   "stopped",
-                  "finished",
+                  "executing",
+                  "executed",
                   "failed"
                 ]
               },
+              { "type": "null" }
+            ],
+            "title": "Distribution Status"
+          },
+          "distribution_progress": {
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "title": "Distribution Progress"
+          },
+          "execution_status": {
+            "anyOf": [
               {
-                "type": "null"
-              }
+                "type": "string",
+                "enum": [
+                  "starting",
+                  "started",
+                  "stopping",
+                  "stopped",
+                  "executing",
+                  "executed",
+                  "failed"
+                ]
+              },
+              { "type": "null" }
             ],
-            "title": "Run Status"
+            "title": "Execution Status"
+          },
+          "execution_progress": {
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "title": "Execution Progress"
           },
           "created_at": {
             "type": "string",
@@ -3169,12 +2448,8 @@
           },
           "registry": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/Registry"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/Registry" },
+              { "type": "null" }
             ]
           },
           "realm_id": {
@@ -3182,22 +2457,12 @@
             "format": "uuid",
             "title": "Realm Id"
           },
-          "user_id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "User Id"
-          },
-          "project": {
-            "$ref": "#/components/schemas/Project"
-          },
+          "user_id": { "type": "string", "format": "uuid", "title": "User Id" },
+          "project": { "$ref": "#/components/schemas/Project" },
           "master_image": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/MasterImage"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/MasterImage" },
+              { "type": "null" }
             ]
           }
         },
@@ -3209,10 +2474,24 @@
           "master_image_id",
           "registry_id",
           "id",
-          "configuration_locked",
           "nodes",
+          "nodes_approved",
+          "configuration_locked",
+          "configuration_entrypoint_valid",
+          "configuration_image_valid",
+          "configuration_node_aggregator_valid",
+          "configuration_node_default_valid",
+          "configuration_nodes_valid",
           "build_status",
-          "run_status",
+          "build_nodes_valid",
+          "build_progress",
+          "build_hash",
+          "build_os",
+          "build_size",
+          "distribution_status",
+          "distribution_progress",
+          "execution_status",
+          "execution_progress",
           "created_at",
           "updated_at",
           "realm_id",
@@ -3222,28 +2501,18 @@
       },
       "AnalysisBucket": {
         "properties": {
-          "id": {
+          "type": { "$ref": "#/components/schemas/AnalysisBucketType" },
+          "bucket_id": {
             "type": "string",
             "format": "uuid",
-            "title": "Id"
+            "title": "Bucket Id"
           },
-          "type": {
+          "analysis_id": {
             "type": "string",
-            "enum": ["CODE", "RESULT", "TEMP"],
-            "title": "Type"
-          },
-          "external_id": {
-            "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "External Id"
+            "format": "uuid",
+            "title": "Analysis Id"
           },
+          "id": { "type": "string", "format": "uuid", "title": "Id" },
           "created_at": {
             "type": "string",
             "format": "date-time",
@@ -3254,14 +2523,7 @@
             "format": "date-time",
             "title": "Updated At"
           },
-          "analysis_id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "Analysis Id"
-          },
-          "analysis": {
-            "$ref": "#/components/schemas/Analysis"
-          },
+          "analysis": { "$ref": "#/components/schemas/Analysis" },
           "realm_id": {
             "type": "string",
             "format": "uuid",
@@ -3270,72 +2532,40 @@
         },
         "type": "object",
         "required": [
-          "id",
           "type",
-          "external_id",
+          "bucket_id",
+          "analysis_id",
+          "id",
           "created_at",
           "updated_at",
-          "analysis_id",
           "realm_id"
         ],
         "title": "AnalysisBucket"
       },
+      "AnalysisBucketType": {
+        "type": "string",
+        "enum": ["CODE", "RESULT", "TEMP"],
+        "title": "AnalysisBucketType"
+      },
       "AnalysisImageUrl": {
         "properties": {
-          "image_url": {
-            "type": "string",
-            "title": "Image Url"
-          },
+          "image_url": { "type": "string", "title": "Image Url" },
           "project_id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Project Id"
           },
           "kong_token": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Kong Token"
           },
-          "analysis_id": {
-            "type": "string",
-            "title": "Analysis Id"
-          },
-          "registry_url": {
-            "type": "string",
-            "title": "Registry Url"
-          },
+          "analysis_id": { "type": "string", "title": "Analysis Id" },
+          "registry_url": { "type": "string", "title": "Registry Url" },
           "registry_user": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Registry User"
           },
           "registry_password": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Registry Password"
           }
         },
@@ -3350,29 +2580,16 @@
             "format": "uuid",
             "title": "Analysis Id"
           },
-          "node_id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "Node Id"
-          },
-          "id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "Id"
-          },
+          "node_id": { "type": "string", "format": "uuid", "title": "Node Id" },
+          "id": { "type": "string", "format": "uuid", "title": "Id" },
           "approval_status": {
             "anyOf": [
-              {
-                "type": "string",
-                "enum": ["rejected", "approved"]
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "enum": ["rejected", "approved"] },
+              { "type": "null" }
             ],
             "title": "Approval Status"
           },
-          "run_status": {
+          "execution_status": {
             "anyOf": [
               {
                 "type": "string",
@@ -3381,48 +2598,29 @@
                   "started",
                   "stopping",
                   "stopped",
-                  "running",
-                  "finished",
+                  "executing",
+                  "executed",
                   "failed"
                 ]
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ],
-            "title": "Run Status"
+            "title": "Execution Status"
+          },
+          "execution_progress": {
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "title": "Execution Progress"
           },
           "comment": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Comment"
           },
           "artifact_tag": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Artifact Tag"
           },
           "artifact_digest": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Artifact Digest"
           },
           "created_at": {
@@ -3435,12 +2633,8 @@
             "format": "date-time",
             "title": "Updated At"
           },
-          "analysis": {
-            "$ref": "#/components/schemas/Analysis"
-          },
-          "node": {
-            "$ref": "#/components/schemas/Node"
-          },
+          "analysis": { "$ref": "#/components/schemas/Analysis" },
+          "node": { "$ref": "#/components/schemas/Node" },
           "analysis_realm_id": {
             "type": "string",
             "format": "uuid",
@@ -3458,7 +2652,8 @@
           "node_id",
           "id",
           "approval_status",
-          "run_status",
+          "execution_status",
+          "execution_progress",
           "comment",
           "artifact_tag",
           "artifact_digest",
@@ -3469,6 +2664,37 @@
         ],
         "title": "AnalysisNode"
       },
+      "AnalysisStatus": {
+        "properties": {
+          "status": { "$ref": "#/components/schemas/PodStatus" },
+          "progress": {
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "title": "Progress"
+          }
+        },
+        "type": "object",
+        "required": ["status"],
+        "title": "AnalysisStatus",
+        "description": "Status report for an analysis from the PodOrchestrator"
+      },
+      "AutostartSettings": {
+        "properties": {
+          "enabled": {
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
+            "title": "Enabled",
+            "default": false
+          },
+          "interval": {
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "title": "Interval",
+            "default": 60
+          }
+        },
+        "additionalProperties": false,
+        "type": "object",
+        "title": "AutostartSettings",
+        "description": "Autostart Settings."
+      },
       "Body_auth_token_get_token_post": {
         "properties": {
           "username": {
@@ -3490,26 +2716,16 @@
         "properties": {
           "analysis_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "string"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "string" }
             ],
             "title": "Analysis Id",
             "description": "Analysis UUID"
           },
           "project_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "string"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "string" }
             ],
             "title": "Project Id",
             "description": "Project UUID"
@@ -3521,13 +2737,8 @@
           },
           "node_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "string"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "string" }
             ],
             "title": "Node Id",
             "description": "Node UUID"
@@ -3567,26 +2778,16 @@
         "properties": {
           "project_id": {
             "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "string",
-                "format": "uuid"
-              }
+              { "type": "string" },
+              { "type": "string", "format": "uuid" }
             ],
             "title": "Project Id",
             "description": "UUID or name of the project"
           },
           "analysis_id": {
             "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "string",
-                "format": "uuid"
-              }
+              { "type": "string" },
+              { "type": "string", "format": "uuid" }
             ],
             "title": "Analysis Id",
             "description": "UUID or name of the analysis"
@@ -3609,12 +2810,8 @@
           },
           "minio_config": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/MinioConfig"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/MinioConfig" },
+              { "type": "null" }
             ],
             "description": "Minio configuration"
           }
@@ -3627,21 +2824,14 @@
         "properties": {
           "project_id": {
             "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "string",
-                "format": "uuid"
-              }
+              { "type": "string" },
+              { "type": "string", "format": "uuid" }
             ],
             "title": "Project Id",
             "description": "UUID of the project"
           },
           "protocols": {
-            "items": {
-              "$ref": "#/components/schemas/ProtocolCode"
-            },
+            "items": { "$ref": "#/components/schemas/ProtocolCode" },
             "type": "array",
             "title": "Protocols",
             "description": "List of acceptable transfer protocols. A combo of 'http', 'grpc', 'grpcs', 'tls', 'tcp'",
@@ -3658,12 +2848,8 @@
           },
           "minio_config": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/MinioConfig"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/MinioConfig" },
+              { "type": "null" }
             ],
             "description": "Minio configuration"
           }
@@ -3676,47 +2862,41 @@
         "properties": {
           "data_store_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "string"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "string" }
             ],
             "title": "Data Store Id",
             "description": "UUID of the data store or 'service'"
           },
           "project_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "string"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "string" }
             ],
             "title": "Project Id",
             "description": "UUID of the project"
           },
           "methods": {
-            "items": {
-              "$ref": "#/components/schemas/HttpMethodCode"
-            },
-            "type": "array",
+            "anyOf": [
+              {
+                "items": { "$ref": "#/components/schemas/HttpMethodCode" },
+                "type": "array"
+              },
+              { "type": "null" }
+            ],
             "title": "Methods",
-            "description": "List of acceptable HTTP methods",
-            "default": ["GET"]
+            "description": "List of acceptable HTTP methods"
           },
           "protocols": {
-            "items": {
-              "$ref": "#/components/schemas/ProtocolCode"
-            },
-            "type": "array",
+            "anyOf": [
+              {
+                "items": { "$ref": "#/components/schemas/ProtocolCode" },
+                "type": "array"
+              },
+              { "type": "null" }
+            ],
             "title": "Protocols",
-            "description": "List of acceptable transfer protocols. A combo of 'http', 'grpc', 'grpcs', 'tls', 'tcp'",
-            "default": ["http"]
+            "description": "List of acceptable transfer protocols. A combo of 'http', 'grpc', 'grpcs', 'tls', 'tcp'"
           },
           "ds_type": {
             "$ref": "#/components/schemas/DataStoreType",
@@ -3732,26 +2912,16 @@
         "properties": {
           "analysis_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "string"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "string" }
             ],
             "title": "Analysis Id",
             "description": "Analysis UUID"
           },
           "project_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "string"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "string" }
             ],
             "title": "Project Id",
             "description": "Project UUID"
@@ -3763,13 +2933,8 @@
           },
           "node_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "string"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "string" }
             ],
             "title": "Node Id",
             "description": "Node UUID"
@@ -3796,69 +2961,27 @@
       "CleanupPodResponse": {
         "properties": {
           "all": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "All"
           },
           "analyzes": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Analyzes"
           },
           "services": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Services"
           },
           "mb": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Mb"
           },
           "rs": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Rs"
           },
           "zombies": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Zombies"
           }
         },
@@ -3869,64 +2992,29 @@
       "Consumer": {
         "properties": {
           "created_at": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Created At",
             "description": "Unix epoch when the resource was created."
           },
           "custom_id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Custom Id",
             "description": "Field for storing an existing unique ID for the Consumer - useful for mapping Kong with users in your existing database. You must send either this field or `username` with the request."
           },
           "id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Id"
           },
           "tags": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Tags",
             "description": "An optional set of strings associated with the Consumer for grouping and filtering."
           },
           "username": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Username",
             "description": "The unique username of the Consumer. You must send either this field or `custom_id` with the request."
           }
@@ -3938,14 +3026,7 @@
       "CreateServiceRequestClientCertificate": {
         "properties": {
           "id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Id"
           }
         },
@@ -3963,23 +3044,12 @@
         "properties": {
           "removed": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/Route"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/Route" },
+              { "type": "null" }
             ]
           },
           "status": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Status"
           }
         },
@@ -3991,25 +3061,11 @@
       "DetailedAnalysis": {
         "properties": {
           "description": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Description"
           },
           "name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Name"
           },
           "project_id": {
@@ -4019,25 +3075,15 @@
           },
           "master_image_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "null" }
             ],
             "title": "Master Image Id"
           },
           "registry_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "null" }
             ],
             "title": "Registry Id"
           },
@@ -4048,18 +3094,32 @@
             "type": "array",
             "title": "Image Command Arguments"
           },
-          "id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "Id"
-          },
+          "id": { "type": "string", "format": "uuid", "title": "Id" },
+          "nodes": { "type": "integer", "title": "Nodes" },
+          "nodes_approved": { "type": "integer", "title": "Nodes Approved" },
           "configuration_locked": {
             "type": "boolean",
             "title": "Configuration Locked"
           },
-          "nodes": {
-            "type": "integer",
-            "title": "Nodes"
+          "configuration_entrypoint_valid": {
+            "type": "boolean",
+            "title": "Configuration Entrypoint Valid"
+          },
+          "configuration_image_valid": {
+            "type": "boolean",
+            "title": "Configuration Image Valid"
+          },
+          "configuration_node_aggregator_valid": {
+            "type": "boolean",
+            "title": "Configuration Node Aggregator Valid"
+          },
+          "configuration_node_default_valid": {
+            "type": "boolean",
+            "title": "Configuration Node Default Valid"
+          },
+          "configuration_nodes_valid": {
+            "type": "boolean",
+            "title": "Configuration Nodes Valid"
           },
           "build_status": {
             "anyOf": [
@@ -4070,35 +3130,78 @@
                   "started",
                   "stopping",
                   "stopped",
-                  "finished",
+                  "executing",
+                  "executed",
                   "failed"
                 ]
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ],
             "title": "Build Status"
           },
-          "run_status": {
+          "build_nodes_valid": {
+            "type": "boolean",
+            "title": "Build Nodes Valid"
+          },
+          "build_progress": {
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "title": "Build Progress"
+          },
+          "build_hash": {
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "title": "Build Hash"
+          },
+          "build_os": {
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "title": "Build Os"
+          },
+          "build_size": {
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "title": "Build Size"
+          },
+          "distribution_status": {
             "anyOf": [
               {
                 "type": "string",
                 "enum": [
                   "starting",
                   "started",
-                  "running",
                   "stopping",
                   "stopped",
-                  "finished",
+                  "executing",
+                  "executed",
                   "failed"
                 ]
               },
+              { "type": "null" }
+            ],
+            "title": "Distribution Status"
+          },
+          "distribution_progress": {
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "title": "Distribution Progress"
+          },
+          "execution_status": {
+            "anyOf": [
               {
-                "type": "null"
-              }
+                "type": "string",
+                "enum": [
+                  "starting",
+                  "started",
+                  "stopping",
+                  "stopped",
+                  "executing",
+                  "executed",
+                  "failed"
+                ]
+              },
+              { "type": "null" }
             ],
-            "title": "Run Status"
+            "title": "Execution Status"
+          },
+          "execution_progress": {
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "title": "Execution Progress"
           },
           "created_at": {
             "type": "string",
@@ -4112,12 +3215,8 @@
           },
           "registry": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/Registry"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/Registry" },
+              { "type": "null" }
             ]
           },
           "realm_id": {
@@ -4125,29 +3224,17 @@
             "format": "uuid",
             "title": "Realm Id"
           },
-          "user_id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "User Id"
-          },
+          "user_id": { "type": "string", "format": "uuid", "title": "User Id" },
           "project": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/Project"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/Project" },
+              { "type": "null" }
             ]
           },
           "master_image": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/MasterImage"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/MasterImage" },
+              { "type": "null" }
             ]
           }
         },
@@ -4159,10 +3246,24 @@
           "master_image_id",
           "registry_id",
           "id",
-          "configuration_locked",
           "nodes",
+          "nodes_approved",
+          "configuration_locked",
+          "configuration_entrypoint_valid",
+          "configuration_image_valid",
+          "configuration_node_aggregator_valid",
+          "configuration_node_default_valid",
+          "configuration_nodes_valid",
           "build_status",
-          "run_status",
+          "build_nodes_valid",
+          "build_progress",
+          "build_hash",
+          "build_os",
+          "build_size",
+          "distribution_status",
+          "distribution_progress",
+          "execution_status",
+          "execution_progress",
           "created_at",
           "updated_at",
           "realm_id",
@@ -4174,14 +3275,7 @@
       "DetailedRoute": {
         "properties": {
           "created_at": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Created At",
             "description": "Unix epoch when the resource was created."
           },
@@ -4193,212 +3287,108 @@
                 },
                 "type": "array"
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ],
             "title": "Destinations",
             "description": "A list of IP destinations of incoming connections that match this route when using stream routing. Each entry is an object with fields \"ip\" (optionally in CIDR range notation) and/or \"port\"."
           },
           "headers": {
             "anyOf": [
-              {
-                "additionalProperties": true,
-                "type": "object"
-              },
-              {
-                "type": "null"
-              }
+              { "additionalProperties": true, "type": "object" },
+              { "type": "null" }
             ],
             "title": "Headers",
             "description": "One or more lists of values indexed by header name that will cause this route to match if present in the request. The `Host` header cannot be used with this hosts should be specified using the `hosts` attribute. When `headers` contains only one value and that value starts with the special prefix `~*`, the value is interpreted as a regular expression."
           },
           "hosts": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Hosts",
             "description": "A list of domain names that match this route. Note that the hosts value is case sensitive."
           },
           "https_redirect_status_code": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Https Redirect Status Code",
             "description": "The status code Kong responds with when all properties of a route match except the protocol i.e. if the protocol of the request is `HTTP` instead of `HTTPS`. `Location` header is injected by Kong if the field is set to 301, 302, 307 or 308. This config applies only if the route is configured to only accept the `https` protocol.",
             "default": 426
           },
           "id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Id"
           },
           "methods": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Methods",
             "description": "A list of HTTP methods that match this route."
           },
           "name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Name",
             "description": "The name of the route. Route names must be unique, and they are case sensitive. For example, there can be two different routes named \"test\" and \"Test\"."
           },
           "path_handling": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Path Handling",
             "description": "Controls how the service path, route path and requested path are combined when sending a request to the upstream. See above for a detailed description of each behavior.",
             "default": "v0"
           },
           "paths": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Paths",
             "description": "A list of paths that match this route."
           },
           "preserve_host": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Preserve Host",
             "description": "When matching a route via one of the `hosts` domain names, use the request `Host` header in the upstream request headers. If set to `false`, the upstream `Host` header will be that of the services `host`.",
             "default": false
           },
           "protocols": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Protocols",
             "description": "An array of the protocols this route should allow. See the [route Object](#route-object) section for a list of accepted protocols. When set to only `\"https\"`, HTTP requests are answered with an upgrade error. When set to only `\"http\"`, HTTPS requests are answered with an error."
           },
           "regex_priority": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Regex Priority",
             "description": "A number used to choose which route resolves a given request when several routes match it using regexes simultaneously. When two routes match the path and have the same `regex_priority`, the older one (lowest `created_at`) is used. Note that the priority for non-regex routes is different (longer non-regex routes are matched before shorter ones).",
             "default": 0
           },
           "request_buffering": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Request Buffering",
             "description": "Whether to enable request body buffering or not. With HTTP 1.1, it may make sense to turn this off on services that receive data with chunked transfer encoding.",
             "default": true
           },
           "response_buffering": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Response Buffering",
             "description": "Whether to enable response body buffering or not. With HTTP 1.1, it may make sense to turn this off on services that send data with chunked transfer encoding.",
             "default": true
           },
           "service": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/Service"
-              },
-              {
-                "$ref": "#/components/schemas/RouteService"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/Service" },
+              { "$ref": "#/components/schemas/RouteService" },
+              { "type": "null" }
             ],
             "title": "Service"
           },
           "snis": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Snis",
             "description": "A list of SNIs that match this route when using stream routing."
@@ -4411,50 +3401,27 @@
                 },
                 "type": "array"
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ],
             "title": "Sources",
             "description": "A list of IP sources of incoming connections that match this route when using stream routing. Each entry is an object with fields \"ip\" (optionally in CIDR range notation) and/or \"port\"."
           },
           "strip_path": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Strip Path",
             "description": "When matching a route via one of the `paths`, strip the matching prefix from the upstream request URL.",
             "default": true
           },
           "tags": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Tags",
             "description": "An optional set of strings associated with the route for grouping and filtering."
           },
           "updated_at": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Updated At",
             "description": "Unix epoch when the resource was last updated."
           }
@@ -4467,238 +3434,108 @@
         "properties": {
           "ca_certificates": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Ca Certificates",
             "description": "Array of `CA Certificate` object UUIDs that are used to build the trust store while verifying upstream server's TLS certificate. If set to `null` when Nginx default is respected. If default CA list in Nginx are not specified and TLS verification is enabled, then handshake with upstream server will always fail (because no CA are trusted)."
           },
           "client_certificate": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/ServiceClientCertificate"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/ServiceClientCertificate" },
+              { "type": "null" }
             ]
           },
           "connect_timeout": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Connect Timeout",
             "description": "The timeout in milliseconds for establishing a connection to the upstream server.",
             "default": 60000
           },
           "created_at": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Created At",
             "description": "Unix epoch when the resource was created."
           },
           "enabled": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Enabled",
             "description": "Whether the service is active. If set to `false`, the proxy behavior will be as if any routes attached to it do not exist (404).",
             "default": true
           },
           "host": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Host",
             "description": "The host of the upstream server. Note that the host value is case sensitive."
           },
           "id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Id"
           },
           "name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Name",
             "description": "The service name."
           },
           "path": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Path",
             "description": "The path to be used in requests to the upstream server."
           },
           "port": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Port",
             "description": "The upstream server port.",
             "default": 80
           },
           "protocol": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Protocol",
             "description": "The protocol used to communicate with the upstream.",
             "default": "http"
           },
           "read_timeout": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Read Timeout",
             "description": "The timeout in milliseconds between two successive read operations for transmitting a request to the upstream server.",
             "default": 60000
           },
           "retries": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Retries",
             "description": "The number of retries to execute upon failure to proxy.",
             "default": 5
           },
           "tags": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Tags",
             "description": "An optional set of strings associated with the service for grouping and filtering."
           },
           "tls_verify": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Tls Verify",
             "description": "Whether to enable verification of upstream server TLS certificate. If set to `null`, then the Nginx default is respected."
           },
           "tls_verify_depth": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Tls Verify Depth",
             "description": "Maximum depth of chain while verifying Upstream server's TLS certificate. If set to `null`, then the Nginx default is respected.'"
           },
           "updated_at": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Updated At",
             "description": "Unix epoch when the resource was last updated."
           },
           "url": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Url",
             "description": "Helper field to set `protocol`, `host`, `port` and `path` using a URL. This field is write-only and is not returned in responses."
           },
           "write_timeout": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Write Timeout",
             "description": "The timeout in milliseconds between two successive write operations for transmitting a request to the upstream server.",
             "default": 60000
@@ -4706,14 +3543,10 @@
           "routes": {
             "anyOf": [
               {
-                "items": {
-                  "$ref": "#/components/schemas/Route"
-                },
+                "items": { "$ref": "#/components/schemas/Route" },
                 "type": "array"
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ],
             "title": "Routes",
             "default": []
@@ -4727,34 +3560,22 @@
         "properties": {
           "po": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/HealthCheck"
-              },
-              {
-                "type": "string"
-              }
+              { "$ref": "#/components/schemas/HealthCheck" },
+              { "type": "string" }
             ],
             "title": "Po"
           },
           "storage": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/HealthCheck"
-              },
-              {
-                "type": "string"
-              }
+              { "$ref": "#/components/schemas/HealthCheck" },
+              { "type": "string" }
             ],
             "title": "Storage"
           },
           "kong": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/HealthCheck"
-              },
-              {
-                "type": "string"
-              }
+              { "$ref": "#/components/schemas/HealthCheck" },
+              { "type": "string" }
             ],
             "title": "Kong"
           }
@@ -4766,27 +3587,15 @@
       },
       "EventLog": {
         "properties": {
-          "id": {
-            "type": "integer",
-            "title": "Id"
-          },
-          "event_name": {
-            "type": "string",
-            "title": "Event Name"
-          },
-          "service_name": {
-            "type": "string",
-            "title": "Service Name"
-          },
+          "id": { "type": "integer", "title": "Id" },
+          "event_name": { "type": "string", "title": "Event Name" },
+          "service_name": { "type": "string", "title": "Service Name" },
           "timestamp": {
             "type": "string",
             "format": "date-time",
             "title": "Timestamp"
           },
-          "body": {
-            "type": "string",
-            "title": "Body"
-          },
+          "body": { "type": "string", "title": "Body" },
           "attributes": {
             "additionalProperties": true,
             "type": "object",
@@ -4808,15 +3617,11 @@
       "EventLogResponse": {
         "properties": {
           "data": {
-            "items": {
-              "$ref": "#/components/schemas/EventLog"
-            },
+            "items": { "$ref": "#/components/schemas/EventLog" },
             "type": "array",
             "title": "Data"
           },
-          "meta": {
-            "$ref": "#/components/schemas/Meta"
-          }
+          "meta": { "$ref": "#/components/schemas/Meta" }
         },
         "type": "object",
         "required": ["data", "meta"],
@@ -4826,9 +3631,7 @@
       "HTTPValidationError": {
         "properties": {
           "detail": {
-            "items": {
-              "$ref": "#/components/schemas/ValidationError"
-            },
+            "items": { "$ref": "#/components/schemas/ValidationError" },
             "type": "array",
             "title": "Detail"
           }
@@ -4838,11 +3641,7 @@
       },
       "HealthCheck": {
         "properties": {
-          "status": {
-            "type": "string",
-            "title": "Status",
-            "default": "OK"
-          }
+          "status": { "type": "string", "title": "Status", "default": "OK" }
         },
         "type": "object",
         "title": "HealthCheck",
@@ -4869,25 +3668,15 @@
         "properties": {
           "analysis_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "string"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "string" }
             ],
             "title": "Analysis Id"
           },
           "project_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "string"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "string" }
             ],
             "title": "Project Id"
           }
@@ -4900,60 +3689,28 @@
         "properties": {
           "consumer": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/KeyAuthConsumer"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/KeyAuthConsumer" },
+              { "type": "null" }
             ]
           },
           "created_at": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Created At",
             "description": "Unix epoch when the resource was created."
           },
           "id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Id"
           },
           "key": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Key",
             "description": "The key that will be used to authenticate the consumer. If this field is not specified, it will be auto-generated."
           },
           "tags": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Tags",
             "description": "An optional set of strings associated with the Key for grouping and filtering."
@@ -4966,14 +3723,7 @@
       "KeyAuthConsumer": {
         "properties": {
           "id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Id"
           }
         },
@@ -4983,15 +3733,9 @@
       },
       "LinkDataStoreProject": {
         "properties": {
-          "route": {
-            "$ref": "#/components/schemas/Route"
-          },
-          "keyauth": {
-            "$ref": "#/components/schemas/KeyAuth"
-          },
-          "acl": {
-            "$ref": "#/components/schemas/ACL"
-          }
+          "route": { "$ref": "#/components/schemas/Route" },
+          "keyauth": { "$ref": "#/components/schemas/KeyAuth" },
+          "acl": { "$ref": "#/components/schemas/ACL" }
         },
         "type": "object",
         "required": ["route", "keyauth", "acl"],
@@ -4999,15 +3743,9 @@
       },
       "LinkProjectAnalysis": {
         "properties": {
-          "consumer": {
-            "$ref": "#/components/schemas/Consumer"
-          },
-          "keyauth": {
-            "$ref": "#/components/schemas/KeyAuth"
-          },
-          "acl": {
-            "$ref": "#/components/schemas/ACL"
-          }
+          "consumer": { "$ref": "#/components/schemas/Consumer" },
+          "keyauth": { "$ref": "#/components/schemas/KeyAuth" },
+          "acl": { "$ref": "#/components/schemas/ACL" }
         },
         "type": "object",
         "required": ["consumer", "keyauth", "acl"],
@@ -5018,26 +3756,15 @@
           "data": {
             "anyOf": [
               {
-                "items": {
-                  "$ref": "#/components/schemas/Consumer"
-                },
+                "items": { "$ref": "#/components/schemas/Consumer" },
                 "type": "array"
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ],
             "title": "Data"
           },
           "offset": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Offset",
             "description": "Offset is used to paginate through the API. Provide this value to the next list operation to fetch the next page"
           }
@@ -5051,26 +3778,15 @@
           "data": {
             "anyOf": [
               {
-                "items": {
-                  "$ref": "#/components/schemas/DetailedRoute"
-                },
+                "items": { "$ref": "#/components/schemas/DetailedRoute" },
                 "type": "array"
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ],
             "title": "Data"
           },
           "offset": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Offset",
             "description": "Offset is used to paginate through the API. Provide this value to the next list operation to fetch the next page"
           }
@@ -5084,26 +3800,15 @@
           "data": {
             "anyOf": [
               {
-                "items": {
-                  "$ref": "#/components/schemas/DetailedService"
-                },
+                "items": { "$ref": "#/components/schemas/DetailedService" },
                 "type": "array"
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ],
             "title": "Data"
           },
           "offset": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Offset",
             "description": "Offset is used to paginate through the API. Provide this value to the next list operation to fetch the next page"
           }
@@ -5114,21 +3819,10 @@
       },
       "LogReport": {
         "additionalProperties": {
-          "items": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ]
-          },
+          "items": { "anyOf": [{ "type": "string" }, { "type": "null" }] },
           "type": "array"
         },
-        "propertyNames": {
-          "format": "uuid"
-        },
+        "propertyNames": { "format": "uuid" },
         "type": "object",
         "title": "LogReport",
         "description": "Response with dynamic UUID keys and dynamic analysis log keys"
@@ -5137,22 +3831,14 @@
         "properties": {
           "analysis": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/LogReport"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/LogReport" },
+              { "type": "null" }
             ]
           },
           "nginx": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/LogReport"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/LogReport" },
+              { "type": "null" }
             ]
           }
         },
@@ -5162,43 +3848,41 @@
       },
       "MasterImage": {
         "properties": {
-          "id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "Id"
-          },
+          "id": { "type": "string", "format": "uuid", "title": "Id" },
           "path": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Path"
           },
-          "virtual_path": {
-            "type": "string",
-            "title": "Virtual Path"
-          },
+          "virtual_path": { "type": "string", "title": "Virtual Path" },
           "group_virtual_path": {
             "type": "string",
             "title": "Group Virtual Path"
           },
-          "name": {
-            "type": "string",
-            "title": "Name"
-          },
-          "command": {
+          "build_status": {
             "anyOf": [
               {
-                "type": "string"
+                "type": "string",
+                "enum": [
+                  "starting",
+                  "started",
+                  "stopping",
+                  "stopped",
+                  "executing",
+                  "executed",
+                  "failed"
+                ]
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ],
+            "title": "Build Status"
+          },
+          "build_progress": {
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "title": "Build Progress"
+          },
+          "name": { "type": "string", "title": "Name" },
+          "command": {
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Command"
           },
           "command_arguments": {
@@ -5209,9 +3893,7 @@
                 },
                 "type": "array"
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ],
             "title": "Command Arguments"
           },
@@ -5232,6 +3914,8 @@
           "path",
           "virtual_path",
           "group_virtual_path",
+          "build_status",
+          "build_progress",
           "name",
           "command",
           "command_arguments",
@@ -5242,19 +3926,11 @@
       },
       "MasterImageCommandArgument": {
         "properties": {
-          "value": {
-            "type": "string",
-            "title": "Value"
-          },
+          "value": { "type": "string", "title": "Value" },
           "position": {
             "anyOf": [
-              {
-                "type": "string",
-                "enum": ["before", "after"]
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "enum": ["before", "after"] },
+              { "type": "null" }
             ],
             "title": "Position"
           }
@@ -5265,22 +3941,10 @@
       },
       "Meta": {
         "properties": {
-          "count": {
-            "type": "integer",
-            "title": "Count"
-          },
-          "total": {
-            "type": "integer",
-            "title": "Total"
-          },
-          "limit": {
-            "type": "integer",
-            "title": "Limit"
-          },
-          "offset": {
-            "type": "integer",
-            "title": "Offset"
-          }
+          "count": { "type": "integer", "title": "Count" },
+          "total": { "type": "integer", "title": "Total" },
+          "limit": { "type": "integer", "title": "Limit" },
+          "offset": { "type": "integer", "title": "Offset" }
         },
         "type": "object",
         "required": ["count", "total", "limit", "offset"],
@@ -5307,14 +3971,7 @@
             "default": "us-east-1"
           },
           "bucket_name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Bucket Name"
           },
           "timeout": {
@@ -5323,14 +3980,7 @@
             "default": 100000
           },
           "strip_path_pattern": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Strip Path Pattern"
           }
         },
@@ -5342,124 +3992,74 @@
       "Node": {
         "properties": {
           "external_name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "External Name"
           },
           "hidden": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Hidden"
           },
-          "name": {
-            "type": "string",
-            "title": "Name"
-          },
+          "name": { "type": "string", "title": "Name" },
           "realm_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "null" }
             ],
             "title": "Realm Id"
           },
           "registry_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "null" }
             ],
             "title": "Registry Id"
           },
           "type": {
             "anyOf": [
-              {
-                "type": "string",
-                "enum": ["aggregator", "default"]
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "enum": ["aggregator", "default"] },
+              { "type": "null" }
             ],
             "title": "Type"
           },
-          "id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "Id"
-          },
+          "id": { "type": "string", "format": "uuid", "title": "Id" },
           "public_key": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Public Key"
           },
-          "online": {
-            "type": "boolean",
-            "title": "Online"
-          },
+          "online": { "type": "boolean", "title": "Online" },
           "registry": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/Registry"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/Registry" },
+              { "type": "null" }
             ]
           },
           "registry_project_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "null" }
             ],
             "title": "Registry Project Id"
           },
           "registry_project": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/RegistryProject"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/RegistryProject" },
+              { "type": "null" }
             ]
           },
           "robot_id": {
-            "type": "string",
-            "format": "uuid",
+            "anyOf": [
+              { "type": "string", "format": "uuid" },
+              { "type": "null" }
+            ],
             "title": "Robot Id"
           },
+          "client_id": {
+            "anyOf": [
+              { "type": "string", "format": "uuid" },
+              { "type": "null" }
+            ],
+            "title": "Client Id"
+          },
           "created_at": {
             "type": "string",
             "format": "date-time",
@@ -5484,29 +4084,12 @@
           "online",
           "registry_project_id",
           "robot_id",
+          "client_id",
           "created_at",
           "updated_at"
         ],
         "title": "Node"
       },
-      "NodeSettings": {
-        "properties": {
-          "data_required": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Data Required",
-            "default": true
-          }
-        },
-        "type": "object",
-        "title": "NodeSettings"
-      },
       "NodeTypeResponse": {
         "properties": {
           "type": {
@@ -5519,36 +4102,37 @@
         "required": ["type"],
         "title": "NodeTypeResponse"
       },
+      "PodProgressResponse": {
+        "additionalProperties": {
+          "$ref": "#/components/schemas/AnalysisStatus"
+        },
+        "propertyNames": { "format": "uuid" },
+        "type": "object",
+        "title": "PodProgressResponse",
+        "description": "Response with dynamic UUID keys and dynamic analysis keys with progress/status"
+      },
       "PodResponse": {
         "additionalProperties": {
-          "items": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ]
-          },
+          "items": { "anyOf": [{ "type": "string" }, { "type": "null" }] },
           "type": "array"
         },
-        "propertyNames": {
-          "format": "uuid"
-        },
+        "propertyNames": { "format": "uuid" },
         "type": "object",
-        "title": "PodResponse"
+        "title": "PodResponse",
+        "description": "Response with a list of running pods for a given analysis ID"
       },
       "PodStatus": {
         "type": "string",
         "enum": [
           "starting",
           "started",
-          "stuck",
-          "running",
           "stopping",
           "stopped",
+          "running",
           "finished",
+          "executing",
+          "executed",
+          "stuck",
           "failed"
         ],
         "title": "PodStatus",
@@ -5557,53 +4141,24 @@
       "Project": {
         "properties": {
           "description": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Description"
           },
           "master_image_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "null" }
             ],
             "title": "Master Image Id"
           },
-          "name": {
-            "type": "string",
-            "title": "Name"
-          },
-          "id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "Id"
-          },
-          "analyses": {
-            "type": "integer",
-            "title": "Analyses"
-          },
-          "nodes": {
-            "type": "integer",
-            "title": "Nodes"
-          },
+          "name": { "type": "string", "title": "Name" },
+          "id": { "type": "string", "format": "uuid", "title": "Id" },
+          "analyses": { "type": "integer", "title": "Analyses" },
+          "nodes": { "type": "integer", "title": "Nodes" },
           "master_image": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/MasterImage"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/MasterImage" },
+              { "type": "null" }
             ]
           },
           "created_at": {
@@ -5623,25 +4178,15 @@
           },
           "user_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "null" }
             ],
             "title": "User Id"
           },
           "robot_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "null" }
             ],
             "title": "Robot Id"
           }
@@ -5664,35 +4209,20 @@
       },
       "ProjectNode": {
         "properties": {
-          "node_id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "Node Id"
-          },
+          "node_id": { "type": "string", "format": "uuid", "title": "Node Id" },
           "project_id": {
             "type": "string",
             "format": "uuid",
             "title": "Project Id"
           },
-          "id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "Id"
-          },
+          "id": { "type": "string", "format": "uuid", "title": "Id" },
           "approval_status": {
             "type": "string",
             "enum": ["rejected", "approved"],
             "title": "Approval Status"
           },
           "comment": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Comment"
           },
           "created_at": {
@@ -5705,12 +4235,8 @@
             "format": "date-time",
             "title": "Updated At"
           },
-          "node": {
-            "$ref": "#/components/schemas/Node"
-          },
-          "project": {
-            "$ref": "#/components/schemas/Project"
-          },
+          "node": { "$ref": "#/components/schemas/Node" },
+          "project": { "$ref": "#/components/schemas/Project" },
           "project_realm_id": {
             "type": "string",
             "format": "uuid",
@@ -5744,41 +4270,17 @@
       },
       "Registry": {
         "properties": {
-          "name": {
-            "type": "string",
-            "title": "Name"
-          },
-          "host": {
-            "type": "string",
-            "title": "Host"
-          },
+          "name": { "type": "string", "title": "Name" },
+          "host": { "type": "string", "title": "Host" },
           "account_name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Account Name"
           },
           "account_secret": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Account Secret"
           },
-          "id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "Id"
-          },
+          "id": { "type": "string", "format": "uuid", "title": "Id" },
           "created_at": {
             "type": "string",
             "format": "date-time",
@@ -5803,10 +4305,7 @@
       },
       "RegistryProject": {
         "properties": {
-          "name": {
-            "type": "string",
-            "title": "Name"
-          },
+          "name": { "type": "string", "title": "Name" },
           "type": {
             "type": "string",
             "enum": [
@@ -5824,98 +4323,39 @@
             "format": "uuid",
             "title": "Registry Id"
           },
-          "external_name": {
-            "type": "string",
-            "title": "External Name"
-          },
-          "id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "Id"
-          },
-          "public": {
-            "type": "boolean",
-            "title": "Public"
-          },
+          "external_name": { "type": "string", "title": "External Name" },
+          "id": { "type": "string", "format": "uuid", "title": "Id" },
+          "public": { "type": "boolean", "title": "Public" },
           "external_id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "External Id"
           },
           "webhook_name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Webhook Name"
           },
           "webhook_exists": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Webhook Exists"
           },
           "realm_id": {
             "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
+              { "type": "string", "format": "uuid" },
+              { "type": "null" }
             ],
             "title": "Realm Id"
           },
-          "registry": {
-            "$ref": "#/components/schemas/Registry"
-          },
+          "registry": { "$ref": "#/components/schemas/Registry" },
           "account_id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Account Id"
           },
           "account_name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Account Name"
           },
           "account_secret": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Account Secret"
           },
           "created_at": {
@@ -5949,14 +4389,7 @@
       "Route": {
         "properties": {
           "created_at": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Created At",
             "description": "Unix epoch when the resource was created."
           },
@@ -5968,208 +4401,106 @@
                 },
                 "type": "array"
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ],
             "title": "Destinations",
             "description": "A list of IP destinations of incoming connections that match this route when using stream routing. Each entry is an object with fields \"ip\" (optionally in CIDR range notation) and/or \"port\"."
           },
           "headers": {
             "anyOf": [
-              {
-                "additionalProperties": true,
-                "type": "object"
-              },
-              {
-                "type": "null"
-              }
+              { "additionalProperties": true, "type": "object" },
+              { "type": "null" }
             ],
             "title": "Headers",
             "description": "One or more lists of values indexed by header name that will cause this route to match if present in the request. The `Host` header cannot be used with this hosts should be specified using the `hosts` attribute. When `headers` contains only one value and that value starts with the special prefix `~*`, the value is interpreted as a regular expression."
           },
           "hosts": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Hosts",
             "description": "A list of domain names that match this route. Note that the hosts value is case sensitive."
           },
           "https_redirect_status_code": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Https Redirect Status Code",
             "description": "The status code Kong responds with when all properties of a route match except the protocol i.e. if the protocol of the request is `HTTP` instead of `HTTPS`. `Location` header is injected by Kong if the field is set to 301, 302, 307 or 308. This config applies only if the route is configured to only accept the `https` protocol.",
             "default": 426
           },
           "id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Id"
           },
           "methods": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Methods",
             "description": "A list of HTTP methods that match this route."
           },
           "name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Name",
             "description": "The name of the route. Route names must be unique, and they are case sensitive. For example, there can be two different routes named \"test\" and \"Test\"."
           },
           "path_handling": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Path Handling",
             "description": "Controls how the service path, route path and requested path are combined when sending a request to the upstream. See above for a detailed description of each behavior.",
             "default": "v0"
           },
           "paths": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Paths",
             "description": "A list of paths that match this route."
           },
           "preserve_host": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Preserve Host",
             "description": "When matching a route via one of the `hosts` domain names, use the request `Host` header in the upstream request headers. If set to `false`, the upstream `Host` header will be that of the services `host`.",
             "default": false
           },
           "protocols": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Protocols",
             "description": "An array of the protocols this route should allow. See the [route Object](#route-object) section for a list of accepted protocols. When set to only `\"https\"`, HTTP requests are answered with an upgrade error. When set to only `\"http\"`, HTTPS requests are answered with an error."
           },
           "regex_priority": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Regex Priority",
             "description": "A number used to choose which route resolves a given request when several routes match it using regexes simultaneously. When two routes match the path and have the same `regex_priority`, the older one (lowest `created_at`) is used. Note that the priority for non-regex routes is different (longer non-regex routes are matched before shorter ones).",
             "default": 0
           },
           "request_buffering": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Request Buffering",
             "description": "Whether to enable request body buffering or not. With HTTP 1.1, it may make sense to turn this off on services that receive data with chunked transfer encoding.",
             "default": true
           },
           "response_buffering": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Response Buffering",
             "description": "Whether to enable response body buffering or not. With HTTP 1.1, it may make sense to turn this off on services that send data with chunked transfer encoding.",
             "default": true
           },
           "service": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/RouteService"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/RouteService" },
+              { "type": "null" }
             ]
           },
           "snis": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Snis",
             "description": "A list of SNIs that match this route when using stream routing."
@@ -6182,50 +4513,27 @@
                 },
                 "type": "array"
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ],
             "title": "Sources",
             "description": "A list of IP sources of incoming connections that match this route when using stream routing. Each entry is an object with fields \"ip\" (optionally in CIDR range notation) and/or \"port\"."
           },
           "strip_path": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Strip Path",
             "description": "When matching a route via one of the `paths`, strip the matching prefix from the upstream request URL.",
             "default": true
           },
           "tags": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Tags",
             "description": "An optional set of strings associated with the route for grouping and filtering."
           },
           "updated_at": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Updated At",
             "description": "Unix epoch when the resource was last updated."
           }
@@ -6236,15 +4544,7 @@
       },
       "RouteDestinationsInner": {
         "properties": {
-          "default": {
-            "anyOf": [
-              {},
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Default"
-          }
+          "default": { "anyOf": [{}, { "type": "null" }], "title": "Default" }
         },
         "type": "object",
         "title": "RouteDestinationsInner",
@@ -6253,14 +4553,7 @@
       "RouteService": {
         "properties": {
           "id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Id"
           }
         },
@@ -6272,238 +4565,108 @@
         "properties": {
           "ca_certificates": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Ca Certificates",
             "description": "Array of `CA Certificate` object UUIDs that are used to build the trust store while verifying upstream server's TLS certificate. If set to `null` when Nginx default is respected. If default CA list in Nginx are not specified and TLS verification is enabled, then handshake with upstream server will always fail (because no CA are trusted)."
           },
           "client_certificate": {
             "anyOf": [
-              {
-                "$ref": "#/components/schemas/ServiceClientCertificate"
-              },
-              {
-                "type": "null"
-              }
+              { "$ref": "#/components/schemas/ServiceClientCertificate" },
+              { "type": "null" }
             ]
           },
           "connect_timeout": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Connect Timeout",
             "description": "The timeout in milliseconds for establishing a connection to the upstream server.",
             "default": 60000
           },
           "created_at": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Created At",
             "description": "Unix epoch when the resource was created."
           },
           "enabled": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Enabled",
             "description": "Whether the service is active. If set to `false`, the proxy behavior will be as if any routes attached to it do not exist (404).",
             "default": true
           },
           "host": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Host",
             "description": "The host of the upstream server. Note that the host value is case sensitive."
           },
           "id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Id"
           },
           "name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Name",
             "description": "The service name."
           },
           "path": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Path",
             "description": "The path to be used in requests to the upstream server."
           },
           "port": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Port",
             "description": "The upstream server port.",
             "default": 80
           },
           "protocol": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Protocol",
             "description": "The protocol used to communicate with the upstream.",
             "default": "http"
           },
           "read_timeout": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Read Timeout",
             "description": "The timeout in milliseconds between two successive read operations for transmitting a request to the upstream server.",
             "default": 60000
           },
           "retries": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Retries",
             "description": "The number of retries to execute upon failure to proxy.",
             "default": 5
           },
           "tags": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Tags",
             "description": "An optional set of strings associated with the service for grouping and filtering."
           },
           "tls_verify": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Tls Verify",
             "description": "Whether to enable verification of upstream server TLS certificate. If set to `null`, then the Nginx default is respected."
           },
           "tls_verify_depth": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Tls Verify Depth",
             "description": "Maximum depth of chain while verifying Upstream server's TLS certificate. If set to `null`, then the Nginx default is respected.'"
           },
           "updated_at": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Updated At",
             "description": "Unix epoch when the resource was last updated."
           },
           "url": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Url",
             "description": "Helper field to set `protocol`, `host`, `port` and `path` using a URL. This field is write-only and is not returned in responses."
           },
           "write_timeout": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Write Timeout",
             "description": "The timeout in milliseconds between two successive write operations for transmitting a request to the upstream server.",
             "default": 60000
@@ -6516,14 +4679,7 @@
       "ServiceClientCertificate": {
         "properties": {
           "id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Id"
           }
         },
@@ -6534,39 +4690,18 @@
       "ServiceRequest": {
         "properties": {
           "name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Name",
             "description": "The service name. "
           },
           "retries": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Retries",
             "description": "The number of retries to execute upon failure to proxy. Default:`5`. ",
             "default": 5
           },
           "protocol": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Protocol",
             "default": "http"
           },
@@ -6576,71 +4711,33 @@
             "description": "The host of the upstream server. Note that the host value is case sensitive. "
           },
           "port": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Port",
             "default": 80
           },
-          "path": {
-            "type": "string",
-            "title": "Path"
-          },
+          "path": { "type": "string", "title": "Path" },
           "connect_timeout": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Connect Timeout",
             "description": "The timeout in milliseconds for establishing a connection to the upstream server.",
             "default": 6000
           },
           "write_timeout": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Write Timeout",
             "description": "The timeout in milliseconds between two successive write operations for transmitting a request to the upstream server. Default: `60000`. ",
             "default": 6000
           },
           "read_timeout": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Read Timeout",
             "description": "The timeout in milliseconds between two successive read operations for transmitting a request to the upstream server. Default: `60000`. ",
             "default": 6000
           },
           "tags": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Tags",
             "description": "An optional set of strings associated with the service for grouping and filtering. "
@@ -6650,53 +4747,26 @@
               {
                 "$ref": "#/components/schemas/CreateServiceRequestClientCertificate"
               },
-              {
-                "type": "null"
-              }
+              { "type": "null" }
             ]
           },
           "tls_verify": {
-            "anyOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
             "title": "Tls Verify"
           },
           "tls_verify_depth": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Tls Verify Depth",
             "description": "Maximum depth of chain while verifying Upstream server's TLS certificate. If set to null, then the Nginx default is respected. Default: null. "
           },
           "ca_certificates": {
             "anyOf": [
-              {
-                "items": {
-                  "type": "string"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
+              { "items": { "type": "string" }, "type": "array" },
+              { "type": "null" }
             ],
             "title": "Ca Certificates"
           },
-          "enabled": {
-            "type": "boolean",
-            "title": "Enabled",
-            "default": true
-          }
+          "enabled": { "type": "boolean", "title": "Enabled", "default": true }
         },
         "type": "object",
         "required": ["host", "path"],
@@ -6718,51 +4788,24 @@
           }
         ]
       },
-      "StatusResponse": {
-        "additionalProperties": {
-          "$ref": "#/components/schemas/PodStatus"
-        },
-        "propertyNames": {
-          "format": "uuid"
-        },
+      "StatusOnlyResponse": {
+        "additionalProperties": { "$ref": "#/components/schemas/PodStatus" },
+        "propertyNames": { "format": "uuid" },
         "type": "object",
-        "title": "StatusResponse",
+        "title": "StatusOnlyResponse",
         "description": "Response with dynamic UUID keys and dynamic analysis keys"
       },
       "Token": {
         "properties": {
-          "access_token": {
-            "type": "string",
-            "title": "Access Token"
-          },
-          "token_type": {
-            "type": "string",
-            "title": "Token Type"
-          },
-          "expires_in": {
-            "type": "integer",
-            "title": "Expires In"
-          },
+          "access_token": { "type": "string", "title": "Access Token" },
+          "token_type": { "type": "string", "title": "Token Type" },
+          "expires_in": { "type": "integer", "title": "Expires In" },
           "refresh_token": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "string" }, { "type": "null" }],
             "title": "Refresh Token"
           },
           "refresh_expires_in": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "anyOf": [{ "type": "integer" }, { "type": "null" }],
             "title": "Refresh Expires In"
           }
         },
@@ -6771,30 +4814,37 @@
         "title": "Token",
         "description": "IDP token model."
       },
+      "UserSettings": {
+        "properties": {
+          "require_data_store": {
+            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
+            "title": "Require Data Store",
+            "default": true
+          },
+          "autostart": {
+            "anyOf": [
+              { "$ref": "#/components/schemas/AutostartSettings" },
+              { "type": "null" }
+            ],
+            "default": { "enabled": false, "interval": 60 }
+          }
+        },
+        "additionalProperties": false,
+        "type": "object",
+        "title": "UserSettings",
+        "description": "Node configuration settings set by the user."
+      },
       "ValidationError": {
         "properties": {
           "loc": {
-            "items": {
-              "anyOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "integer"
-                }
-              ]
-            },
+            "items": { "anyOf": [{ "type": "string" }, { "type": "integer" }] },
             "type": "array",
             "title": "Location"
           },
-          "msg": {
-            "type": "string",
-            "title": "Message"
-          },
-          "type": {
-            "type": "string",
-            "title": "Error Type"
-          }
+          "msg": { "type": "string", "title": "Message" },
+          "type": { "type": "string", "title": "Error Type" },
+          "input": { "title": "Input" },
+          "ctx": { "type": "object", "title": "Context" }
         },
         "type": "object",
         "required": ["loc", "msg", "type"],
@@ -6841,6 +4891,10 @@
     {
       "name": "PodOrc",
       "description": "Gateway endpoints for the Pod Orchestration service."
+    },
+    {
+      "name": "Storage",
+      "description": "Gateway endpoints for the Storage service."
     }
   ]
 }
diff --git a/app/services/modifiedApiInterfaces.ts b/app/services/modifiedApiInterfaces.ts
index bda7c8b5..37d9536e 100644
--- a/app/services/modifiedApiInterfaces.ts
+++ b/app/services/modifiedApiInterfaces.ts
@@ -37,12 +37,23 @@ export interface ModifiedRoute extends Omit<
   updated_at: modifiedTimestamp;
 }
 
-export interface ModifiedAnalysisNode extends Omit<AnalysisNode, "run_status"> {
-  project_name: string | undefined;
+export interface ModifiedAnalysisNode extends Omit<
+  AnalysisNode,
+  "execution_status"
+> {
+  project_name: string | undefined | null;
   expand: {
     [key: string]: string;
   };
   datastore: boolean;
-  run_status: PodStatus | null;
+  execution_status: PodStatus | undefined | null;
   progress: number;
 }
+
+export interface ModifiedParsedAnalysisNode extends Omit<
+  ModifiedAnalysisNode,
+  "created_at" | "updated_at"
+> {
+  created_at: modifiedTimestamp;
+  updated_at: modifiedTimestamp;
+}
diff --git a/app/stores/nodeSettingsStore.ts b/app/stores/nodeSettingsStore.ts
new file mode 100644
index 00000000..6b7d9146
--- /dev/null
+++ b/app/stores/nodeSettingsStore.ts
@@ -0,0 +1,58 @@
+import { defineStore } from "pinia";
+import type { NodeTypeResponse, UserSettings } from "~/services/Api";
+import { useNuxtApp } from "nuxt/app";
+
+export const useNodeSettingsStore = defineStore("nodeSettings", {
+  state: () => ({
+    settings: null as UserSettings | null,
+    nodeType: null as string | null,
+  }),
+  getters: {
+    requireDataStore(state): boolean {
+      if (state.nodeType === "aggregator") return false;
+      return Boolean(state.settings?.require_data_store ?? true);
+    },
+    autostartEnabled(state): boolean {
+      return Boolean(state.settings?.autostart?.enabled ?? false);
+    },
+    autostartInterval(state): number {
+      return state.settings?.autostart?.interval ?? 60;
+    },
+  },
+  actions: {
+    async fetchSettings() {
+      const { $hubApi } = useNuxtApp();
+
+      const [settingsResp, nodeTypeResp] = await Promise.all([
+        $hubApi("/node/settings", { method: "GET" }).catch(
+          () => null,
+        ) as Promise<UserSettings | null>,
+        $hubApi("/node-type", { method: "GET" }).catch(
+          () => null,
+        ) as Promise<NodeTypeResponse | null>,
+      ]);
+
+      if (settingsResp) {
+        this.settings = settingsResp;
+      }
+      if (nodeTypeResp?.type) {
+        this.nodeType = nodeTypeResp.type;
+      }
+    },
+
+    async updateSettings(patch: UserSettings) {
+      const { $hubApi } = useNuxtApp();
+
+      const updated = (await $hubApi("/node/settings", {
+        method: "POST",
+        body: patch,
+      }).catch(() => null)) as UserSettings | null;
+
+      if (updated) {
+        this.settings = updated;
+      }
+
+      return updated;
+    },
+  },
+});
diff --git a/app/types/analysis.ts b/app/types/analysis.ts
index 6226bcbb..0950f5a1 100644
--- a/app/types/analysis.ts
+++ b/app/types/analysis.ts
@@ -1,18 +1,10 @@
-export const AnalysisBuildStatus = {
-  Starting: "starting",
-  Started: "started",
-  Stopping: "stopping",
-  Stopped: "stopped",
-  Finished: "finished",
-  Failed: "failed",
-};
-
-export const AnalysisNodeRunStatus = {
-  Starting: "starting",
-  Started: "started",
-  Stopping: "stopping",
-  Stopped: "stopped",
-  Finished: "finished",
-  Running: "running",
-  Failed: "failed",
-};
+export enum ProcessStatus {
+  // As defined by the Hub
+  Starting = "starting",
+  Started = "started",
+  Stopping = "stopping",
+  Stopped = "stopped",
+  Executing = "executing",
+  Executed = "executed",
+  Failed = "failed",
+}
diff --git a/app/types/node.ts b/app/types/node.ts
index 4740d6b6..ed6a1684 100644
--- a/app/types/node.ts
+++ b/app/types/node.ts
@@ -1,4 +1,4 @@
-export const ApprovalStatus = {
-  Approved: "approved",
-  Rejected: "rejected",
-};
+export enum ApprovalStatus {
+  Approved = "approved",
+  Rejected = "rejected",
+}
diff --git a/app/types/statusTag.ts b/app/types/statusTag.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/app/utils/count-analyses.ts b/app/utils/count-analyses.ts
index 6e325736..4fb4d538 100644
--- a/app/utils/count-analyses.ts
+++ b/app/utils/count-analyses.ts
@@ -1,11 +1,11 @@
-import { AnalysisNodeRunStatus } from "~/types/analysis";
+import { PodStatus } from "~/services/Api";
 import type { ModifiedAnalysisNode } from "~/services/modifiedApiInterfaces";
 
 export interface containerCount {
   started: number;
-  running: number;
+  executing: number;
   failed: number;
-  finished: number;
+  executed: number;
   stopped: number;
 }
 
@@ -14,39 +14,41 @@ export function countAnalysisContainers(
 ): containerCount {
   const counts: containerCount = {
     started: 0,
-    running: 0,
-    finished: 0,
+    executing: 0,
+    executed: 0,
     failed: 0,
     stopped: 0,
   };
   for (const analysis of currentAnalyses) {
-    const runStatus = analysis.run_status;
-    if (runStatus) {
-      switch (runStatus) {
-        case AnalysisNodeRunStatus.Started:
-        case AnalysisNodeRunStatus.Starting:
+    const executionStatus = analysis.execution_status;
+    if (executionStatus) {
+      switch (executionStatus) {
+        case PodStatus.Started:
+        case PodStatus.Starting:
           counts.started++;
           break;
 
-        case AnalysisNodeRunStatus.Running:
-          counts.running++;
+        case PodStatus.Executing:
+        case PodStatus.Running:
+          counts.executing++;
           break;
 
-        case AnalysisNodeRunStatus.Stopping:
-        case AnalysisNodeRunStatus.Stopped:
+        case PodStatus.Stopping:
+        case PodStatus.Stopped:
           counts.stopped++;
           break;
 
-        case AnalysisNodeRunStatus.Failed:
+        case PodStatus.Failed:
           counts.failed++;
           break;
 
-        case AnalysisNodeRunStatus.Finished:
-          counts.finished++;
+        case PodStatus.Executed:
+        case PodStatus.Finished:
+          counts.executed++;
           break;
 
         default:
-          console.log(`${runStatus} not an acceptable option`);
+          console.log(`${executionStatus} not an acceptable option`);
       }
     }
   }
diff --git a/app/utils/format-data-row.ts b/app/utils/format-data-row.ts
index 91b4790b..f15bee86 100644
--- a/app/utils/format-data-row.ts
+++ b/app/utils/format-data-row.ts
@@ -6,35 +6,53 @@
  * @param rowExpansionKeys - data keys that will be moved to an expandable subset
  */
 import { useTimeAgo } from "@vueuse/core";
+import type { AnalysisNode, ProjectNode, Route } from "~/services/Api";
+import type { ModifiedDetailedService } from "~/services/modifiedApiInterfaces";
 
 export function formatDataRow(
-  rowEntries,
+  rowEntries:
+    | ProjectNode[]
+    | ModifiedDetailedService[]
+    | Route[]
+    | AnalysisNode[]
+    | null
+    | undefined,
   datetimeKeys: string[],
   rowExpansionKeys: string[],
 ) {
   if (rowEntries) {
-    rowEntries.map((row) => {
-      parseUnixTimestamp(row, datetimeKeys);
-      const expandData: object = {};
-      rowExpansionKeys.forEach((key) => {
-        if (key in row) {
-          expandData[key] = row[key];
-          delete row[key];
-        }
-      });
-      row["expand"] = expandData;
-    });
+    return rowEntries.map(
+      (row: ProjectNode | ModifiedDetailedService | Route | AnalysisNode) => {
+        // Create a shallow copy of the row
+        const newRow = { ...row };
+
+        // parseUnixTimestamp now returns a new object, so assign it back
+        const parsedRow = parseUnixTimestamp(newRow, datetimeKeys);
+
+        const expandData: object = {};
+        rowExpansionKeys.forEach((key) => {
+          if (key in parsedRow) {
+            expandData[key] = parsedRow[key];
+            delete parsedRow[key];
+          }
+        });
+        parsedRow["expand"] = expandData;
+
+        return parsedRow;
+      },
+    );
   }
   return rowEntries;
 }
 
 export function parseUnixTimestamp(
-  dataRow: object,
+  dataRow: ProjectNode | ModifiedDetailedService | Route | AnalysisNode,
   keysToModify: string[],
-): object {
+) {
+  const result = { ...dataRow };
   keysToModify.forEach((key) => {
-    if (key in dataRow) {
-      const timestamp = dataRow[key];
+    if (key in result) {
+      const timestamp = result[key];
       let date: Date;
       if (typeof timestamp !== "object") {
         // If it is an object, then no need to parse
@@ -54,7 +72,7 @@ export function parseUnixTimestamp(
               year: "numeric",
             });
 
-        dataRow[key] = {
+        result[key] = {
           short: shortDate,
           long: date.toLocaleString("de-DE", {
             month: "short",
@@ -70,7 +88,7 @@ export function parseUnixTimestamp(
       }
     }
   });
-  return dataRow;
+  return result;
 }
 
 function isLessThanOneWeekAgo(date: Date): boolean {
diff --git a/app/utils/status-tag-severity.ts b/app/utils/status-tag-severity.ts
index 758df963..a2caa899 100644
--- a/app/utils/status-tag-severity.ts
+++ b/app/utils/status-tag-severity.ts
@@ -1,7 +1,8 @@
 import { ApprovalStatus } from "~/types/node";
-import { AnalysisBuildStatus, AnalysisNodeRunStatus } from "~/types/analysis";
+import { PodStatus } from "~/services/Api";
+import { ProcessStatus } from "~/types/analysis";
 
-export const getApprovalStatusSeverity = (status: string) => {
+export const getApprovalStatusSeverity = (status: ApprovalStatus) => {
   switch (status) {
     case ApprovalStatus.Approved:
       return "success";
@@ -11,54 +12,53 @@ export const getApprovalStatusSeverity = (status: string) => {
   }
 };
 
-export const getBuildStatusSeverity = (status: string) => {
+export const getBuildStatusSeverity = (status: ProcessStatus) => {
   switch (status) {
-    case AnalysisBuildStatus.Starting:
+    case ProcessStatus.Starting:
+    case ProcessStatus.Started:
       return "info";
 
-    case AnalysisBuildStatus.Started:
-      return "info";
-
-    case AnalysisBuildStatus.Stopping:
+    case ProcessStatus.Stopping:
+    case ProcessStatus.Stopped:
       return "warning";
 
-    case AnalysisBuildStatus.Stopped:
-      return "warning";
-
-    case AnalysisBuildStatus.Failed:
+    case ProcessStatus.Failed:
       return "danger";
 
-    case AnalysisBuildStatus.Finished:
+    case ProcessStatus.Executing:
+      return "contrast";
+
+    case ProcessStatus.Executed:
       return "success";
   }
 };
 
-export const getRunStatusSeverity = (status: string) => {
+export const getExecutionStatusSeverity = (status: PodStatus) => {
   switch (status) {
-    case AnalysisNodeRunStatus.Starting:
-      return "info";
-
-    case AnalysisNodeRunStatus.Started:
+    case PodStatus.Starting:
+    case PodStatus.Started:
       return "info";
 
-    case AnalysisNodeRunStatus.Running:
+    case PodStatus.Executing:
+    case PodStatus.Running:
       return "contrast";
 
-    case AnalysisNodeRunStatus.Stopping:
-      return "warning";
-
-    case AnalysisNodeRunStatus.Stopped:
+    case PodStatus.Stopping:
+    case PodStatus.Stopped:
       return "warning";
 
-    case AnalysisNodeRunStatus.Failed:
+    case PodStatus.Failed:
       return "danger";
 
-    case AnalysisNodeRunStatus.Finished:
+    case PodStatus.Executed:
+    case PodStatus.Finished:
       return "success";
   }
 };
 
-export const getDataStoreTypeSeverity = (status: string) => {
+export const getDataStoreTypeSeverity = (
+  status: string,
+): "info" | "warn" | undefined => {
   switch (status) {
     case "s3":
       return "info";
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 79f366bf..9d8ad165 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -62,10 +62,11 @@ export default defineNuxtConfig({
   },
 
   css: [
-    "./app/assets/css/main.css",
+    "~/assets/css/main.css",
     "primeicons/primeicons.css",
     "~/assets/css/elements.css",
     "~/assets/css/table.css",
+    "~/assets/css/preferences.css",
   ],
 
   vite: {
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
deleted file mode 100644
index 194f2904..00000000
--- a/pnpm-workspace.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-patchedDependencies:
-  next-auth@4.21.1: patches/next-auth-no-proxy.patch
diff --git a/public/analyses.json b/public/analyses.json
index d84fd622..b7da4b46 100644
--- a/public/analyses.json
+++ b/public/analyses.json
@@ -10,7 +10,7 @@
       "project_realm_id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
       "node_id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
       "node_realm_id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-      "run_status": "running",
+      "execution_status": "running",
       "index": 0,
       "artifact_tag": "string",
       "artifact_digest": "string",
@@ -24,7 +24,7 @@
         "nodes": 0,
         "configuration_status": "base",
         "build_status": "starting",
-        "run_status": "running",
+        "execution_status": "running",
         "result_status": "started",
         "registry": {
           "id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
@@ -98,7 +98,7 @@
       "project_realm_id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
       "node_id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
       "node_realm_id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-      "run_status": "running",
+      "execution_status": "running",
       "index": 0,
       "artifact_tag": "string",
       "artifact_digest": "string",
@@ -112,7 +112,7 @@
         "nodes": 0,
         "configuration_status": "base",
         "build_status": "starting",
-        "run_status": "running",
+        "execution_status": "running",
         "result_status": "started",
         "registry": {
           "id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
diff --git a/test/components/analysis/AnalysisControlButtons.spec.ts b/test/components/analysis/AnalysisControlButtons.spec.ts
index 8d0b84b1..ce821e97 100644
--- a/test/components/analysis/AnalysisControlButtons.spec.ts
+++ b/test/components/analysis/AnalysisControlButtons.spec.ts
@@ -2,13 +2,14 @@ import { useToast } from "primevue/usetoast";
 import { flushPromises, mount, VueWrapper } from "@vue/test-utils";
 import { afterEach, beforeAll, describe, expect, it, vi } from "vitest";
 import AnalysisControlButtons from "~/components/analysis/AnalysisControlButtons.vue";
-import { AnalysisBuildStatus, AnalysisNodeRunStatus } from "~/types/analysis";
 import {
   fakeAnalysisId,
   fakeBrokenAnalysisId,
   fakeInvalidRoleAnalysisId,
   fakeMissingAnalysisId,
 } from "@/test/mockapi/handlers";
+import { PodStatus } from "~/services/Api";
+import { ProcessStatus } from "~/types/analysis";
 
 interface ButtonStates {
   playActive: boolean;
@@ -46,14 +47,14 @@ describe("AnalysisControlButtons.vue", () => {
     toastMsg: string,
     analysisId: string,
     expectedButtonStates: ButtonStates,
-    initialRunStatus: string = AnalysisNodeRunStatus.Running,
+    initialExecutionStatus: string = PodStatus.Executing,
     expectedFinalStatus: string = "",
     expectedToastCalls: number = 1,
   ) {
     const wrapper = mount(AnalysisControlButtons, {
       props: {
-        analysisBuildStatus: AnalysisBuildStatus.Finished,
-        analysisRunStatus: initialRunStatus,
+        analysisBuildStatus: ProcessStatus.Executed,
+        analysisExecutionStatus: initialExecutionStatus,
         analysisNodeId: "8003eefe-e39b-4bd4-aec4-78046c63b39b",
         analysisId: analysisId,
         projectId: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
@@ -82,7 +83,7 @@ describe("AnalysisControlButtons.vue", () => {
       });
     }
 
-    await wrapper.setProps({ analysisRunStatus: expectedFinalStatus });
+    await wrapper.setProps({ analysisExecutionStatus: expectedFinalStatus });
 
     // @ts-expect-error Linted can't interpret valid refVars
     expect(wrapper.vm.buttonStatuses).toEqual(expectedButtonStates);
@@ -104,7 +105,7 @@ describe("AnalysisControlButtons.vue", () => {
         deleteActive: true,
       },
       "",
-      AnalysisNodeRunStatus.Started,
+      PodStatus.Started,
     );
 
     // Start button should be replaced by rerun
@@ -163,8 +164,8 @@ describe("AnalysisControlButtons.vue", () => {
         stopActive: false,
         deleteActive: true,
       },
-      AnalysisNodeRunStatus.Running,
-      AnalysisNodeRunStatus.Stopped,
+      PodStatus.Executing,
+      PodStatus.Stopped,
     );
   });
 
@@ -181,8 +182,8 @@ describe("AnalysisControlButtons.vue", () => {
         stopActive: false,
         deleteActive: true,
       },
-      AnalysisNodeRunStatus.Running,
-      AnalysisNodeRunStatus.Stopped,
+      PodStatus.Executing,
+      PodStatus.Stopped,
     );
   });
 
@@ -199,8 +200,8 @@ describe("AnalysisControlButtons.vue", () => {
         stopActive: true,
         deleteActive: true,
       },
-      AnalysisNodeRunStatus.Running,
-      AnalysisNodeRunStatus.Running,
+      PodStatus.Executing,
+      PodStatus.Executing,
     );
   });
 
@@ -217,7 +218,7 @@ describe("AnalysisControlButtons.vue", () => {
         stopActive: false,
         deleteActive: false,
       },
-      AnalysisNodeRunStatus.Running,
+      PodStatus.Executing,
       "",
     );
   });
@@ -251,8 +252,8 @@ describe("AnalysisControlButtons.vue", () => {
         stopActive: true,
         deleteActive: true,
       },
-      AnalysisNodeRunStatus.Running,
-      AnalysisNodeRunStatus.Running,
+      PodStatus.Executing,
+      PodStatus.Executing,
     );
   });
 
@@ -276,8 +277,8 @@ describe("AnalysisControlButtons.vue", () => {
   it("Log btn check", async () => {
     const wrapper = mount(AnalysisControlButtons, {
       props: {
-        analysisBuildStatus: AnalysisBuildStatus.Finished,
-        analysisRunStatus: null,
+        analysisBuildStatus: ProcessStatus.Executed,
+        analysisExecutionStatus: null,
         analysisNodeId: "8003eefe-e39b-4bd4-aec4-78046c63b39b",
         analysisId: fakeAnalysisId,
         projectId: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
@@ -294,27 +295,27 @@ describe("AnalysisControlButtons.vue", () => {
     expect(logBtn.attributes("data-p-disabled")).toBe("true");
 
     await wrapper.setProps({
-      analysisRunStatus: AnalysisNodeRunStatus.Started,
+      analysisExecutionStatus: PodStatus.Started,
     });
     expect(logBtn.attributes("data-p-disabled")).toBe("false");
 
     await wrapper.setProps({
-      analysisRunStatus: AnalysisNodeRunStatus.Running,
+      analysisExecutionStatus: PodStatus.Executing,
     });
     expect(logBtn.attributes("data-p-disabled")).toBe("false");
 
     await wrapper.setProps({
-      analysisRunStatus: "",
+      analysisExecutionStatus: "",
     });
     expect(logBtn.attributes("data-p-disabled")).toBe("true");
 
     await wrapper.setProps({
-      analysisRunStatus: AnalysisNodeRunStatus.Failed,
+      analysisExecutionStatus: PodStatus.Failed,
     });
     expect(logBtn.attributes("data-p-disabled")).toBe("false");
 
     await wrapper.setProps({
-      analysisRunStatus: AnalysisNodeRunStatus.Finished,
+      analysisExecutionStatus: PodStatus.Executed,
     });
     expect(logBtn.attributes("data-p-disabled")).toBe("false");
     //
diff --git a/test/components/analysis/AnalysisTable.spec.ts b/test/components/analysis/AnalysisTable.spec.ts
index 54bd0f94..4e5d134c 100644
--- a/test/components/analysis/AnalysisTable.spec.ts
+++ b/test/components/analysis/AnalysisTable.spec.ts
@@ -1,6 +1,6 @@
 import { type AsyncDataRequestStatus, useFetch, useNuxtApp } from "nuxt/app";
+import { computed, defineComponent, ref } from "vue";
 import { useToast } from "primevue/usetoast";
-import { defineComponent, ref } from "vue";
 import { flushPromises, mount } from "@vue/test-utils";
 import {
   afterEach,
@@ -11,20 +11,25 @@ import {
   test,
   vi,
 } from "vitest";
+import { http, HttpResponse } from "msw";
 import AnalysesTable from "~/components/analysis/AnalysesTable.vue";
-import { fakeAnalysisNodes, newFakeAnalysisNode } from "./constants";
+import AnalysisControlButtons from "~/components/analysis/AnalysisControlButtons.vue";
+import {
+  fakeAnalysisNodes,
+  fakeBaseAnalysisNode,
+  newFakeAnalysisNode,
+} from "./constants";
 import { getAnalysisNodes } from "~/composables/useAPIFetch";
 import { useDatastoreRequirement } from "~/composables/useDatastoreRequirement";
 import type { AnalysisNode } from "~/services/Api";
+import { PodStatus } from "~/services/Api";
+import { testServer } from "@/test/mockapi/setup";
+import { fakeAnalysisId } from "@/test/mockapi/handlers";
 
 vi.mock("~/composables/useAPIFetch", () => ({
   getAnalysisNodes: vi.fn(),
 }));
 
-vi.mock("~/composables/useNodeType", () => ({
-  useNodeType: vi.fn(),
-}));
-
 vi.mock("~/composables/useDatastoreRequirement", () => ({
   useDatastoreRequirement: vi.fn(),
 }));
@@ -47,12 +52,9 @@ describe("AnalysesTable.vue", () => {
     vi.mocked(useToast).mockReturnValue(mockToast);
     spy = vi.spyOn(mockToast, "add");
 
-    vi.mocked(useDatastoreRequirement).mockResolvedValue({
-      datastoreState: ref({
-        datastoreRequired: true,
-        nodeType: "default",
-      }),
-      setDatastoreRequired: vi.fn(),
+    vi.mocked(useDatastoreRequirement).mockReturnValue({
+      nodeType: computed(() => "default"),
+      requireDataStore: computed(() => true),
     });
 
     // The basic response
@@ -93,9 +95,9 @@ describe("AnalysesTable.vue", () => {
 
     // Verify the second row's content
     const secondRowCells = rows[1]!.findAll("td");
-    expect(secondRowCells[0]!.text()).toBe("T004"); // Name
+    expect(secondRowCells[0]!.text()).toBe("T006"); // Name
     expect(secondRowCells[1]!.text()).toBe("approved"); // Approval status
-    expect(secondRowCells[7]!.text()).toBe("14.03.2025"); // Last Updated
+    expect(secondRowCells[7]!.text()).toBe("18.03.2025"); // Last Updated
   });
 
   test("Cached results used", async () => {
@@ -201,3 +203,250 @@ describe("AnalysesTable.vue", () => {
     expect(wrapper.text()).toContain("No analyses found"); // H1 of the page
   });
 });
+
+// ProgressBar stub used across progress tests — captures mode, value, and style as data attributes
+const ProgressBarStub = {
+  props: ["mode", "value", "style"],
+  template:
+    '<div class="mock-progress-bar" :data-mode="mode ?? \'determinate\'" :data-value="String(value ?? 0)" />',
+};
+
+// Helper: mock getAnalysisNodes for a single test
+function mockNodes(nodes: AnalysisNode[]) {
+  vi.mocked(getAnalysisNodes).mockResolvedValueOnce({
+    data: ref(nodes),
+    pending: ref(false),
+    error: ref(undefined),
+    status: ref("success"),
+    refresh: vi.fn(),
+    execute: vi.fn(),
+    clear: vi.fn(),
+  });
+}
+
+describe("AnalysesTable.vue — PO calls and Progress", () => {
+  let AnalysisTableTestComponent;
+
+  beforeAll(() => {
+    AnalysisTableTestComponent = defineComponent({
+      components: { AnalysesTable },
+      template: "<Suspense><AnalysesTable/></Suspense>",
+    });
+  });
+
+  beforeEach(() => {
+    vi.mocked(useToast).mockReturnValue({
+      add: vi.fn(),
+    } as unknown as ReturnType<typeof useToast>);
+    vi.mocked(useDatastoreRequirement).mockReturnValue({
+      nodeType: computed(() => "default"),
+      requireDataStore: computed(() => true),
+    });
+    // Default: three nodes so existing table tests keep working
+    vi.mocked(getAnalysisNodes).mockResolvedValue({
+      data: ref(fakeAnalysisNodes),
+      pending: ref(false),
+      error: ref(undefined),
+      status: ref("success"),
+      refresh: vi.fn(),
+      execute: vi.fn(),
+      clear: vi.fn(),
+    });
+  });
+
+  // Column index of the Progress cell in each DataTable row
+  const PROGRESS_COL = 8;
+  // Column index of the Run Status cell
+  const RUN_STATUS_COL = 3;
+
+  test("Progress bar is indeterminate when executing and progress is 0", async () => {
+    // fakeBaseAnalysisNode.analysis_id matches fakeAnalysisId, so PodOrc
+    // reports it as "executing", Hub execution_progress is 0 -> indeterminate.
+    mockNodes([
+      {
+        ...fakeBaseAnalysisNode,
+        execution_status: "started",
+        execution_progress: 0,
+      },
+    ]);
+
+    const wrapper = mount(AnalysisTableTestComponent, {
+      global: { stubs: { ProgressBar: ProgressBarStub } },
+    });
+    await flushPromises();
+
+    const progressBar = wrapper
+      .findAll("tbody tr")[0]!
+      .findAll("td")
+      [PROGRESS_COL]!.find(".mock-progress-bar");
+
+    expect(progressBar.attributes("data-mode")).toBe("indeterminate");
+  });
+
+  test("Progress bar is determinate when executing and progress is non-zero", async () => {
+    // Same analysis_id as fakeAnalysisId — PodOrc sets execution_status to
+    // "executing". Hub has execution_progress: 50, which is preserved.
+    mockNodes([
+      {
+        ...fakeBaseAnalysisNode,
+        execution_status: "started",
+        execution_progress: 50,
+      },
+    ]);
+
+    const wrapper = mount(AnalysisTableTestComponent, {
+      global: { stubs: { ProgressBar: ProgressBarStub } },
+    });
+    await flushPromises();
+
+    const progressBar = wrapper
+      .findAll("tbody tr")[0]!
+      .findAll("td")
+      [PROGRESS_COL]!.find(".mock-progress-bar");
+
+    expect(progressBar.attributes("data-mode")).toBe("determinate");
+    expect(progressBar.attributes("data-value")).toBe("50");
+  });
+
+  test("setProgress sets execution_progress to 100 for executed status", async () => {
+    // Unique ID not known to PodOrc. "executed" is terminal so parseAnalysis
+    // keeps it. setProgress then forces execution_progress to 100.
+    const executedNode: AnalysisNode = {
+      ...fakeBaseAnalysisNode,
+      analysis_id: "aaaaaaaa-0000-0000-0000-000000000001",
+      execution_status: "executed",
+      execution_progress: 0,
+    };
+    mockNodes([executedNode]);
+
+    const wrapper = mount(AnalysisTableTestComponent, {
+      global: { stubs: { ProgressBar: ProgressBarStub } },
+    });
+    await flushPromises();
+
+    const progressBar = wrapper
+      .findAll("tbody tr")[0]!
+      .findAll("td")
+      [PROGRESS_COL]!.find(".mock-progress-bar");
+
+    expect(progressBar.attributes("data-value")).toBe("100");
+  });
+
+  test("setProgress resets execution_progress to 0 for failed status", async () => {
+    // Hub reports 60% progress, but setProgress should zero it out for failed.
+    const failedNode: AnalysisNode = {
+      ...fakeBaseAnalysisNode,
+      analysis_id: "aaaaaaaa-0000-0000-0000-000000000002",
+      execution_status: "failed",
+      execution_progress: 60,
+    };
+    mockNodes([failedNode]);
+
+    const wrapper = mount(AnalysisTableTestComponent, {
+      global: { stubs: { ProgressBar: ProgressBarStub } },
+    });
+    await flushPromises();
+
+    const progressBar = wrapper
+      .findAll("tbody tr")[0]!
+      .findAll("td")
+      [PROGRESS_COL]!.find(".mock-progress-bar");
+
+    expect(progressBar.attributes("data-value")).toBe("0");
+  });
+
+  test("PodOrc execution_status overrides hub execution_status in Run Status column", async () => {
+    // Hub says "started"; PodOrc handler returns { status: "executing" } for the
+    // same analysis_id → parseAnalysis should use the PodOrc value.
+    mockNodes([
+      {
+        ...fakeBaseAnalysisNode,
+        execution_status: "started",
+        execution_progress: 0,
+      },
+    ]);
+
+    const wrapper = mount(AnalysisTableTestComponent);
+    await flushPromises();
+
+    const runStatusCell = wrapper.findAll("tbody tr")[0]!.findAll("td")[
+      RUN_STATUS_COL
+    ]!;
+    expect(runStatusCell.text()).toBe(PodStatus.Running);
+  });
+
+  test("Non-terminal execution_status is cleared when analysis is absent from PodOrc", async () => {
+    // Override PodOrc to return an empty response so no analysis ID matches.
+    // "started" is non-terminal → parseAnalysis nulls it → no Tag rendered.
+    testServer.use(http.get("/po/status", () => HttpResponse.json({})));
+
+    mockNodes([
+      {
+        ...fakeBaseAnalysisNode,
+        execution_status: "started",
+        execution_progress: 0,
+      },
+    ]);
+
+    const wrapper = mount(AnalysisTableTestComponent);
+    await flushPromises();
+
+    const runStatusCell = wrapper.findAll("tbody tr")[0]!.findAll("td")[
+      RUN_STATUS_COL
+    ]!;
+    expect(runStatusCell.text()).toBe("");
+  });
+
+  test("Terminal execution_status is preserved when analysis is absent from PodOrc", async () => {
+    // Unique ID not in PodOrc response. "executed" is terminal → parseAnalysis
+    // preserves it → Tag is rendered.
+    testServer.use(http.get("/po/status", () => HttpResponse.json({})));
+
+    const executedNode: AnalysisNode = {
+      ...fakeBaseAnalysisNode,
+      analysis_id: "aaaaaaaa-0000-0000-0000-000000000003",
+      execution_status: "executed",
+      execution_progress: 0,
+    };
+    mockNodes([executedNode]);
+
+    const wrapper = mount(AnalysisTableTestComponent);
+    await flushPromises();
+
+    const runStatusCell = wrapper.findAll("tbody tr")[0]!.findAll("td")[
+      RUN_STATUS_COL
+    ]!;
+    expect(runStatusCell.text()).toBe(PodStatus.Executed);
+  });
+
+  test("updateAnalysisRun updates the progress bar when the control buttons emit updateAnalysisRow", async () => {
+    // Start with fakeBaseAnalysisNode; PodOrc makes it "executing" with 0 progress → indeterminate
+    mockNodes([
+      {
+        ...fakeBaseAnalysisNode,
+        execution_status: "started",
+        execution_progress: 0,
+      },
+    ]);
+
+    const wrapper = mount(AnalysisTableTestComponent, {
+      global: { stubs: { ProgressBar: ProgressBarStub } },
+    });
+    await flushPromises();
+
+    const progressBarBefore = wrapper.find(".mock-progress-bar");
+    expect(progressBarBefore.attributes("data-mode")).toBe("indeterminate");
+
+    // Simulate AnalysisControlButtons emitting updateAnalysisRow with "executed".
+    // setProgress will force execution_progress to 100.
+    const controlButtons = wrapper.findComponent(AnalysisControlButtons);
+    controlButtons.vm.$emit("updateAnalysisRow", fakeAnalysisId, {
+      status: PodStatus.Executed,
+    });
+    await flushPromises();
+
+    const progressBarAfter = wrapper.find(".mock-progress-bar");
+    expect(progressBarAfter.attributes("data-mode")).toBe("determinate");
+    expect(progressBarAfter.attributes("data-value")).toBe("100");
+  });
+});
diff --git a/test/components/analysis/AnalysisUpdateButton.spec.ts b/test/components/analysis/AnalysisUpdateButton.spec.ts
index f50b52a1..aed85254 100644
--- a/test/components/analysis/AnalysisUpdateButton.spec.ts
+++ b/test/components/analysis/AnalysisUpdateButton.spec.ts
@@ -7,6 +7,7 @@ import {
   fakeBrokenAnalysisId,
   fakeMissingAnalysisId,
 } from "../../mockapi/handlers";
+import { PodStatus } from "~/services/Api";
 
 describe("AnalysisUpdateButton.vue", () => {
   let spy;
@@ -62,7 +63,7 @@ describe("AnalysisUpdateButton.vue", () => {
     );
     expect(wrapper.emitted("updateAnalysisRun")).toHaveLength(1);
     expect(wrapper.emitted("updateAnalysisRun")![0]).toEqual([
-      "running",
+      PodStatus.Running,
       undefined,
     ]);
   });
diff --git a/test/components/analysis/ContainerCounter.spec.ts b/test/components/analysis/ContainerCounter.spec.ts
index 1093bae8..098b04b7 100644
--- a/test/components/analysis/ContainerCounter.spec.ts
+++ b/test/components/analysis/ContainerCounter.spec.ts
@@ -3,7 +3,7 @@ import { describe, expect, it } from "vitest";
 
 import ContainerCounter from "~/components/analysis/ContainerCounter.vue";
 import { fakeAnalysisNodes } from "@/test/components/analysis/constants";
-import type { AnalysisNode } from "~/services/Api";
+import { type AnalysisNode } from "~/services/Api";
 
 interface filterData {
   value: string[] | undefined;
@@ -12,7 +12,7 @@ interface filterData {
 
 interface filterObject {
   global?: filterData;
-  run_status: filterData;
+  execution_status: filterData;
   approval_status?: filterData;
 }
 
@@ -20,14 +20,14 @@ describe("ContainerCounter.vue", () => {
   function countStatusOccurences(inputAnalyses: AnalysisNode[]) {
     const statusCounts = {
       started: 0,
-      running: 0,
+      executing: 0,
       stopped: 0,
       failed: 0,
-      finished: 0,
+      executed: 0,
     };
     inputAnalyses.forEach((analysisNode) => {
-      if (analysisNode.run_status) {
-        statusCounts[analysisNode.run_status]++;
+      if (analysisNode.execution_status) {
+        statusCounts[analysisNode.execution_status]++;
       }
     });
     return statusCounts;
@@ -48,11 +48,20 @@ describe("ContainerCounter.vue", () => {
     const statusCounts = countStatusOccurences(mockAnalyses);
 
     // Success check
+    let emitCounts = 0;
     const fillCounterDiv = wrapper.find(".counter-badge-all");
-    ["Started", "Running", "Stopped", "Failed", "Finished"].forEach(
-      (runStatus, index) => {
-        expect(fillCounterDiv.text()).toContain(runStatus);
-        const lowerStatus = runStatus.toLowerCase();
+    ["Started", "Executing", "Stopped", "Failed", "Executed"].forEach(
+      (executionStatus, index) => {
+        let displayedStatus = "";
+        if (executionStatus === "Executing") {
+          displayedStatus = "Running";
+        } else if (executionStatus === "Executed") {
+          displayedStatus = "Finished";
+        } else {
+          displayedStatus = executionStatus;
+        }
+        expect(fillCounterDiv.text()).toContain(displayedStatus);
+        const lowerStatus = executionStatus.toLowerCase();
         const statusCount = statusCounts[lowerStatus];
 
         // Check individual badge properties
@@ -62,19 +71,28 @@ describe("ContainerCounter.vue", () => {
 
         // If not in filter list and filter list is not empty, then it should be opaque
         if (
-          mockFilters.run_status.value &&
-          !mockFilters.run_status.value.includes(lowerStatus)
+          mockFilters.execution_status.value &&
+          !mockFilters.execution_status.value.includes(lowerStatus)
         ) {
           expect(counterDiv.attributes("class")).toContain("opaque-badge");
         }
 
+        if (executionStatus === "Executing" || executionStatus === "Executed") {
+          // Emit extra for running and finished
+          emitCounts += 2;
+        } else {
+          emitCounts++;
+        }
         // Clicking on badge emits correctly
         badgeDiv.trigger("click");
-        expect(wrapper.emitted()).toHaveProperty("applyRunStatusFilter");
-        expect(wrapper.emitted().applyRunStatusFilter).toHaveLength(index + 1);
-        expect(wrapper.emitted().applyRunStatusFilter![index]).toEqual([
-          lowerStatus,
-        ]);
+        expect(wrapper.emitted()).toHaveProperty("applyExecutionStatusFilter");
+        expect(wrapper.emitted().applyExecutionStatusFilter).toHaveLength(
+          emitCounts,
+        );
+
+        const emittedStatuses = wrapper.emitted().applyExecutionStatusFilter;
+        expect(emittedStatuses).toBeDefined();
+        expect(emittedStatuses!.flat()).toContain(lowerStatus);
       },
     );
 
@@ -83,7 +101,7 @@ describe("ContainerCounter.vue", () => {
 
   it("No filters applied", () => {
     counterCheck(fakeAnalysisNodes, {
-      run_status: {
+      execution_status: {
         value: undefined,
         matchMode: "in",
       },
@@ -92,8 +110,8 @@ describe("ContainerCounter.vue", () => {
 
   it("Filters applied", () => {
     counterCheck(fakeAnalysisNodes, {
-      run_status: {
-        value: ["started", "failed"],
+      execution_status: {
+        value: ["started", "executed"],
         matchMode: "in",
       },
     });
diff --git a/test/components/analysis/constants.ts b/test/components/analysis/constants.ts
index 1e121d3e..aaf3ceb8 100644
--- a/test/components/analysis/constants.ts
+++ b/test/components/analysis/constants.ts
@@ -1,379 +1,148 @@
-import type { AnalysisNode } from "~/services/Api";
+import {
+  type Analysis,
+  type AnalysisNode,
+  type Node,
+  type Project,
+} from "~/services/Api";
 
 export const fakeLogs =
   'Starting FlameCoreSDK\n\tExtracting node config\n\tConnecting to nginx...success\n\tConnecting to MessageBroker...success\n\tConnecting to ResultService...success\n\tConnecting to DataApi...success\n\tStarting FlameApi thread...success\nFlameCoreSDK ready\nINFO:     Started server process [1]\nINFO:     Waiting for application startup.\nINFO:     Application startup complete.\nINFO:     Uvicorn running on http://0.0.0.0:8000 (Press CTRL+C to quit)\nfinished: False, False\nINFO:     10.1.30.117:44596 - "GET /healthz HTTP/1.0" 200 OK\n';
 
+const fakeProjectId: string = "5833b9b8-ad5c-4db4-a3d2-297517c74511";
+
+const fakeBaseNode: Node = {
+  id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
+  created_at: "2025-01-28T12:46:53.676000Z",
+  updated_at: "2025-03-10T14:29:28Z",
+  external_name: "node-dev-5",
+  name: "node-dev-5",
+  hidden: false,
+  type: "default",
+  online: false,
+  registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
+  registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
+  robot_id: null,
+  client_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
+  realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
+  public_key: null,
+};
+
+const fakeBaseProject: Project = {
+  id: fakeProjectId,
+  created_at: "2025-02-05T12:08:33.131000Z",
+  updated_at: "2025-03-20T10:05:25Z",
+  name: "use-case-1",
+  analyses: 4,
+  realm_id: fakeProjectId,
+  user_id: null,
+  master_image_id: null,
+  master_image: null,
+  description: "",
+  nodes: 2,
+  robot_id: null,
+};
+
+const fakeBaseAnalysis: Analysis = {
+  id: "832fd968-caf3-4d04-b69e-02feb66f2f86",
+  created_at: "2025-02-05T12:08:33.131000Z",
+  updated_at: "2025-03-20T10:05:25Z",
+  name: "T006",
+  nodes: 4,
+  nodes_approved: 4,
+  configuration_locked: true,
+  configuration_entrypoint_valid: true,
+  configuration_image_valid: true,
+  configuration_node_aggregator_valid: false,
+  configuration_node_default_valid: true,
+  configuration_nodes_valid: true,
+  build_nodes_valid: true,
+  build_progress: null,
+  build_hash: null,
+  build_os: null,
+  build_size: null,
+  build_status: "starting",
+  registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
+  realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
+  user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
+  project_id: fakeProjectId,
+  project: undefined,
+  master_image_id: null,
+  registry: null,
+  master_image: null,
+  description: null,
+  distribution_status: null,
+  distribution_progress: null,
+  execution_status: null,
+  execution_progress: 0,
+};
+
+export const fakeBaseAnalysisNode: AnalysisNode = {
+  id: "4c4b9b2e-85de-4319-8d68-bcc8247464eb",
+  created_at: "2025-01-28T14:58:12Z",
+  updated_at: "2025-03-18T09:11:14Z",
+  approval_status: "approved",
+  execution_status: "started",
+  execution_progress: 0,
+  comment: null,
+  artifact_tag: null,
+  artifact_digest: null,
+  analysis_id: "15518efa-5146-4290-a7cb-95d27f41d991",
+  analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
+  node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
+  node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
+  analysis: fakeBaseAnalysis,
+  node: fakeBaseNode,
+};
+
 export const fakeProjects = [
   {
+    ...fakeBaseProject,
     id: "5833b9b8-ad5c-4db4-a3d2-297517c74511",
-    created_at: undefined,
-    updated_at: undefined,
     name: "use-case-1",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
   },
   {
+    ...fakeBaseProject,
     id: "24aabaf1-65a7-4ba9-b506-4013bc511c95",
-    created_at: undefined,
-    updated_at: undefined,
     name: "test_bucket_unpack",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
   },
   {
+    ...fakeBaseProject,
     id: "8cb0684f-8a47-4fd3-97a3-c4f7e7349687",
-    created_at: undefined,
-    updated_at: undefined,
     name: "Test_run",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
   },
   {
+    ...fakeBaseProject,
     id: "cb4c0148-1dbc-49bd-9f02-396264d9b112",
-    created_at: undefined,
-    updated_at: undefined,
     name: "node-it-fcbf0816-788e-48f0-ba22-68e86069f8ce",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
   },
   {
+    ...fakeBaseProject,
     id: "ea819933-85b4-4c90-838a-9afa7dd163ee",
-    created_at: undefined,
-    updated_at: undefined,
     name: "UC1-basic-2025Q1",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
-  },
-  {
-    id: "48bf1500-2355-4899-a679-844037ea9257",
-    created_at: undefined,
-    updated_at: undefined,
-    name: "david_test",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
-  },
-  {
-    id: "9581b90c-95ff-4e49-aa9f-ac348062e703",
-    created_at: undefined,
-    updated_at: undefined,
-    name: "Test-uc1",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
-  },
-  {
-    id: "69dfa65a-1537-4c9e-9134-176750483d5d",
-    created_at: undefined,
-    updated_at: undefined,
-    name: "node-it-748daf88-f990-4974-b169-bb04fe5f90ad",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
-  },
-  {
-    id: "08c789f8-a175-4578-9d6e-96c5ffe991c7",
-    created_at: undefined,
-    updated_at: undefined,
-    name: "pp-auc-flame",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
-  },
-  {
-    id: "f7849bc6-b6de-4d8f-af04-25a1b6771bb6",
-    created_at: undefined,
-    updated_at: undefined,
-    name: "Image-analysis-test",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
   },
   {
+    ...fakeBaseProject,
     id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-    created_at: undefined,
-    updated_at: undefined,
     name: "denbi-test",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
-  },
-  {
-    id: "bab13106-9677-4627-ac12-834afd35e9bc",
-    created_at: undefined,
-    updated_at: undefined,
-    name: "hub-node-comm-test-project-103a848d-4db6-4308-abdb-cfea1c56dd15",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
-  },
-  {
-    id: "3c779ba7-b2d4-44b4-b3ec-979c48a827c6",
-    created_at: undefined,
-    updated_at: undefined,
-    name: "lt-test-project-90c0b377-e887-4281-8a0d-ca226291057c",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
-  },
-  {
-    id: "f5bcfc30-12a3-4827-9ce8-dfcfec2bb5cb",
-    created_at: undefined,
-    updated_at: undefined,
-    name: "test-1",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
-  },
-  {
-    id: "f6f7032f-dc3f-4fd8-936a-4f577d684ad1",
-    created_at: undefined,
-    updated_at: undefined,
-    name: "hub-node-comm-test-project-90c0b377-e887-4281-8a0d-ca226291057c",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
-  },
-  {
-    id: "f3b355b6-99ec-48c0-a331-8399e7b5687b",
-    created_at: undefined,
-    updated_at: undefined,
-    name: "hub-node-comm-test-project-34c6fbcc-7315-4d2c-bd2e-919351021f9f",
-    analyses: undefined,
-    realm_id: undefined,
-    user_id: undefined,
-    master_image_id: undefined,
-    master_image: undefined,
   },
 ];
 
 export const fakeAnalysisNodes: AnalysisNode[] = [
+  fakeBaseAnalysisNode,
   {
-    id: "4c4b9b2e-85de-4319-8d68-bcc8247464eb",
-    created_at: "2025-01-28T14:58:12.415000Z",
-    updated_at: "2025-03-18T09:11:14Z",
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "15518efa-5146-4290-a7cb-95d27f41d991",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "15518efa-5146-4290-a7cb-95d27f41d991",
-      created_at: "2025-01-28T14:58:06.399000Z",
-      updated_at: "2025-03-20T10:05:24Z",
-      name: "001",
-      nodes: 2,
-      configuration_locked: true,
-      build_status: "failed",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-      description: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      public_key: undefined,
-    },
+    ...fakeBaseAnalysisNode,
+    execution_status: "stopped",
+    analysis_id: "bd08ec3c-fc53-4c0f-990a-7ce2cc3d4744",
   },
   {
-    id: "984c984d-f4c1-4a5f-9df0-58eaa5b22f2c",
-    created_at: "2025-02-05T10:15:29.800000Z",
-    updated_at: "2025-03-14T09:43:55Z",
-    approval_status: "approved",
-    run_status: "stopped",
-    comment: undefined,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "8003eefe-e39b-4bd4-aec4-78046c63b39b",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "8003eefe-e39b-4bd4-aec4-78046c63b39b",
-      created_at: "2025-02-05T10:15:22.833000Z",
-      updated_at: "2025-03-20T10:05:26Z",
-      name: "T004",
-      nodes: 2,
-      configuration_locked: false,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-      description: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      public_key: undefined,
-    },
-  },
-  {
-    id: "843e0315-4c09-4de0-9a97-6f72fdf24743",
-    created_at: "2025-02-05T12:08:46.761000Z",
-    updated_at: "2025-02-26T07:48:46Z",
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "832fd968-caf3-4d04-b69e-02feb66f2f86",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "832fd968-caf3-4d04-b69e-02feb66f2f86",
-      created_at: "2025-02-05T12:08:33.131000Z",
-      updated_at: "2025-03-20T10:05:25Z",
-      name: "T006",
-      nodes: 4,
-      configuration_locked: true,
-      build_status: "starting",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-      description: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      public_key: undefined,
-    },
+    ...fakeBaseAnalysisNode,
+    execution_status: "executing",
+    analysis_id: "330288e9-92c6-4168-a3ac-a825a6e6a7f0",
   },
 ];
 
 export const newFakeAnalysisNode: AnalysisNode = {
-  id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-  created_at: "2025-04-05T12:08:46.761000Z",
-  updated_at: "2025-04-26T07:48:46Z",
-  approval_status: "approved",
-  run_status: "failed",
-  comment: undefined,
-  artifact_tag: undefined,
-  artifact_digest: undefined,
-  analysis_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-  analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-  node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-  node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-  analysis: {
-    id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-    created_at: "2025-02-05T12:08:33.131000Z",
-    updated_at: "2025-03-20T10:05:25Z",
-    name: "T006",
-    nodes: 4,
-    configuration_locked: true,
-    build_status: "starting",
-    run_status: undefined,
-    registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-    realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-    project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-    project: undefined,
-    master_image_id: undefined,
-    registry: undefined,
-    master_image: undefined,
-    description: undefined,
-  },
-  node: {
-    id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    created_at: "2025-01-28T12:46:53.676000Z",
-    updated_at: "2025-03-10T14:29:28Z",
-    external_name: "node-dev-5",
-    name: "node-dev-5",
-    hidden: false,
-    type: "default",
-    online: false,
-    registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-    registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-    robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-    realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    public_key: undefined,
-  },
+  ...fakeBaseAnalysisNode,
+  execution_status: "executed",
+  analysis_id: "5d7941fa-1744-4872-a335-2b3d6d1049c7",
 };
diff --git a/test/components/data-stores/constants.ts b/test/components/data-stores/constants.ts
index f66291a8..e6af32b9 100644
--- a/test/components/data-stores/constants.ts
+++ b/test/components/data-stores/constants.ts
@@ -214,8 +214,8 @@ export const fakeAnalysisResp: Analysis[] = [
     updated_at: "2025-03-20T10:05:26Z",
     name: "T004",
     nodes: 2,
-    build_status: "finished",
-    run_status: undefined,
+    build_status: "executed",
+    execution_status: undefined,
     registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
     realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
     user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
diff --git a/test/components/header/AvatarButton.spec.ts b/test/components/header/AvatarButton.spec.ts
index 489e3d73..d13bd553 100644
--- a/test/components/header/AvatarButton.spec.ts
+++ b/test/components/header/AvatarButton.spec.ts
@@ -1,15 +1,10 @@
 import { defineComponent, ref } from "vue";
 import { flushPromises, mount } from "@vue/test-utils"; // add flushPromises
 import { useRuntimeConfig } from "nuxt/app";
-import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeAll, describe, expect, it, vi } from "vitest";
 import AvatarButton from "~/components/header/AvatarButton.vue";
-import { useDatastoreRequirement } from "~/composables/useDatastoreRequirement";
 import { useAuth, useAuthState } from "@/test/mockapi/nuxt-auth-mock";
 
-vi.mock("~/composables/useDatastoreRequirement", () => ({
-  useDatastoreRequirement: vi.fn(),
-}));
-
 describe("AvatarButton.vue", () => {
   const testUser = "Johnny Storm";
   let AvatarButtonTestComponent: typeof AvatarButton;
@@ -23,17 +18,6 @@ describe("AvatarButton.vue", () => {
     });
   });
 
-  beforeEach(() => {
-    vi.restoreAllMocks();
-    vi.mocked(useDatastoreRequirement).mockResolvedValue({
-      datastoreState: ref({
-        datastoreRequired: true,
-        nodeType: "analysis",
-      }),
-      setDatastoreRequired: vi.fn(),
-    });
-  });
-
   async function avatarMenuChecks(authenticated: boolean) {
     const status = authenticated ? "authenticated" : "unauthenticated";
     const expectedIcon = authenticated ? "pi-user" : "pi-question";
@@ -55,7 +39,7 @@ describe("AvatarButton.vue", () => {
         stubs: {
           teleport: true,
           CleanupDialog: true,
-          ToggleSwitch: true,
+          PreferencesDialog: true,
         },
       },
     });
diff --git a/test/components/preferences/AutostartField.spec.ts b/test/components/preferences/AutostartField.spec.ts
new file mode 100644
index 00000000..225dfc0f
--- /dev/null
+++ b/test/components/preferences/AutostartField.spec.ts
@@ -0,0 +1,119 @@
+import { nextTick } from "vue";
+import { mount } from "@vue/test-utils";
+import { describe, expect, it } from "vitest";
+import AutostartField from "~/components/preferences/AutostartField.vue";
+import type { AutostartSettings } from "~/services/Api";
+
+const ToggleSwitchStub = {
+  props: ["modelValue"],
+  emits: ["update:modelValue"],
+  template:
+    '<button class="mock-toggle" :data-checked="String(modelValue)" @click="$emit(\'update:modelValue\', !modelValue)" />',
+};
+
+const InputNumberStub = {
+  props: ["modelValue", "disabled", "min", "invalid", "fluid", "label"],
+  emits: ["update:modelValue"],
+  template:
+    '<input class="mock-input-number" :disabled="disabled" :value="modelValue" @input="$emit(\'update:modelValue\', Number($event.target.value))" />',
+};
+
+function mountField(modelValue: AutostartSettings) {
+  return mount(AutostartField, {
+    props: { modelValue },
+    global: {
+      stubs: {
+        ToggleSwitch: ToggleSwitchStub,
+        InputNumber: InputNumberStub,
+        Divider: true,
+      },
+    },
+  });
+}
+
+describe("AutostartField.vue", () => {
+  it("renders the autostart enabled section", () => {
+    const wrapper = mountField({ enabled: false, interval: 60 });
+    expect(
+      wrapper.find(".autostart-enabled-field .settings-description-title").text(),
+    ).toBe("Autostart Analyses");
+    expect(
+      wrapper
+        .find(".autostart-enabled-field .setting-description-text")
+        .text(),
+    ).toContain("Immediately start an analysis");
+  });
+
+  it("renders the autostart interval section", () => {
+    const wrapper = mountField({ enabled: false, interval: 60 });
+    expect(
+      wrapper.find(".autostart-interval-field .settings-description-title").text(),
+    ).toBe("Autostart Interval");
+    expect(
+      wrapper
+        .find(".autostart-interval-field .setting-description-text")
+        .text(),
+    ).toContain("How often");
+  });
+
+  it("toggle is off when enabled is false", () => {
+    const wrapper = mountField({ enabled: false, interval: 60 });
+    expect(wrapper.find(".mock-toggle").attributes("data-checked")).toBe(
+      "false",
+    );
+  });
+
+  it("toggle is on when enabled is true", () => {
+    const wrapper = mountField({ enabled: true, interval: 60 });
+    expect(wrapper.find(".mock-toggle").attributes("data-checked")).toBe("true");
+  });
+
+  it("InputNumber is disabled when autostart is off", () => {
+    const wrapper = mountField({ enabled: false, interval: 60 });
+    expect(
+      wrapper.find(".mock-input-number").element.hasAttribute("disabled"),
+    ).toBe(true);
+  });
+
+  it("InputNumber is enabled when autostart is on", () => {
+    const wrapper = mountField({ enabled: true, interval: 60 });
+    expect(
+      wrapper.find(".mock-input-number").element.hasAttribute("disabled"),
+    ).toBe(false);
+  });
+
+  it("InputNumber shows the initial interval value", () => {
+    const wrapper = mountField({ enabled: true, interval: 120 });
+    expect(wrapper.find(".mock-input-number").element.getAttribute("value")).toBe(
+      "120",
+    );
+  });
+
+  it("InputNumber becomes enabled after toggling autostart on", async () => {
+    const wrapper = mountField({ enabled: false, interval: 60 });
+    expect(
+      wrapper.find(".mock-input-number").element.hasAttribute("disabled"),
+    ).toBe(true);
+
+    await wrapper.find(".mock-toggle").trigger("click");
+    await nextTick();
+
+    expect(
+      wrapper.find(".mock-input-number").element.hasAttribute("disabled"),
+    ).toBe(false);
+  });
+
+  it("InputNumber becomes disabled after toggling autostart off", async () => {
+    const wrapper = mountField({ enabled: true, interval: 60 });
+    expect(
+      wrapper.find(".mock-input-number").element.hasAttribute("disabled"),
+    ).toBe(false);
+
+    await wrapper.find(".mock-toggle").trigger("click");
+    await nextTick();
+
+    expect(
+      wrapper.find(".mock-input-number").element.hasAttribute("disabled"),
+    ).toBe(true);
+  });
+});
diff --git a/test/components/preferences/PreferencesDialog.spec.ts b/test/components/preferences/PreferencesDialog.spec.ts
new file mode 100644
index 00000000..df04dd47
--- /dev/null
+++ b/test/components/preferences/PreferencesDialog.spec.ts
@@ -0,0 +1,179 @@
+import { flushPromises, mount } from "@vue/test-utils";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { useToast } from "primevue/usetoast";
+import PreferencesDialog from "~/components/preferences/PreferencesDialog.vue";
+import { useNodeSettingsStore } from "~/stores/nodeSettingsStore";
+import type { UserSettings } from "~/services/Api";
+
+vi.mock("~/stores/nodeSettingsStore", () => ({
+  useNodeSettingsStore: vi.fn(),
+}));
+
+// Renders slot content when visible — avoids PrimeVue Dialog's teleport complexity
+const DialogStub = {
+  props: ["visible", "header", "modal", "style"],
+  template: '<div v-if="visible" class="dialog-stub"><slot /></div>',
+};
+
+const RequireDataStoreFieldStub = {
+  name: "RequireDataStoreField",
+  props: ["modelValue"],
+  emits: ["update:modelValue"],
+  template:
+    '<div class="require-datastore-stub" :data-value="String(modelValue)" />',
+};
+
+const AutostartFieldStub = {
+  name: "AutostartField",
+  props: ["modelValue"],
+  emits: ["update:modelValue"],
+  template: '<div class="autostart-stub" />',
+};
+
+const globalStubs = {
+  teleport: true,
+  Dialog: DialogStub,
+  RequireDataStoreField: RequireDataStoreFieldStub,
+  AutostartField: AutostartFieldStub,
+  Divider: true,
+};
+
+const defaultSettingsResponse: UserSettings = {
+  require_data_store: true,
+  autostart: { enabled: false, interval: 60 },
+};
+
+describe("PreferencesDialog.vue", () => {
+  let mockUpdateSettings: ReturnType<typeof vi.fn>;
+  let mockToast: { add: ReturnType<typeof vi.fn> };
+
+  beforeEach(() => {
+    mockToast = { add: vi.fn() };
+    vi.mocked(useToast).mockReturnValue(
+      mockToast as unknown as ReturnType<typeof useToast>,
+    );
+
+    mockUpdateSettings = vi.fn().mockResolvedValue(defaultSettingsResponse);
+    vi.mocked(useNodeSettingsStore).mockReturnValue({
+      requireDataStore: true,
+      autostartEnabled: false,
+      autostartInterval: 60,
+      updateSettings: mockUpdateSettings,
+    } as unknown as ReturnType<typeof useNodeSettingsStore>);
+  });
+
+  it("renders dialog content when visible", () => {
+    const wrapper = mount(PreferencesDialog, {
+      props: { preferencesVisible: true },
+      global: { stubs: globalStubs },
+    });
+    expect(wrapper.find(".dialog-stub").exists()).toBe(true);
+  });
+
+  it("hides dialog content when not visible", () => {
+    const wrapper = mount(PreferencesDialog, {
+      props: { preferencesVisible: false },
+      global: { stubs: globalStubs },
+    });
+    expect(wrapper.find(".dialog-stub").exists()).toBe(false);
+  });
+
+  it("initializes RequireDataStoreField from store value", () => {
+    const wrapper = mount(PreferencesDialog, {
+      props: { preferencesVisible: true },
+      global: { stubs: globalStubs },
+    });
+    expect(
+      wrapper.find(".require-datastore-stub").attributes("data-value"),
+    ).toBe("true");
+  });
+
+  it("initializes RequireDataStoreField as false when store has false", () => {
+    vi.mocked(useNodeSettingsStore).mockReturnValue({
+      requireDataStore: false,
+      autostartEnabled: true,
+      autostartInterval: 30,
+      updateSettings: mockUpdateSettings,
+    } as unknown as ReturnType<typeof useNodeSettingsStore>);
+
+    const wrapper = mount(PreferencesDialog, {
+      props: { preferencesVisible: true },
+      global: { stubs: globalStubs },
+    });
+    expect(
+      wrapper.find(".require-datastore-stub").attributes("data-value"),
+    ).toBe("false");
+  });
+
+  it("calls updateSettings with correct values on submit", async () => {
+    const wrapper = mount(PreferencesDialog, {
+      props: { preferencesVisible: true },
+      global: { stubs: globalStubs },
+    });
+
+    await wrapper.find(".preferences-update-btn button").trigger("click");
+    await flushPromises();
+
+    expect(mockUpdateSettings).toHaveBeenCalledWith({
+      require_data_store: true,
+      autostart: { enabled: false, interval: 60 },
+    });
+  });
+
+  it("shows success toast after a successful update", async () => {
+    const wrapper = mount(PreferencesDialog, {
+      props: { preferencesVisible: true },
+      global: { stubs: globalStubs },
+    });
+
+    await wrapper.find(".preferences-update-btn button").trigger("click");
+    await flushPromises();
+
+    expect(mockToast.add).toHaveBeenCalledWith(
+      expect.objectContaining({
+        severity: "success",
+        summary: "Update Success",
+      }),
+    );
+  });
+
+  it("shows error toast when update fails", async () => {
+    mockUpdateSettings.mockResolvedValue(null);
+
+    const wrapper = mount(PreferencesDialog, {
+      props: { preferencesVisible: true },
+      global: { stubs: globalStubs },
+    });
+
+    await wrapper.find(".preferences-update-btn button").trigger("click");
+    await flushPromises();
+
+    expect(mockToast.add).toHaveBeenCalledWith(
+      expect.objectContaining({
+        severity: "error",
+        summary: "Update Failed",
+      }),
+    );
+  });
+
+  it("resets draft values from the store when the dialog reopens", async () => {
+    vi.mocked(useNodeSettingsStore).mockReturnValue({
+      requireDataStore: false,
+      autostartEnabled: true,
+      autostartInterval: 30,
+      updateSettings: mockUpdateSettings,
+    } as unknown as ReturnType<typeof useNodeSettingsStore>);
+
+    const wrapper = mount(PreferencesDialog, {
+      props: { preferencesVisible: false },
+      global: { stubs: globalStubs },
+    });
+
+    await wrapper.setProps({ preferencesVisible: true });
+    await flushPromises();
+
+    expect(
+      wrapper.find(".require-datastore-stub").attributes("data-value"),
+    ).toBe("false");
+  });
+});
diff --git a/test/components/preferences/RequireDataStoreField.spec.ts b/test/components/preferences/RequireDataStoreField.spec.ts
new file mode 100644
index 00000000..1ea1c40a
--- /dev/null
+++ b/test/components/preferences/RequireDataStoreField.spec.ts
@@ -0,0 +1,53 @@
+import { mount } from "@vue/test-utils";
+import { describe, expect, it } from "vitest";
+import RequireDataStoreField from "~/components/preferences/RequireDataStoreField.vue";
+
+const ToggleSwitchStub = {
+  props: ["modelValue"],
+  emits: ["update:modelValue"],
+  template:
+    '<button class="mock-toggle" :data-checked="String(modelValue)" @click="$emit(\'update:modelValue\', !modelValue)" />',
+};
+
+function mountField(modelValue: boolean) {
+  return mount(RequireDataStoreField, {
+    props: { modelValue },
+    global: { stubs: { ToggleSwitch: ToggleSwitchStub } },
+  });
+}
+
+describe("RequireDataStoreField.vue", () => {
+  it("renders the title and description", () => {
+    const wrapper = mountField(true);
+    expect(wrapper.find(".settings-description-title").text()).toBe(
+      "Require Data Store",
+    );
+    expect(wrapper.find(".setting-description-text").text()).toContain(
+      "Toggle to control",
+    );
+  });
+
+  it("reflects modelValue true in the toggle", () => {
+    const wrapper = mountField(true);
+    expect(wrapper.find(".mock-toggle").attributes("data-checked")).toBe("true");
+  });
+
+  it("reflects modelValue false in the toggle", () => {
+    const wrapper = mountField(false);
+    expect(wrapper.find(".mock-toggle").attributes("data-checked")).toBe(
+      "false",
+    );
+  });
+
+  it("emits false when clicked while true", async () => {
+    const wrapper = mountField(true);
+    await wrapper.find(".mock-toggle").trigger("click");
+    expect(wrapper.emitted("update:modelValue")).toEqual([[false]]);
+  });
+
+  it("emits true when clicked while false", async () => {
+    const wrapper = mountField(false);
+    await wrapper.find(".mock-toggle").trigger("click");
+    expect(wrapper.emitted("update:modelValue")).toEqual([[true]]);
+  });
+});
diff --git a/test/mockapi/handlers.ts b/test/mockapi/handlers.ts
index 50c62610..4388f303 100644
--- a/test/mockapi/handlers.ts
+++ b/test/mockapi/handlers.ts
@@ -4,7 +4,7 @@ import {
   type BodyKongInitializeKongInitializePost,
   type BodyPodorcPodsCreatePoPost,
   type CleanupPodResponse,
-} from "../../app/services/Api";
+} from "~/services/Api";
 import {
   fakeDataStoreInitSuccess,
   fakeParsedProjects,
@@ -36,7 +36,7 @@ export const handlers = [
     return HttpResponse.json({
       status: 200,
       data: {
-        data_required: false,
+        require_data_store: false,
       },
     });
   }),
@@ -154,7 +154,7 @@ export const handlers = [
 
   http.get(`/po/status`, () => {
     return HttpResponse.json({
-      [fakeAnalysisId]: "running",
+      [fakeAnalysisId]: { status: "running" },
     });
   }),
 
diff --git a/test/mockapi/setup.ts b/test/mockapi/setup.ts
index a21bce46..8fc78954 100644
--- a/test/mockapi/setup.ts
+++ b/test/mockapi/setup.ts
@@ -132,13 +132,13 @@ vi.mock("primevue/useconfirm", () => ({
 }));
 
 // Mock MSW server for HTTP requests
-const server = setupServer(...handlers);
+export const testServer = setupServer(...handlers);
 
 // Start server before all tests
-beforeAll(() => server.listen({ onUnhandledRequest: "error" }));
+beforeAll(() => testServer.listen({ onUnhandledRequest: "error" }));
 
 // Close server after all tests
-afterAll(() => server.close());
+afterAll(() => testServer.close());
 
 // Reset handlers after each test for test isolation
-afterEach(() => server.resetHandlers());
+afterEach(() => testServer.resetHandlers());
diff --git a/test/utils/format-data-row.test.ts b/test/utils/format-data-row.test.ts
index 7e2ffbd9..9e631dd1 100644
--- a/test/utils/format-data-row.test.ts
+++ b/test/utils/format-data-row.test.ts
@@ -1,23 +1,62 @@
+// Test the format-data-row functions
 import { expect, test } from "vitest";
 import { formatDataRow, parseUnixTimestamp } from "~/utils/format-data-row";
-import {
-  expectedDateParsedRow,
-  expectedFormattedAnalysisData,
-  fakeAnalysisData,
-} from "./row-test-data";
-
-test("Fake data is different", () => {
-  expect(fakeAnalysisData).not.toBe(expectedFormattedAnalysisData);
-});
+import { fakeAnalysisNodes } from "@/test/components/analysis/constants";
+import type { ModifiedAnalysisNode } from "~/services/modifiedApiInterfaces";
 
 test("Format Unix timestamp", () => {
-  expect(
-    parseUnixTimestamp(fakeAnalysisData[0], ["created_at", "updated_at"]),
-  ).not.toBe(expectedDateParsedRow);
+  const fakeAnalysisNode = fakeAnalysisNodes[0]!;
+
+  expect(fakeAnalysisNode.created_at).toBe("2025-01-28T14:58:12Z");
+  expect(fakeAnalysisNode.updated_at).toBe("2025-03-18T09:11:14Z");
+
+  // Overwrites the current fakeAnalysisNode
+  const updatedAnalysisNode = parseUnixTimestamp(fakeAnalysisNode, [
+    "created_at",
+    "updated_at",
+  ]);
+
+  expect(fakeAnalysisNode).not.toStrictEqual(updatedAnalysisNode);
+
+  expect(updatedAnalysisNode.created_at).toStrictEqual({
+    short: "28.01.2025",
+    long: "28. Jan. 2025, 15:58",
+    date: new Date("2025-01-28T14:58:12.000Z"),
+    timestamp: 1738076292,
+  });
+
+  expect(updatedAnalysisNode.updated_at).toStrictEqual({
+    short: "18.03.2025",
+    long: "18. März 2025, 10:11",
+    date: new Date("2025-03-18T09:11:14.000Z"),
+    timestamp: 1742289074,
+  });
 });
 
 test("Format returned analysis data", () => {
-  expect(
-    formatDataRow(fakeAnalysisData, ["created_at", "updated_at"], []),
-  ).toStrictEqual(expectedFormattedAnalysisData);
+  const baseNode = fakeAnalysisNodes[0]!;
+  expect(baseNode.created_at).toBe("2025-01-28T14:58:12Z");
+  expect(baseNode.updated_at).toBe("2025-03-18T09:11:14Z");
+
+  const updatedRows = formatDataRow(
+    fakeAnalysisNodes,
+    ["created_at", "updated_at"],
+    [],
+  ) as ModifiedAnalysisNode[];
+
+  const row = updatedRows[0]!;
+
+  expect(row.created_at).toStrictEqual({
+    short: "28.01.2025",
+    long: "28. Jan. 2025, 15:58",
+    date: new Date("2025-01-28T14:58:12.000Z"),
+    timestamp: 1738076292,
+  });
+
+  expect(row.updated_at).toStrictEqual({
+    short: "18.03.2025",
+    long: "18. März 2025, 10:11",
+    date: new Date("2025-03-18T09:11:14.000Z"),
+    timestamp: 1742289074,
+  });
 });
diff --git a/test/utils/row-test-data.ts b/test/utils/row-test-data.ts
index d78065df..e69de29b 100644
--- a/test/utils/row-test-data.ts
+++ b/test/utils/row-test-data.ts
@@ -1,1245 +0,0 @@
-export const fakeAnalysisData = [
-  {
-    id: "984c984d-f4c1-4a5f-9df0-58eaa5b22f2c",
-    created_at: {
-      short: "05.02.2025",
-      long: "Wed, 05 Feb 2025 10:15:29 GMT",
-      date: "2025-02-05T10:15:29.800Z",
-      timestamp: 1738750529.8,
-    },
-    updated_at: {
-      short: "14.03.2025",
-      long: "Fri, 14 Mar 2025 09:43:55 GMT",
-      date: "2025-03-14T09:43:55.000Z",
-      timestamp: 1741945435,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "8003eefe-e39b-4bd4-aec4-78046c63b39b",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "8003eefe-e39b-4bd4-aec4-78046c63b39b",
-      created_at: "2025-02-05T10:15:22.833000Z",
-      updated_at: "2025-02-27T09:32:08Z",
-      name: "T004",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "843e0315-4c09-4de0-9a97-6f72fdf24743",
-    created_at: {
-      short: "05.02.2025",
-      long: "Wed, 05 Feb 2025 12:08:46 GMT",
-      date: "2025-02-05T12:08:46.761Z",
-      timestamp: 1738757326.761,
-    },
-    updated_at: {
-      short: "26.02.2025",
-      long: "Wed, 26 Feb 2025 07:48:46 GMT",
-      date: "2025-02-26T07:48:46.000Z",
-      timestamp: 1740556126,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 3,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "832fd968-caf3-4d04-b69e-02feb66f2f86",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "832fd968-caf3-4d04-b69e-02feb66f2f86",
-      created_at: "2025-02-05T12:08:33.131000Z",
-      updated_at: "2025-02-27T09:32:08Z",
-      name: "T006",
-      nodes: 4,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "9fa2853e-a158-4126-abb9-61d82a0b2a29",
-    created_at: {
-      short: "06.02.2025",
-      long: "Thu, 06 Feb 2025 14:02:27 GMT",
-      date: "2025-02-06T14:02:27.919Z",
-      timestamp: 1738850547.919,
-    },
-    updated_at: {
-      short: "06.02.2025",
-      long: "Thu, 06 Feb 2025 14:16:59 GMT",
-      date: "2025-02-06T14:16:59.000Z",
-      timestamp: 1738851419,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 0,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "74d9c7e4-1715-4e7c-bdcb-1c02c567b157",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "74d9c7e4-1715-4e7c-bdcb-1c02c567b157",
-      created_at: "2025-02-06T14:02:13.851000Z",
-      updated_at: "2025-02-27T09:32:07Z",
-      name: "T010",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "4e845490-f86d-4e84-8429-a3762458ab6e",
-    created_at: {
-      short: "06.02.2025",
-      long: "Thu, 06 Feb 2025 13:30:36 GMT",
-      date: "2025-02-06T13:30:36.793Z",
-      timestamp: 1738848636.793,
-    },
-    updated_at: {
-      short: "06.02.2025",
-      long: "Thu, 06 Feb 2025 13:38:02 GMT",
-      date: "2025-02-06T13:38:02.000Z",
-      timestamp: 1738849082,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "378a4ac2-daa9-4bad-83b7-6275aac381ad",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "378a4ac2-daa9-4bad-83b7-6275aac381ad",
-      created_at: "2025-02-06T13:30:33.314000Z",
-      updated_at: "2025-02-27T09:32:07Z",
-      name: "T009",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "fb1d9450-290f-4387-86e7-31c6223d9e8d",
-    created_at: {
-      short: "06.02.2025",
-      long: "Thu, 06 Feb 2025 09:55:45 GMT",
-      date: "2025-02-06T09:55:45.864Z",
-      timestamp: 1738835745.864,
-    },
-    updated_at: {
-      short: "06.02.2025",
-      long: "Thu, 06 Feb 2025 13:22:08 GMT",
-      date: "2025-02-06T13:22:08.000Z",
-      timestamp: 1738848128,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "35d11a4d-b7ec-43b6-b3f4-86bd5be07929",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "35d11a4d-b7ec-43b6-b3f4-86bd5be07929",
-      created_at: "2025-02-06T09:55:40.935000Z",
-      updated_at: "2025-02-27T09:32:10Z",
-      name: "T008",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "6e52f66b-fa6b-4a43-bb2d-620307d8cb10",
-    created_at: {
-      short: "05.02.2025",
-      long: "Wed, 05 Feb 2025 10:40:53 GMT",
-      date: "2025-02-05T10:40:53.524Z",
-      timestamp: 1738752053.524,
-    },
-    updated_at: {
-      short: "05.02.2025",
-      long: "Wed, 05 Feb 2025 12:26:52 GMT",
-      date: "2025-02-05T12:26:52.000Z",
-      timestamp: 1738758412,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "579a33ad-8255-4b24-94b0-fa8c2e63974d",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "579a33ad-8255-4b24-94b0-fa8c2e63974d",
-      created_at: "2025-02-05T10:40:42.843000Z",
-      updated_at: "2025-02-27T09:32:05Z",
-      name: "T005",
-      nodes: 5,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "4a2cb044-32f7-42d9-9419-f28a117814e6",
-    created_at: {
-      short: "05.02.2025",
-      long: "Wed, 05 Feb 2025 09:44:27 GMT",
-      date: "2025-02-05T09:44:27.096Z",
-      timestamp: 1738748667.096,
-    },
-    updated_at: {
-      short: "05.02.2025",
-      long: "Wed, 05 Feb 2025 10:21:30 GMT",
-      date: "2025-02-05T10:21:30.000Z",
-      timestamp: 1738750890,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 0,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "2cbec967-3b20-4c96-b089-74bcb6cbaaed",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "2cbec967-3b20-4c96-b089-74bcb6cbaaed",
-      created_at: "2025-02-05T09:44:21.594000Z",
-      updated_at: "2025-02-27T09:32:08Z",
-      name: "T004",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "4c4b9b2e-85de-4319-8d68-bcc8247464eb",
-    created_at: {
-      short: "28.01.2025",
-      long: "Tue, 28 Jan 2025 14:58:12 GMT",
-      date: "2025-01-28T14:58:12.415Z",
-      timestamp: 1738076292.415,
-    },
-    updated_at: {
-      short: "04.02.2025",
-      long: "Tue, 04 Feb 2025 12:45:10 GMT",
-      date: "2025-02-04T12:45:10.000Z",
-      timestamp: 1738673110,
-    },
-    approval_status: "approved",
-    run_status: "finished",
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "15518efa-5146-4290-a7cb-95d27f41d991",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "15518efa-5146-4290-a7cb-95d27f41d991",
-      created_at: "2025-01-28T14:58:06.399000Z",
-      updated_at: "2025-02-27T09:32:07Z",
-      name: "001",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "d89166b3-4a89-40f0-9cf2-f010a3d479b7",
-    created_at: {
-      short: "04.02.2025",
-      long: "Tue, 04 Feb 2025 12:44:48 GMT",
-      date: "2025-02-04T12:44:48.186Z",
-      timestamp: 1738673088.186,
-    },
-    updated_at: {
-      short: "04.02.2025",
-      long: "Tue, 04 Feb 2025 12:44:48 GMT",
-      date: "2025-02-04T12:44:48.186Z",
-      timestamp: 1738673088.186,
-    },
-    approval_status: "approved",
-    run_status: undefined,
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "689907d9-4521-4082-a366-4dd25b9524d9",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "689907d9-4521-4082-a366-4dd25b9524d9",
-      created_at: "2025-02-04T12:44:42.768000Z",
-      updated_at: "2025-02-27T09:32:10Z",
-      name: "003",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: undefined,
-      run_status: undefined,
-      registry_id: undefined,
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "a5f352f1-a14e-44db-a5c9-527f6b80e25a",
-    created_at: {
-      short: "28.01.2025",
-      long: "Tue, 28 Jan 2025 15:03:45 GMT",
-      date: "2025-01-28T15:03:45.063Z",
-      timestamp: 1738076625.063,
-    },
-    updated_at: {
-      short: "28.01.2025",
-      long: "Tue, 28 Jan 2025 15:03:45 GMT",
-      date: "2025-01-28T15:03:45.063Z",
-      timestamp: 1738076625.063,
-    },
-    approval_status: "approved",
-    run_status: undefined,
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "7162c9c8-75cf-4ae7-adb6-78033c611025",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "7162c9c8-75cf-4ae7-adb6-78033c611025",
-      created_at: "2025-01-28T15:03:42.204000Z",
-      updated_at: "2025-02-27T09:32:10Z",
-      name: "002",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-];
-
-export const expectedFormattedAnalysisData = [
-  {
-    id: "984c984d-f4c1-4a5f-9df0-58eaa5b22f2c",
-    created_at: {
-      short: "05.02.2025",
-      long: "Wed, 05 Feb 2025 10:15:29 GMT",
-      date: "2025-02-05T10:15:29.800Z",
-      timestamp: 1738750529.8,
-    },
-    updated_at: {
-      short: "14.03.2025",
-      long: "Fri, 14 Mar 2025 09:43:55 GMT",
-      date: "2025-03-14T09:43:55.000Z",
-      timestamp: 1741945435,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "8003eefe-e39b-4bd4-aec4-78046c63b39b",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "8003eefe-e39b-4bd4-aec4-78046c63b39b",
-      created_at: "2025-02-05T10:15:22.833000Z",
-      updated_at: "2025-02-27T09:32:08Z",
-      name: "T004",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "843e0315-4c09-4de0-9a97-6f72fdf24743",
-    created_at: {
-      short: "05.02.2025",
-      long: "Wed, 05 Feb 2025 12:08:46 GMT",
-      date: "2025-02-05T12:08:46.761Z",
-      timestamp: 1738757326.761,
-    },
-    updated_at: {
-      short: "26.02.2025",
-      long: "Wed, 26 Feb 2025 07:48:46 GMT",
-      date: "2025-02-26T07:48:46.000Z",
-      timestamp: 1740556126,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 3,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "832fd968-caf3-4d04-b69e-02feb66f2f86",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "832fd968-caf3-4d04-b69e-02feb66f2f86",
-      created_at: "2025-02-05T12:08:33.131000Z",
-      updated_at: "2025-02-27T09:32:08Z",
-      name: "T006",
-      nodes: 4,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "9fa2853e-a158-4126-abb9-61d82a0b2a29",
-    created_at: {
-      short: "06.02.2025",
-      long: "Thu, 06 Feb 2025 14:02:27 GMT",
-      date: "2025-02-06T14:02:27.919Z",
-      timestamp: 1738850547.919,
-    },
-    updated_at: {
-      short: "06.02.2025",
-      long: "Thu, 06 Feb 2025 14:16:59 GMT",
-      date: "2025-02-06T14:16:59.000Z",
-      timestamp: 1738851419,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 0,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "74d9c7e4-1715-4e7c-bdcb-1c02c567b157",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "74d9c7e4-1715-4e7c-bdcb-1c02c567b157",
-      created_at: "2025-02-06T14:02:13.851000Z",
-      updated_at: "2025-02-27T09:32:07Z",
-      name: "T010",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "4e845490-f86d-4e84-8429-a3762458ab6e",
-    created_at: {
-      short: "06.02.2025",
-      long: "Thu, 06 Feb 2025 13:30:36 GMT",
-      date: "2025-02-06T13:30:36.793Z",
-      timestamp: 1738848636.793,
-    },
-    updated_at: {
-      short: "06.02.2025",
-      long: "Thu, 06 Feb 2025 13:38:02 GMT",
-      date: "2025-02-06T13:38:02.000Z",
-      timestamp: 1738849082,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "378a4ac2-daa9-4bad-83b7-6275aac381ad",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "378a4ac2-daa9-4bad-83b7-6275aac381ad",
-      created_at: "2025-02-06T13:30:33.314000Z",
-      updated_at: "2025-02-27T09:32:07Z",
-      name: "T009",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "fb1d9450-290f-4387-86e7-31c6223d9e8d",
-    created_at: {
-      short: "06.02.2025",
-      long: "Thu, 06 Feb 2025 09:55:45 GMT",
-      date: "2025-02-06T09:55:45.864Z",
-      timestamp: 1738835745.864,
-    },
-    updated_at: {
-      short: "06.02.2025",
-      long: "Thu, 06 Feb 2025 13:22:08 GMT",
-      date: "2025-02-06T13:22:08.000Z",
-      timestamp: 1738848128,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "35d11a4d-b7ec-43b6-b3f4-86bd5be07929",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "35d11a4d-b7ec-43b6-b3f4-86bd5be07929",
-      created_at: "2025-02-06T09:55:40.935000Z",
-      updated_at: "2025-02-27T09:32:10Z",
-      name: "T008",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "6e52f66b-fa6b-4a43-bb2d-620307d8cb10",
-    created_at: {
-      short: "05.02.2025",
-      long: "Wed, 05 Feb 2025 10:40:53 GMT",
-      date: "2025-02-05T10:40:53.524Z",
-      timestamp: 1738752053.524,
-    },
-    updated_at: {
-      short: "05.02.2025",
-      long: "Wed, 05 Feb 2025 12:26:52 GMT",
-      date: "2025-02-05T12:26:52.000Z",
-      timestamp: 1738758412,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "579a33ad-8255-4b24-94b0-fa8c2e63974d",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "579a33ad-8255-4b24-94b0-fa8c2e63974d",
-      created_at: "2025-02-05T10:40:42.843000Z",
-      updated_at: "2025-02-27T09:32:05Z",
-      name: "T005",
-      nodes: 5,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "4a2cb044-32f7-42d9-9419-f28a117814e6",
-    created_at: {
-      short: "05.02.2025",
-      long: "Wed, 05 Feb 2025 09:44:27 GMT",
-      date: "2025-02-05T09:44:27.096Z",
-      timestamp: 1738748667.096,
-    },
-    updated_at: {
-      short: "05.02.2025",
-      long: "Wed, 05 Feb 2025 10:21:30 GMT",
-      date: "2025-02-05T10:21:30.000Z",
-      timestamp: 1738750890,
-    },
-    approval_status: "approved",
-    run_status: "running",
-    comment: undefined,
-    index: 0,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "2cbec967-3b20-4c96-b089-74bcb6cbaaed",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "2cbec967-3b20-4c96-b089-74bcb6cbaaed",
-      created_at: "2025-02-05T09:44:21.594000Z",
-      updated_at: "2025-02-27T09:32:08Z",
-      name: "T004",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "4c4b9b2e-85de-4319-8d68-bcc8247464eb",
-    created_at: {
-      short: "28.01.2025",
-      long: "Tue, 28 Jan 2025 14:58:12 GMT",
-      date: "2025-01-28T14:58:12.415Z",
-      timestamp: 1738076292.415,
-    },
-    updated_at: {
-      short: "04.02.2025",
-      long: "Tue, 04 Feb 2025 12:45:10 GMT",
-      date: "2025-02-04T12:45:10.000Z",
-      timestamp: 1738673110,
-    },
-    approval_status: "approved",
-    run_status: "finished",
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "15518efa-5146-4290-a7cb-95d27f41d991",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "15518efa-5146-4290-a7cb-95d27f41d991",
-      created_at: "2025-01-28T14:58:06.399000Z",
-      updated_at: "2025-02-27T09:32:07Z",
-      name: "001",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "d89166b3-4a89-40f0-9cf2-f010a3d479b7",
-    created_at: {
-      short: "04.02.2025",
-      long: "Tue, 04 Feb 2025 12:44:48 GMT",
-      date: "2025-02-04T12:44:48.186Z",
-      timestamp: 1738673088.186,
-    },
-    updated_at: {
-      short: "04.02.2025",
-      long: "Tue, 04 Feb 2025 12:44:48 GMT",
-      date: "2025-02-04T12:44:48.186Z",
-      timestamp: 1738673088.186,
-    },
-    approval_status: "approved",
-    run_status: undefined,
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "689907d9-4521-4082-a366-4dd25b9524d9",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "689907d9-4521-4082-a366-4dd25b9524d9",
-      created_at: "2025-02-04T12:44:42.768000Z",
-      updated_at: "2025-02-27T09:32:10Z",
-      name: "003",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: undefined,
-      run_status: undefined,
-      registry_id: undefined,
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-  {
-    id: "a5f352f1-a14e-44db-a5c9-527f6b80e25a",
-    created_at: {
-      short: "28.01.2025",
-      long: "Tue, 28 Jan 2025 15:03:45 GMT",
-      date: "2025-01-28T15:03:45.063Z",
-      timestamp: 1738076625.063,
-    },
-    updated_at: {
-      short: "28.01.2025",
-      long: "Tue, 28 Jan 2025 15:03:45 GMT",
-      date: "2025-01-28T15:03:45.063Z",
-      timestamp: 1738076625.063,
-    },
-    approval_status: "approved",
-    run_status: undefined,
-    comment: undefined,
-    index: 1,
-    artifact_tag: undefined,
-    artifact_digest: undefined,
-    analysis_id: "7162c9c8-75cf-4ae7-adb6-78033c611025",
-    analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    analysis: {
-      id: "7162c9c8-75cf-4ae7-adb6-78033c611025",
-      created_at: "2025-01-28T15:03:42.204000Z",
-      updated_at: "2025-02-27T09:32:10Z",
-      name: "002",
-      nodes: 2,
-      configuration_status: undefined,
-      build_status: "finished",
-      run_status: undefined,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-      user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-      project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-      project: undefined,
-      master_image_id: undefined,
-      registry: undefined,
-      master_image: undefined,
-    },
-    node: {
-      id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-      created_at: "2025-01-28T12:46:53.676000Z",
-      updated_at: "2025-03-10T14:29:28Z",
-      external_name: "node-dev-5",
-      name: "node-dev-5",
-      hidden: false,
-      type: "default",
-      online: false,
-      registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-      registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-      robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-      realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    },
-    expand: {},
-    project_name: "denbi-test",
-  },
-];
-
-export const expectedDateParsedRow = {
-  id: "984c984d-f4c1-4a5f-9df0-58eaa5b22f2c",
-  created_at: {
-    short: "05.02.2025",
-    long: "Wed, 05 Feb 2025 10:15:29 GMT",
-    date: "2025-02-05T10:15:29.800Z",
-    timestamp: 1738750529.8,
-  },
-  updated_at: {
-    short: "14.03.2025",
-    long: "Fri, 14 Mar 2025 09:43:55 GMT",
-    date: "2025-03-14T09:43:55.000Z",
-    timestamp: 1741945435,
-  },
-  approval_status: "approved",
-  run_status: "running",
-  comment: undefined,
-  index: 1,
-  artifact_tag: undefined,
-  artifact_digest: undefined,
-  analysis_id: "8003eefe-e39b-4bd4-aec4-78046c63b39b",
-  analysis_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-  node_id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-  node_realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-  analysis: {
-    id: "8003eefe-e39b-4bd4-aec4-78046c63b39b",
-    created_at: "2025-02-05T10:15:22.833000Z",
-    updated_at: "2025-02-27T09:32:08Z",
-    name: "T004",
-    nodes: 2,
-    configuration_status: undefined,
-    build_status: "finished",
-    run_status: undefined,
-    registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-    realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-    user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-    project_id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
-    project: undefined,
-    master_image_id: undefined,
-    registry: undefined,
-    master_image: undefined,
-  },
-  node: {
-    id: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
-    created_at: "2025-01-28T12:46:53.676000Z",
-    updated_at: "2025-03-10T14:29:28Z",
-    external_name: "node-dev-5",
-    name: "node-dev-5",
-    hidden: false,
-    type: "default",
-    online: false,
-    registry_id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
-    registry_project_id: "7441bd98-10c6-49ee-8c23-78e07fd6ab11",
-    robot_id: "c82d7fda-d69f-4fda-bb4c-1b2b9d910972",
-    realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
-  },
-  expand: {},
-  project_name: "denbi-test",
-};
diff --git a/test/utils/status-tag-severity.test.ts b/test/utils/status-tag-severity.test.ts
index e29f7975..6d8a8e26 100644
--- a/test/utils/status-tag-severity.test.ts
+++ b/test/utils/status-tag-severity.test.ts
@@ -3,10 +3,11 @@ import {
   getApprovalStatusSeverity,
   getBuildStatusSeverity,
   getDataStoreTypeSeverity,
-  getRunStatusSeverity,
+  getExecutionStatusSeverity,
 } from "~/utils/status-tag-severity";
-import { AnalysisBuildStatus, AnalysisNodeRunStatus } from "~/types/analysis";
+import { ProcessStatus } from "~/types/analysis";
 import { ApprovalStatus } from "~/types/node";
+import { PodStatus } from "~/services/Api";
 
 test("Approval status severity tag", () => {
   const expectations = {
@@ -26,10 +27,11 @@ test("Build status severity tag", () => {
     started: "info",
     stopping: "warning",
     stopped: "warning",
-    finished: "success",
+    executing: "contrast",
+    executed: "success",
     failed: "danger",
   };
-  for (const buildStatus of Object.values(AnalysisBuildStatus)) {
+  for (const buildStatus of Object.values(ProcessStatus)) {
     expect(getBuildStatusSeverity(buildStatus)).toStrictEqual(
       expectations[buildStatus],
     );
@@ -40,16 +42,18 @@ test("Analysis run status severity tag", () => {
   const expectations = {
     starting: "info",
     started: "info",
-    running: "contrast",
+    running: "contrast", // deprecated
+    executing: "contrast",
     stopping: "warning",
     stopped: "warning",
-    finished: "success",
+    executed: "success",
+    finished: "success", // deprecated
     failed: "danger",
   };
 
-  for (const runStatus of Object.values(AnalysisNodeRunStatus)) {
-    expect(getRunStatusSeverity(runStatus)).toStrictEqual(
-      expectations[runStatus],
+  for (const executionStatus of Object.values(PodStatus)) {
+    expect(getExecutionStatusSeverity(executionStatus)).toStrictEqual(
+      expectations[executionStatus],
     );
   }
 });
diff --git a/vitest.config.ts b/vitest.config.ts
index 8848616e..02802929 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -24,6 +24,9 @@ export default defineVitestConfig({
   plugins: [tsconfigPaths(), mockNuxtAuth],
   test: {
     globals: true,
+    env: {
+      TZ: "Europe/Berlin",
+    },
     exclude: [
       "**/node_modules/**",
       "**/dist/**",