diff --git a/.gitignore b/.gitignore
index 747d1b4b..43a9cb4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,4 +99,5 @@ sw.*
 .output
 
 # Claude
-.claude/
\ No newline at end of file
+.claude/
+docs/
\ No newline at end of file
diff --git a/app/components/data-stores/DataStoreList.vue b/app/components/data-stores/DataStoreList.vue
index 16bd0db2..b4b78e83 100644
--- a/app/components/data-stores/DataStoreList.vue
+++ b/app/components/data-stores/DataStoreList.vue
@@ -1,105 +1,12 @@
 <script lang="ts" setup>
-import { watchEffect } from "vue";
-import { getDataStores, getProjects } from "~/composables/useAPIFetch";
-import { formatDataRow } from "~/utils/format-data-row";
-import type { ModifiedDetailedService } from "~/services/modifiedApiInterfaces";
-import type {
-  DetailedAnalysis,
-  ListServices,
-  Project,
-  Route,
-} from "~/services/Api";
+import { useDataStoreList } from "~/composables/useDataStoreList";
 import DetailedDataStoreTable from "~/components/data-stores/DetailedDataStoreTable.vue";
 
-const dataStores = ref<ModifiedDetailedService[]>([]);
-const projectNameMap = ref<Map<string, string | undefined>>(
-  new Map<string, string | undefined>(),
-);
-
-const loading = ref(true);
-
-const dataRowUnixCols = ["created_at", "updated_at"];
-const expandRowEntries = [];
-
-const {
-  data: dsResp,
-  status: dsStatus,
-  error: dsError,
-  refresh: dsRefresh,
-} = await getDataStores(true, { lazy: true });
-
-const { data: projectResp } = await getProjects({ lazy: true });
-
-watchEffect(() => {
-  if (dsResp.value?.data) {
-    const dataStoreData = dsResp.value.data as ListServices;
-    loadDetailedDataStoreTable(dataStoreData, dsStatus.value, dsError);
-  }
-});
-
-watchEffect(() => {
-  if (projectResp.value) {
-    const projects = projectResp.value || [];
-    projectNameMap.value = mapDataFromHub(projects);
-  }
-});
-
-async function loadDetailedDataStoreTable(
-  responseData: ListServices,
-  status: string,
-  error,
-) {
-  if (status === "success") {
-    let formattedDataStores = formatDataRow(
-      responseData,
-      dataRowUnixCols,
-      expandRowEntries,
-    ) as ModifiedDetailedService[];
-
-    formattedDataStores = formattedDataStores.filter(
-      (store: ModifiedDetailedService) => store.name !== "kong-admin-service",
-    );
-
-    formattedDataStores.forEach((store: ModifiedDetailedService) => {
-      if (store.routes) {
-        store.routes = formatDataRow(
-          store.routes,
-          dataRowUnixCols,
-          expandRowEntries,
-        );
-        store.routes?.forEach((proj: Route) => {
-          proj["projectId"] = extractProjectIdFromPath(proj.paths! as string[]);
-        });
-      }
-    });
-    dataStores.value = formattedDataStores;
-  } else if (error.value?.statusCode === 500) {
-    dataStores.value = [];
-  }
-  loading.value = false;
-}
-
-function mapDataFromHub(hubData: Project[] | DetailedAnalysis[]) {
-  let mappedNames = new Map<string, string | undefined>();
-  if (hubData && hubData.length > 0) {
-    hubData.forEach((entry: Project | DetailedAnalysis) => {
-      if (entry.id) {
-        mappedNames.set(entry.id, entry.name ? entry.name : "N/A");
-      }
-    });
-  }
-  return mappedNames;
-}
-
-function extractProjectIdFromPath(paths: string[]): string {
-  return paths[0].split("/")[1];
-}
+const { dataStores, projectNameMap, loading, refresh } = await useDataStoreList();
 
 function onDeleteDataStore(dsName: string) {
-  dataStores.value = dataStores.value.filter(
-    (store: ModifiedDetailedService) => store.name !== dsName,
-  );
-  dsRefresh();
+  dataStores.value = dataStores.value.filter((store) => store.name !== dsName);
+  refresh();
 }
 </script>
 
diff --git a/app/components/data-stores/create/DataStoreHelpBox.vue b/app/components/data-stores/create/DataStoreHelpBox.vue
index 5b820eb4..2f2e029f 100644
--- a/app/components/data-stores/create/DataStoreHelpBox.vue
+++ b/app/components/data-stores/create/DataStoreHelpBox.vue
@@ -1,226 +1,154 @@
 <script setup lang="ts">
 import { HelpTextField } from "~/components/data-stores/create/index";
-import Panel from "primevue/panel";
-
-const props = defineProps({
-  helpField: String || undefined,
-});
+import DataStoreHelpPanel from "~/components/data-stores/create/DataStoreHelpPanel.vue";
 
+const props = defineProps<{ helpField: string | undefined }>();
 const emit = defineEmits(["closeHelp"]);
-
-const closeHelp = () => {
-  emit("closeHelp");
-};
 </script>
 
 <template>
   <div class="data-store-help">
-    <div
-      class="methods-help-text"
+    <DataStoreHelpPanel
       v-if="props.helpField === HelpTextField.Methods"
+      header="Allowed Methods"
+      @closeHelp="emit('closeHelp')"
     >
-      <Panel header="Allowed Methods">
-        <p>
-          How the data is accessed can be tightly controlled by defining which
-          request methods are allowed for a given project. For a project to be
-          able to read the data, the <code>GET</code> method must be enabled
-          (and is by default).
-        </p>
-        <p>
-          Additional request methods can be added to this list which would allow
-          users of the project to modify (<code>PUT</code>) the data, add
-          (<code>POST</code>) new data, or remove (<code>DELETE</code>) data in
-          the server. The ability to modify the list of allowed request methods
-          is disabled by default, though admins can enable this field, but
-          should understand the risks of allowing users to directly modify the
-          data on their institution's servers.
-        </p>
-        <template #icons>
-          <Button
-            class="p-panel-header-icon p-link mr-2 help-box-close-btn"
-            icon="pi pi-times"
-            @click="closeHelp"
-            severity="contrast"
-            v-tooltip.top="'Close help box'"
-          />
-        </template>
-      </Panel>
-    </div>
-    <div
-      class="methods-help-text"
+      <p>
+        How the data is accessed can be tightly controlled by defining which
+        request methods are allowed for a given project. For a project to be
+        able to read the data, the <code>GET</code> method must be enabled
+        (and is by default).
+      </p>
+      <p>
+        Additional request methods can be added to this list which would allow
+        users of the project to modify (<code>PUT</code>) the data, add
+        (<code>POST</code>) new data, or remove (<code>DELETE</code>) data in
+        the server. The ability to modify the list of allowed request methods
+        is disabled by default, though admins can enable this field, but
+        should understand the risks of allowing users to directly modify the
+        data on their institution's servers.
+      </p>
+    </DataStoreHelpPanel>
+
+    <DataStoreHelpPanel
       v-else-if="props.helpField === HelpTextField.FHIR"
+      header="Data Path"
+      @closeHelp="emit('closeHelp')"
     >
-      <Panel header="Data Path">
-        <p>
-          Here, the admin must provide the absolute file path of the directory
-          (folder) which contains the relevant data to be shared with the
-          project. The path should be the same as defined on the server/host
-          provided in the <i>Server</i> field.
-        </p>
-        <p>
-          For Unix based systems, the directory path should start with a forward
-          slash "/", while a Windows OS will use a drive letter with a colon and
-          2 back slashes (e.g. H:\\).
-        </p>
-        <template #icons>
-          <Button
-            class="p-panel-header-icon p-link mr-2 help-box-close-btn"
-            icon="pi pi-times"
-            @click="closeHelp"
-            severity="contrast"
-            v-tooltip.top="'Close help box'"
-          />
-        </template>
-      </Panel>
-    </div>
-    <div
-      class="methods-help-text"
+      <p>
+        Here, the admin must provide the absolute file path of the directory
+        (folder) which contains the relevant data to be shared with the
+        project. The path should be the same as defined on the server/host
+        provided in the <i>Server</i> field.
+      </p>
+      <p>
+        For Unix based systems, the directory path should start with a forward
+        slash "/", while a Windows OS will use a drive letter with a colon and
+        2 back slashes (e.g. H:\\).
+      </p>
+    </DataStoreHelpPanel>
+
+    <DataStoreHelpPanel
       v-else-if="props.helpField === HelpTextField.S3"
+      header="Bucket Name"
+      @closeHelp="emit('closeHelp')"
     >
-      <Panel header="Bucket Name">
-        <p>Enter the name of the S3 bucket which contains the data.</p>
-        <template #icons>
-          <Button
-            class="p-panel-header-icon p-link mr-2 help-box-close-btn"
-            icon="pi pi-times"
-            @click="closeHelp"
-            severity="contrast"
-            v-tooltip.top="'Close help box'"
-          />
-        </template>
-      </Panel>
-    </div>
-    <div
-      class="methods-help-text"
+      <p>Enter the name of the S3 bucket which contains the data.</p>
+    </DataStoreHelpPanel>
+
+    <DataStoreHelpPanel
       v-else-if="props.helpField === HelpTextField.Port"
+      header="Server Port"
+      @closeHelp="emit('closeHelp')"
     >
-      <Panel header="Server Port">
-        <p>
-          In order to maintain security, firewalls are used to prevent
-          unauthorized access to professional and personal computers/servers. To
-          gain access to services or data on a system with a firewall, a
-          <i>port</i> must be opened by the technical administrator. These ports
-          have numerical identifiers and your institution should have a specific
-          port opened for the server containing the data to be shared.
-        </p>
-        <p>
-          Please provide that port number here so that the FLAME Node Service is
-          able to access the data. If you are unsure or do not know which port
-          should be used, please contact your IT department or relevant
-          administrator.
-        </p>
-        <template #icons>
-          <Button
-            class="p-panel-header-icon p-link mr-2 help-box-close-btn"
-            icon="pi pi-times"
-            @click="closeHelp"
-            severity="contrast"
-            v-tooltip.top="'Close help box'"
-          />
-        </template>
-      </Panel>
-    </div>
-    <div
-      class="methods-help-text"
+      <p>
+        In order to maintain security, firewalls are used to prevent
+        unauthorized access to professional and personal computers/servers. To
+        gain access to services or data on a system with a firewall, a
+        <i>port</i> must be opened by the technical administrator. These ports
+        have numerical identifiers and your institution should have a specific
+        port opened for the server containing the data to be shared.
+      </p>
+      <p>
+        Please provide that port number here so that the FLAME Node Service is
+        able to access the data. If you are unsure or do not know which port
+        should be used, please contact your IT department or relevant
+        administrator.
+      </p>
+    </DataStoreHelpPanel>
+
+    <DataStoreHelpPanel
       v-else-if="props.helpField === HelpTextField.Protocol"
+      header="Communication Protocol"
+      @closeHelp="emit('closeHelp')"
     >
-      <Panel header="Communication Protocol">
-        <p>
-          Multiple protocols exist for transferring files between computers and
-          for communication, the most common being HTTP. To improve the security
-          of the transferred data, <b>Transport Layer Security</b> (TLS) was
-          developed for protocols as an encryption method and is now very
-          commonly used (HTTPS is simply HTTP over TLS). The FLAME Node software
-          needs to know the protocol used, and whether or not it is secured
-          using TLS.
-        </p>
-        <ul>
-          <li>
-            <b>HTTP/HTTPS</b> - Hypertext Transfer Protocol. Data is generally
-            sent using port 80 (HTTP) or port 443 (HTTPS)
-          </li>
-          <li><b>WS/WSS</b> - Websocket on HTTP (WS) or on HTTPS (WSS)</li>
-          <li><b>gRPC/gRPCS</b> - Google remote procedural calls</li>
-          <li><b>TCP/TLS</b> - Transmission Control Protocol</li>
-          <li>
-            <b>TCP Passthrough</b> - a TLS proxy request that doesn't terminate
-            (a SNI proxy)
-          </li>
-        </ul>
-        <p>
-          For additional information, please visit
-          <a
-            href="https://docs.konghq.com/gateway/latest/how-kong-works/routing-traffic/"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            the Kong documentation.
-          </a>
-        </p>
-        <p>
-          Should your institution use a different protocol other than those
-          listed below, please contact the Node Dev Team for help resolving
-          this.
-        </p>
-        <template #icons>
-          <Button
-            class="p-panel-header-icon p-link mr-2 help-box-close-btn"
-            icon="pi pi-times"
-            @click="closeHelp"
-            severity="contrast"
-            v-tooltip.top="'Close help box'"
-          />
-        </template>
-      </Panel>
-    </div>
-    <div
-      class="methods-help-text"
+      <p>
+        Multiple protocols exist for transferring files between computers and
+        for communication, the most common being HTTP. To improve the security
+        of the transferred data, <b>Transport Layer Security</b> (TLS) was
+        developed for protocols as an encryption method and is now very
+        commonly used (HTTPS is simply HTTP over TLS). The FLAME Node software
+        needs to know the protocol used, and whether or not it is secured
+        using TLS.
+      </p>
+      <ul>
+        <li>
+          <b>HTTP/HTTPS</b> - Hypertext Transfer Protocol. Data is generally
+          sent using port 80 (HTTP) or port 443 (HTTPS)
+        </li>
+        <li><b>WS/WSS</b> - Websocket on HTTP (WS) or on HTTPS (WSS)</li>
+        <li><b>gRPC/gRPCS</b> - Google remote procedural calls</li>
+        <li><b>TCP/TLS</b> - Transmission Control Protocol</li>
+        <li>
+          <b>TCP Passthrough</b> - a TLS proxy request that doesn't terminate
+          (a SNI proxy)
+        </li>
+      </ul>
+      <p>
+        For additional information, please visit
+        <a
+          href="https://docs.konghq.com/gateway/latest/how-kong-works/routing-traffic/"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          the Kong documentation.
+        </a>
+      </p>
+      <p>
+        Should your institution use a different protocol other than those
+        listed below, please contact the Node Dev Team for help resolving
+        this.
+      </p>
+    </DataStoreHelpPanel>
+
+    <DataStoreHelpPanel
       v-else-if="props.helpField === HelpTextField.Server"
+      header="Server Host"
+      @closeHelp="emit('closeHelp')"
     >
-      <Panel header="Server Host">
-        <p>
-          This field is for providing the <b>hostname</b> or
-          <b>IP address</b> of the data's server. Please take care that this is
-          reachable from outside of the network.
-        </p>
-        <template #icons>
-          <Button
-            class="p-panel-header-icon p-link mr-2 help-box-close-btn"
-            icon="pi pi-times"
-            @click="closeHelp"
-            severity="contrast"
-            v-tooltip.top="'Close help box'"
-          />
-        </template>
-      </Panel>
-    </div>
-    <div
-      class="methods-help-text"
+      <p>
+        This field is for providing the <b>hostname</b> or
+        <b>IP address</b> of the data's server. Please take care that this is
+        reachable from outside of the network.
+      </p>
+    </DataStoreHelpPanel>
+
+    <DataStoreHelpPanel
       v-else-if="props.helpField === HelpTextField.Type"
+      header="Data Store Type"
+      @closeHelp="emit('closeHelp')"
     >
-      <Panel header="Data Store Type">
-        <p>
-          Depending on how the data is made available, the FLAME Node software
-          will have to setup specific plugins and features. It is important to
-          indicate here in what type of instance the data is stored.
-        </p>
-        <p>
-          Should your institution use a different method of storage other than
-          those listed, please contact the Node Dev Team for help resolving
-          this.
-        </p>
-        <template #icons>
-          <Button
-            class="p-panel-header-icon p-link mr-2 help-box-close-btn"
-            icon="pi pi-times"
-            @click="closeHelp"
-            severity="contrast"
-            v-tooltip.top="'Close help box'"
-          />
-        </template>
-      </Panel>
-    </div>
-    <p v-else>Foobar</p>
+      <p>
+        Depending on how the data is made available, the FLAME Node software
+        will have to setup specific plugins and features. It is important to
+        indicate here in what type of instance the data is stored.
+      </p>
+      <p>
+        Should your institution use a different method of storage other than
+        those listed, please contact the Node Dev Team for help resolving
+        this.
+      </p>
+    </DataStoreHelpPanel>
   </div>
 </template>
 
diff --git a/app/components/data-stores/create/DataStoreHelpPanel.vue b/app/components/data-stores/create/DataStoreHelpPanel.vue
new file mode 100644
index 00000000..949fce68
--- /dev/null
+++ b/app/components/data-stores/create/DataStoreHelpPanel.vue
@@ -0,0 +1,26 @@
+<script setup lang="ts">
+import Panel from "primevue/panel";
+
+defineProps<{ header: string }>();
+const emit = defineEmits(["closeHelp"]);
+</script>
+
+<template>
+  <div class="methods-help-text">
+    <Panel :header="header">
+      <slot />
+      <template #icons>
+        <Button
+          class="p-panel-header-icon p-link mr-2 help-box-close-btn"
+          icon="pi pi-times"
+          severity="contrast"
+          v-tooltip.top="'Close help box'"
+          aria-label="Close help box"
+          @click="emit('closeHelp')"
+        />
+      </template>
+    </Panel>
+  </div>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/app/components/data-stores/create/DataStoreProjectInitializer.vue b/app/components/data-stores/create/DataStoreProjectInitializer.vue
index 2965dfb1..49f38842 100644
--- a/app/components/data-stores/create/DataStoreProjectInitializer.vue
+++ b/app/components/data-stores/create/DataStoreProjectInitializer.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ref, watch } from "vue";
+import { ref, watch, computed } from "vue";
 import { navigateTo, useNuxtApp } from "nuxt/app";
 import InputText from "primevue/inputtext";
 import RadioButton from "primevue/radiobutton";
@@ -8,19 +8,17 @@ import InputNumber from "primevue/inputnumber";
 import InputGroupAddon from "primevue/inputgroupaddon";
 import InputGroup from "primevue/inputgroup";
 import DataStoreHelpBox from "~/components/data-stores/create/DataStoreHelpBox.vue";
-import { HelpTextField } from "~/components/data-stores/create/index";
+import { type AvailableProject, HelpTextField } from "~/components/data-stores/create/index";
 import { useToast } from "primevue/usetoast";
 import {
   type BodyKongInitializeKongInitializePost,
   DataStoreType,
+  type ProjectNode,
 } from "~/services/Api";
-
-const props = defineProps({
-  projects: Array,
-});
+import { getProjectNodes } from "~/composables/useAPIFetch";
 
 const loading = ref(false);
-const helpActive = ref();
+const helpActive = ref<HelpTextField | undefined>();
 
 const connMsg = ref("");
 const connMsgColor = computed(() =>
@@ -29,6 +27,21 @@ const connMsgColor = computed(() =>
 
 const toast = useToast();
 
+// Project list
+const availableProjects = ref<AvailableProject[]>([]);
+
+const { data: projects, status: projStatus } = await getProjectNodes();
+
+if (projStatus.value === "success") {
+  const projectData = projects.value as unknown as Array<ProjectNode>;
+  if (projectData.length > 0) {
+    availableProjects.value = projectData.map((proj: ProjectNode) => ({
+      name: proj.project?.name,
+      id: proj.project_id,
+    }));
+  }
+}
+
 // Project settings
 const dataStoreTypeOptions = computed(() =>
   Object.values(DataStoreType).map((type) => ({
@@ -45,7 +58,7 @@ const selectedBucketAccessPolicy = ref<allowedBucketAccessPolicies>("Private");
 const bucketAccessKey = ref<string>("");
 const bucketSecretKey = ref<string>("");
 
-const selectedProject = ref();
+const selectedProject = ref<AvailableProject | undefined>();
 
 const dataStoreSettingsMap: Map<string, string> = new Map([
   ["name", "Project"],
@@ -72,13 +85,14 @@ const acceptedProtocols = [
   "tcp",
   "tls",
   "tls_passthrough",
-  // "udp",
   "ws",
   "wss",
 ];
 
 watch(selectedProject, (newSelectedProject) => {
-  dataStoreName.value = `${newSelectedProject.id}`;
+  if (newSelectedProject) {
+    dataStoreName.value = `${newSelectedProject.id}`;
+  }
 });
 
 function activateHelp(helpField: HelpTextField) {
@@ -112,7 +126,7 @@ function verifyValuesFilled(settings: object): boolean {
 }
 
 async function onSubmitCreateDataStoreAndProject() {
-  const validatedPath = validatePath(path.value); // Adds "/" to name if missing
+  const validatedPath = validatePath(path.value);
   const datastoreSettings = {
     name: dataStoreName.value,
     host: host.value,
@@ -123,23 +137,20 @@ async function onSubmitCreateDataStoreAndProject() {
 
   const configSettings: BodyKongInitializeKongInitializePost = {
     datastore: datastoreSettings,
-    project_id: selectedProject.value.id,
+    project_id: selectedProject.value!.id,
     ds_type: selectedDataStoreType.value,
   };
 
   const minioSettings = {
     minio_access_key: bucketAccessKey.value || "",
     minio_secret_key: bucketSecretKey.value || "",
-    // bucket_name: validatedPath, // .replace(/^\//, ""), // Removing leading "/" if present
   };
 
-  // Check settings are filled in
-  let settingsValidated: boolean;
-  settingsValidated = verifyValuesFilled(datastoreSettings);
+  let settingsValidated = verifyValuesFilled(datastoreSettings);
 
   if (
-    selectedDataStoreType.value == DataStoreType.S3 &&
-    selectedBucketAccessPolicy.value == "Private"
+    selectedDataStoreType.value === DataStoreType.S3 &&
+    selectedBucketAccessPolicy.value === "Private"
   ) {
     configSettings.minio_config = minioSettings;
     settingsValidated = settingsValidated && verifyValuesFilled(minioSettings);
@@ -160,7 +171,7 @@ async function onSubmitCreateDataStoreAndProject() {
           life: 5000,
         });
         connMsg.value = "Invalid connection!";
-      }); // Set the response to undefined if an error occurs
+      });
 
     loading.value = false;
 
@@ -217,7 +228,7 @@ async function onSubmitCreateDataStoreAndProject() {
               </InputGroupAddon>
               <Select
                 v-model="selectedProject"
-                :options="props.projects"
+                :options="availableProjects"
                 class="project-picker"
                 optionLabel="name"
                 placeholder="Select a Project"
diff --git a/app/components/data-stores/create/ResourceManagerTabs.vue b/app/components/data-stores/create/ResourceManagerTabs.vue
deleted file mode 100644
index d3dbc453..00000000
--- a/app/components/data-stores/create/ResourceManagerTabs.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<script lang="ts" setup>
-import { getProjectNodes } from "~/composables/useAPIFetch";
-import type { ProjectNode } from "~/services/Api";
-import DataStoreProjectInitializer from "~/components/data-stores/create/DataStoreProjectInitializer.vue";
-
-export interface availableProject {
-  name: string | undefined | undefined;
-  id: string;
-  dropdown: string;
-}
-
-const availableProjects = ref<availableProject[]>([]);
-
-const { data: projects, status: projStatus } = await getProjectNodes();
-
-if (projStatus.value === "success") {
-  const projectData = projects.value as unknown as Array<ProjectNode>;
-  if (projectData.length > 0) {
-    availableProjects.value = projectData.map((proj: ProjectNode) => {
-      return {
-        name: proj.project?.name,
-        id: proj.project_id,
-      };
-    });
-  }
-}
-</script>
-
-<template>
-  <div class="card">
-    <DataStoreProjectInitializer
-      v-if="availableProjects"
-      :projects="availableProjects"
-    />
-  </div>
-</template>
-
-<style lang="scss" scoped></style>
diff --git a/app/components/data-stores/create/index.ts b/app/components/data-stores/create/index.ts
index 2634a02f..adede015 100644
--- a/app/components/data-stores/create/index.ts
+++ b/app/components/data-stores/create/index.ts
@@ -7,3 +7,8 @@ export enum HelpTextField {
   Server = "server",
   Type = "type",
 }
+
+export interface AvailableProject {
+  name: string | undefined | null;
+  id: string;
+}
diff --git a/app/components/header/CleanupDialog.vue b/app/components/header/CleanupDialog.vue
index 351f1362..a6a3c211 100644
--- a/app/components/header/CleanupDialog.vue
+++ b/app/components/header/CleanupDialog.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { type CleanupPodResponse } from "~/services/Api";
+import { type CleanupPodResponse, type DeleteService } from "~/services/Api";
 import { useToast } from "primevue/usetoast";
 import { useNuxtApp } from "nuxt/app";
 import Dialog from "primevue/dialog";
@@ -52,6 +52,13 @@ const cleanUpOptions = ref<cleanUpOption[]>([
       message: "The Result Service will be restarted!",
     },
   },
+  {
+    name: "Data Stores",
+    data: {
+      ep: "datastore",
+      message: "All orphaned data stores will be removed!",
+    },
+  },
   {
     name: "Keycloak",
     data: {
@@ -80,35 +87,57 @@ const handleCleanupShow = () => {
 
 async function cleanUpResource(endpoint: string) {
   loading.value = true;
+  let cleanupResponse: CleanupPodResponse | DeleteService | null;
+  let modifiedResources: number | string = 0;
 
-  const cleanupResponse: CleanupPodResponse = (await useNuxtApp()
-    .$hubApi(`/po/cleanup/${endpoint}`, {
-      method: "DELETE",
-    })
-    .catch(() => {
-      toast.add({
-        severity: "error",
-        summary: "Unable to perform cleanup",
-        detail: "There was an error while deleting or restarting the resource.",
-        life: 5000,
-      });
-    })) as CleanupPodResponse;
+  // Only one kong cleanup endpoint
+  if (endpoint === "datastore") {
+    cleanupResponse = (await useNuxtApp()
+      .$hubApi(`/kong/${endpoint}`, {
+        method: "DELETE",
+      })
+      .catch(() => {
+        toast.add({
+          severity: "error",
+          summary: "Unable to perform cleanup",
+          detail:
+            "There was an error while deleting or restarting the resource.",
+          life: 5000,
+        });
+      })) as DeleteService;
+    if (cleanupResponse) {
+      modifiedResources = cleanupResponse.count;
+    }
+  } else {
+    cleanupResponse = (await useNuxtApp()
+      .$hubApi(`/po/cleanup/${endpoint}`, {
+        method: "DELETE",
+      })
+      .catch(() => {
+        toast.add({
+          severity: "error",
+          summary: "Unable to perform cleanup",
+          detail:
+            "There was an error while deleting or restarting the resource.",
+          life: 5000,
+        });
+      })) as CleanupPodResponse;
+    if (cleanupResponse && cleanupResponse.zombies) {
+      modifiedResources = cleanupResponse.zombies;
+    }
+  }
 
   if (cleanupResponse) {
+    let detail = "Cleanup request successfully submitted";
+    if (modifiedResources) {
+      detail += ", number of modified resources: " + modifiedResources;
+    }
     toast.add({
       severity: "info",
       summary: "Cleanup Started",
-      detail: "Cleanup request successfully submitted",
+      detail: detail,
       life: 5000,
     });
-    if (cleanupResponse.zombies) {
-      toast.add({
-        severity: "info",
-        summary: "Zombie Report",
-        detail: cleanupResponse.zombies,
-        life: 8000,
-      });
-    }
   }
   loading.value = false;
   cleanupVisible.value = false;
diff --git a/app/composables/useAPIFetch.ts b/app/composables/useAPIFetch.ts
index 85859269..131faf92 100644
--- a/app/composables/useAPIFetch.ts
+++ b/app/composables/useAPIFetch.ts
@@ -7,10 +7,10 @@ import type {
   ListConsumers,
   ListRoutes,
   ListServices,
-  NodeSettings,
   Project,
   ProjectNode,
   Service,
+  UserSettings,
 } from "~/services/Api";
 
 import { useFetch, type UseFetchOptions, useNuxtApp } from "nuxt/app";
@@ -38,7 +38,7 @@ export function getEvents(opts?) {
 
 // Node endpoints
 export function getNodeConfiguration(opts?) {
-  return useAPIFetch<NodeSettings>("/node/settings", {
+  return useAPIFetch<UserSettings>("/node/settings", {
     ...opts,
     method: "GET",
   });
diff --git a/app/composables/useDataStoreList.ts b/app/composables/useDataStoreList.ts
new file mode 100644
index 00000000..12fcd70c
--- /dev/null
+++ b/app/composables/useDataStoreList.ts
@@ -0,0 +1,82 @@
+import { ref, watchEffect } from "vue";
+import { getDataStores, getProjects } from "~/composables/useAPIFetch";
+import { formatDataRow } from "~/utils/format-data-row";
+import type { ModifiedDetailedService } from "~/services/modifiedApiInterfaces";
+import type { DetailedAnalysis, Project, Route } from "~/services/Api";
+
+export function buildProjectNameMap(
+  projects: Project[] | DetailedAnalysis[],
+): Map<string, string | undefined> {
+  const map = new Map<string, string | undefined>();
+  projects.forEach((entry) => {
+    if (entry.id) {
+      map.set(entry.id, entry.name ?? "N/A");
+    }
+  });
+  return map;
+}
+
+export function extractProjectIdFromPath(
+  paths: string[] | null | undefined,
+): string | undefined {
+  const firstPath = paths?.[0];
+  return firstPath?.split("/")[1];
+}
+
+const DATA_ROW_UNIX_COLS = ["created_at", "updated_at"];
+
+export async function useDataStoreList() {
+  const dataStores = ref<ModifiedDetailedService[]>([]);
+  const projectNameMap = ref<Map<string, string | undefined>>(new Map());
+  const loading = ref(true);
+
+  const {
+    data: dsResp,
+    status: dsStatus,
+    error: dsError,
+    refresh,
+  } = await getDataStores(true, { lazy: true });
+
+  const { data: projectResp } = await getProjects({ lazy: true });
+
+  watchEffect(() => {
+    if (dsStatus.value === "pending") return;
+
+    if (dsResp.value?.data && dsStatus.value === "success") {
+      let formatted = formatDataRow(
+        dsResp.value.data,
+        DATA_ROW_UNIX_COLS,
+        [],
+      ) as ModifiedDetailedService[];
+
+      formatted = formatted.filter((s) => s.name !== "kong-admin-service");
+
+      formatted.forEach((store) => {
+        if (store.routes) {
+          store.routes = formatDataRow(
+            store.routes,
+            DATA_ROW_UNIX_COLS,
+            [],
+          ) as Route[];
+          store.routes?.forEach((route: Route) => {
+            route["projectId"] = extractProjectIdFromPath(route.paths);
+          });
+        }
+      });
+
+      dataStores.value = formatted;
+    } else if (dsError.value?.statusCode === 500) {
+      dataStores.value = [];
+    }
+
+    loading.value = false;
+  });
+
+  watchEffect(() => {
+    if (projectResp.value) {
+      projectNameMap.value = buildProjectNameMap(projectResp.value);
+    }
+  });
+
+  return { dataStores, projectNameMap, loading, refresh };
+}
diff --git a/app/pages/data-stores/create.vue b/app/pages/data-stores/create.vue
index b157a67c..27579019 100644
--- a/app/pages/data-stores/create.vue
+++ b/app/pages/data-stores/create.vue
@@ -1,9 +1,7 @@
-<script setup lang="ts">
-import ResourceManagerTabs from "~/components/data-stores/create/ResourceManagerTabs.vue";
+<script lang="ts" setup>
+import DataStoreProjectInitializer from "~/components/data-stores/create/DataStoreProjectInitializer.vue";
 </script>
 
 <template>
-  <ResourceManagerTabs />
+  <DataStoreProjectInitializer />
 </template>
-
-<style scoped lang="scss"></style>
diff --git a/app/services/Api.ts b/app/services/Api.ts
index 751f98e9..fdcb9b21 100644
--- a/app/services/Api.ts
+++ b/app/services/Api.ts
@@ -597,6 +597,17 @@ export interface DeleteProject {
   status?: number | null;
 }
 
+/**
+ * DeleteService
+ * Response for deleting orphaned services.
+ */
+export interface DeleteService {
+  /** Deleted */
+  deleted: Record<string, any>[];
+  /** Count */
+  count: number;
+}
+
 /**
  * DetailedAnalysis
  * Model representing a single detailed analysis.
@@ -1850,7 +1861,7 @@ export enum ContentType {
 }
 
 export class HttpClient<SecurityDataType = unknown> {
-  public baseUrl: string = "/api";
+  public baseUrl: string = "http://localhost:5000";
   private securityData: SecurityDataType | null = null;
   private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
   private abortControllers = new Map<CancelToken, AbortController>();
@@ -2056,7 +2067,7 @@ export class HttpClient<SecurityDataType = unknown> {
  * @title FLAME Hub Adapter API
  * @version 0.1.0
  * @license Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0.html)
- * @baseUrl /api
+ * @baseUrl http://localhost:5000
  * @contact Bruce Schultz <bschultz013@gmail.com> (https://docs.privateaim.net/about/team.html)
  *
  * FLAME Hub Adapter gateway API for interacting with downstream services.
@@ -2924,6 +2935,26 @@ export class Api<
         ...params,
       }),
 
+    /**
+     * @description Delete all data stores (services) that have no associated project (route).
+     *
+     * @tags Kong
+     * @name KongDatastoreDeleteOrphanedKongDatastoreDelete
+     * @summary Kong.Datastore.Delete Orphaned
+     * @request DELETE:/kong/datastore
+     * @secure
+     */
+    kongDatastoreDeleteOrphanedKongDatastoreDelete: (
+      params: RequestParams = {},
+    ) =>
+      this.request<DeleteService, void>({
+        path: `/kong/datastore`,
+        method: "DELETE",
+        secure: true,
+        format: "json",
+        ...params,
+      }),
+
     /**
      * @description Create a datastore (referred to as services by kong) by providing necessary metadata.
      *
diff --git a/app/services/hub_adapter_swagger.json b/app/services/hub_adapter_swagger.json
index 283e3539..4d51d073 100644
--- a/app/services/hub_adapter_swagger.json
+++ b/app/services/hub_adapter_swagger.json
@@ -15,8 +15,10 @@
     "version": "0.1.0"
   },
   "servers": [
-    { "url": "/api" },
-    { "url": "http://localhost:5000", "description": "api" }
+    {
+      "url": "http://localhost:5000",
+      "description": "api"
+    }
   ],
   "paths": {
     "/po": {
@@ -40,21 +42,31 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
+                "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": {
@@ -68,13 +80,21 @@
             "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}": {
@@ -83,7 +103,11 @@
         "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",
@@ -103,16 +127,22 @@
             "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"
+                }
               }
             }
           }
@@ -130,13 +160,21 @@
             "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}": {
@@ -145,7 +183,11 @@
         "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",
@@ -153,8 +195,13 @@
             "required": true,
             "schema": {
               "anyOf": [
-                { "type": "string", "format": "uuid" },
-                { "type": "null" }
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "null"
+                }
               ],
               "description": "UUID of the analysis.",
               "title": "Analysis Id"
@@ -167,16 +214,22 @@
             "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"
+                }
               }
             }
           }
@@ -194,13 +247,21 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/PodProgressResponse" }
+                "schema": {
+                  "$ref": "#/components/schemas/PodProgressResponse"
+                }
               }
             }
           },
-          "404": { "description": "Not found" }
+          "404": {
+            "description": "Not found"
+          }
         },
-        "security": [{ "JWT": [] }]
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
       }
     },
     "/po/status/{analysis_id}": {
@@ -209,7 +270,11 @@
         "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",
@@ -217,8 +282,13 @@
             "required": true,
             "schema": {
               "anyOf": [
-                { "type": "string", "format": "uuid" },
-                { "type": "null" }
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "null"
+                }
               ],
               "description": "UUID of the analysis.",
               "title": "Analysis Id"
@@ -231,16 +301,22 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/PodProgressResponse" }
+                "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"
+                }
               }
             }
           }
@@ -258,13 +334,21 @@
             "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}": {
@@ -273,7 +357,11 @@
         "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",
@@ -281,8 +369,13 @@
             "required": true,
             "schema": {
               "anyOf": [
-                { "type": "string", "format": "uuid" },
-                { "type": "null" }
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "null"
+                }
               ],
               "description": "UUID of the analysis.",
               "title": "Analysis Id"
@@ -295,16 +388,22 @@
             "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"
+                }
               }
             }
           }
@@ -322,13 +421,21 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
+                "schema": {
+                  "$ref": "#/components/schemas/StatusOnlyResponse"
+                }
               }
             }
           },
-          "404": { "description": "Not found" }
+          "404": {
+            "description": "Not found"
+          }
         },
-        "security": [{ "JWT": [] }]
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
       }
     },
     "/po/stop/{analysis_id}": {
@@ -337,7 +444,11 @@
         "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",
@@ -345,8 +456,13 @@
             "required": true,
             "schema": {
               "anyOf": [
-                { "type": "string", "format": "uuid" },
-                { "type": "null" }
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "null"
+                }
               ],
               "description": "UUID of the analysis.",
               "title": "Analysis Id"
@@ -359,16 +475,22 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
+                "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"
+                }
               }
             }
           }
@@ -386,13 +508,21 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
+                "schema": {
+                  "$ref": "#/components/schemas/StatusOnlyResponse"
+                }
               }
             }
           },
-          "404": { "description": "Not found" }
+          "404": {
+            "description": "Not found"
+          }
         },
-        "security": [{ "JWT": [] }]
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
       }
     },
     "/po/delete/{analysis_id}": {
@@ -401,7 +531,11 @@
         "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",
@@ -409,8 +543,13 @@
             "required": true,
             "schema": {
               "anyOf": [
-                { "type": "string", "format": "uuid" },
-                { "type": "null" }
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "null"
+                }
               ],
               "description": "UUID of the analysis.",
               "title": "Analysis Id"
@@ -423,16 +562,22 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
+                "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"
+                }
               }
             }
           }
@@ -445,7 +590,11 @@
         "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",
@@ -463,16 +612,22 @@
             "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"
+                }
               }
             }
           }
@@ -501,21 +656,31 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
+                "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}": {
@@ -524,7 +689,11 @@
         "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",
@@ -532,8 +701,13 @@
             "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"
@@ -546,16 +720,22 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/StatusOnlyResponse" }
+                "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"
+                }
               }
             }
           }
@@ -573,13 +753,21 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/UserSettings" }
+                "schema": {
+                  "$ref": "#/components/schemas/UserSettings"
+                }
               }
             }
           },
-          "404": { "description": "Not found" }
+          "404": {
+            "description": "Not found"
+          }
         },
-        "security": [{ "JWT": [] }]
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
       },
       "post": {
         "tags": ["Node"],
@@ -602,21 +790,31 @@
             "description": "Successful Response",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/UserSettings" }
+                "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": {
@@ -631,16 +829,24 @@
             "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}": {
@@ -649,7 +855,11 @@
         "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",
@@ -657,8 +867,13 @@
             "required": true,
             "schema": {
               "anyOf": [
-                { "type": "string", "format": "uuid" },
-                { "type": "string" }
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "string"
+                }
               ],
               "description": "Project UUID.",
               "title": "Project Id"
@@ -671,16 +886,22 @@
             "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"
+                }
               }
             }
           }
@@ -693,7 +914,11 @@
         "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",
@@ -713,18 +938,24 @@
               "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"
+                }
               }
             }
           }
@@ -737,7 +968,11 @@
         "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",
@@ -745,8 +980,13 @@
             "required": true,
             "schema": {
               "anyOf": [
-                { "type": "string", "format": "uuid" },
-                { "type": "string" }
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "string"
+                }
               ],
               "description": "Proposal object UUID.",
               "title": "Project Node Id"
@@ -759,16 +999,22 @@
             "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"
+                }
               }
             }
           }
@@ -779,7 +1025,11 @@
         "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",
@@ -787,8 +1037,13 @@
             "required": true,
             "schema": {
               "anyOf": [
-                { "type": "string", "format": "uuid" },
-                { "type": "string" }
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "string"
+                }
               ],
               "description": "Proposal object UUID.",
               "title": "Project Node Id"
@@ -811,16 +1066,22 @@
             "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"
+                }
               }
             }
           }
@@ -833,7 +1094,11 @@
         "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",
@@ -853,18 +1118,24 @@
               "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"
+                }
               }
             }
           }
@@ -877,7 +1148,11 @@
         "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",
@@ -885,8 +1160,13 @@
             "required": true,
             "schema": {
               "anyOf": [
-                { "type": "string", "format": "uuid" },
-                { "type": "string" }
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "string"
+                }
               ],
               "description": "Analysis Node UUID.",
               "title": "Analysis Node Id"
@@ -899,16 +1179,22 @@
             "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"
+                }
               }
             }
           }
@@ -919,7 +1205,11 @@
         "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",
@@ -927,8 +1217,13 @@
             "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"
@@ -951,16 +1246,22 @@
             "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"
+                }
               }
             }
           }
@@ -979,16 +1280,24 @@
             "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}": {
@@ -997,7 +1306,11 @@
         "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",
@@ -1005,8 +1318,13 @@
             "required": true,
             "schema": {
               "anyOf": [
-                { "type": "string", "format": "uuid" },
-                { "type": "string" }
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "string"
+                }
               ],
               "description": "Analysis UUID.",
               "title": "Analysis Id"
@@ -1019,16 +1337,22 @@
             "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"
+                }
               }
             }
           }
@@ -1039,7 +1363,11 @@
         "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",
@@ -1047,8 +1375,13 @@
             "required": true,
             "schema": {
               "anyOf": [
-                { "type": "string", "format": "uuid" },
-                { "type": "string" }
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "string"
+                }
               ],
               "description": "Analysis UUID.",
               "title": "Analysis Id"
@@ -1073,16 +1406,22 @@
             "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"
+                }
               }
             }
           }
@@ -1101,16 +1440,24 @@
             "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}": {
@@ -1119,7 +1466,11 @@
         "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",
@@ -1127,8 +1478,13 @@
             "required": true,
             "schema": {
               "anyOf": [
-                { "type": "string", "format": "uuid" },
-                { "type": "string" }
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "string"
+                }
               ],
               "description": "Node UUID.",
               "title": "Node Id"
@@ -1141,16 +1497,22 @@
             "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"
+                }
               }
             }
           }
@@ -1168,13 +1530,21 @@
             "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}": {
@@ -1183,16 +1553,25 @@
         "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": [
           {
-            "name": "registry_project_id",
+            "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"
@@ -1205,16 +1584,22 @@
             "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"
+                }
               }
             }
           }
@@ -1242,21 +1627,31 @@
             "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": {
@@ -1268,11 +1663,21 @@
         "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}": {
@@ -1281,7 +1686,11 @@
         "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",
@@ -1289,8 +1698,13 @@
             "required": true,
             "schema": {
               "anyOf": [
-                { "type": "string", "format": "uuid" },
-                { "type": "string" }
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "string"
+                }
               ],
               "description": "Bucket UUID.",
               "title": "Analysis Bucket Id"
@@ -1303,16 +1717,22 @@
             "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"
+                }
               }
             }
           }
@@ -1328,11 +1748,21 @@
         "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}": {
@@ -1341,7 +1771,11 @@
         "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",
@@ -1349,8 +1783,13 @@
             "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"
@@ -1361,14 +1800,22 @@
         "responses": {
           "200": {
             "description": "Successful Response",
-            "content": { "application/json": { "schema": {} } }
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
+          },
+          "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"
+                }
               }
             }
           }
@@ -1381,7 +1828,11 @@
         "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": [] }],
+        "security": [
+          {
+            "JWT": []
+          }
+        ],
         "parameters": [
           {
             "name": "project_id",
@@ -1389,8 +1840,13 @@
             "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"
@@ -1401,14 +1857,22 @@
         "responses": {
           "200": {
             "description": "Successful Response",
-            "content": { "application/json": { "schema": {} } }
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
+          },
+          "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"
+                }
               }
             }
           }
@@ -1421,7 +1885,11 @@
         "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",
@@ -1441,18 +1909,50 @@
             "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"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": ["Kong"],
+        "summary": "Kong.Datastore.Delete Orphaned",
+        "description": "Delete all data stores (services) that have no associated project (route).",
+        "operationId": "kong_datastore_delete_orphaned_kong_datastore_delete",
+        "security": [
+          {
+            "JWT": []
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeleteService"
+                }
               }
             }
+          },
+          "404": {
+            "description": "Not found"
           }
         }
       },
@@ -1461,7 +1961,11 @@
         "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": {
@@ -1477,16 +1981,22 @@
             "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"
+                }
               }
             }
           }
@@ -1499,7 +2009,11 @@
         "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",
@@ -1507,8 +2021,13 @@
             "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"
@@ -1533,16 +2052,22 @@
             "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"
+                }
               }
             }
           }
@@ -1555,7 +2080,11 @@
         "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",
@@ -1572,14 +2101,22 @@
         "responses": {
           "200": {
             "description": "Successful Response",
-            "content": { "application/json": { "schema": {} } }
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
+          },
+          "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"
+                }
               }
             }
           }
@@ -1592,7 +2129,11 @@
         "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",
@@ -1612,16 +2153,22 @@
             "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"
+                }
               }
             }
           }
@@ -1632,7 +2179,11 @@
         "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": {
@@ -1654,12 +2205,16 @@
               }
             }
           },
-          "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"
+                }
               }
             }
           }
@@ -1672,7 +2227,11 @@
         "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",
@@ -1680,8 +2239,13 @@
             "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"
@@ -1706,16 +2270,22 @@
             "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"
+                }
               }
             }
           }
@@ -1749,17 +2319,25 @@
               }
             }
           },
-          "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}": {
@@ -1768,7 +2346,11 @@
         "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",
@@ -1787,16 +2369,22 @@
             "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"
+                }
               }
             }
           }
@@ -1809,14 +2397,25 @@
         "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"
             },
@@ -1828,16 +2427,22 @@
             "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"
+                }
               }
             }
           }
@@ -1848,7 +2453,11 @@
         "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": {
@@ -1864,16 +2473,22 @@
             "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"
+                }
               }
             }
           }
@@ -1886,7 +2501,11 @@
         "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",
@@ -1894,9 +2513,16 @@
             "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"
@@ -1908,7 +2534,14 @@
             "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"
             },
@@ -1920,16 +2553,22 @@
             "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"
+                }
               }
             }
           }
@@ -1940,14 +2579,26 @@
         "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",
             "in": "path",
             "required": true,
             "schema": {
-              "type": "string",
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              ],
               "description": "UUID or unique name of the analysis.",
               "title": "Analysis Id"
             },
@@ -1957,14 +2608,22 @@
         "responses": {
           "200": {
             "description": "Successful Response",
-            "content": { "application/json": { "schema": {} } }
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
+          },
+          "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"
+                }
               }
             }
           }
@@ -1977,7 +2636,11 @@
         "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",
@@ -1985,8 +2648,13 @@
             "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"
@@ -2007,14 +2675,22 @@
         "responses": {
           "200": {
             "description": "Successful Response",
-            "content": { "application/json": { "schema": {} } }
+            "content": {
+              "application/json": {
+                "schema": {}
+              }
+            }
+          },
+          "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"
+                }
               }
             }
           }
@@ -2032,7 +2708,9 @@
             "description": "Return HTTP Status Code 200 (OK)",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/HealthCheck" }
+                "schema": {
+                  "$ref": "#/components/schemas/HealthCheck"
+                }
               }
             }
           }
@@ -2080,16 +2758,22 @@
             "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"
+                }
               }
             }
           }
@@ -2102,14 +2786,25 @@
         "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"
             },
@@ -2120,7 +2815,14 @@
             "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"
@@ -2132,7 +2834,14 @@
             "in": "query",
             "required": false,
             "schema": {
-              "anyOf": [{ "type": "string" }, { "type": "null" }],
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
               "description": "Filter events by service tag",
               "title": "Service Tag"
             },
@@ -2143,7 +2852,14 @@
             "in": "query",
             "required": false,
             "schema": {
-              "anyOf": [{ "type": "string" }, { "type": "null" }],
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
               "description": "Filter events by event name",
               "title": "Event Name"
             },
@@ -2154,7 +2870,14 @@
             "in": "query",
             "required": false,
             "schema": {
-              "anyOf": [{ "type": "string" }, { "type": "null" }],
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
               "description": "Filter events by username",
               "title": "Username"
             },
@@ -2166,8 +2889,13 @@
             "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"
@@ -2180,8 +2908,13 @@
             "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"
@@ -2194,16 +2927,22 @@
             "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"
+                }
               }
             }
           }
@@ -2219,11 +2958,21 @@
         "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": {
@@ -2235,11 +2984,21 @@
         "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": []
+          }
+        ]
       }
     }
   },
@@ -2249,28 +3008,60 @@
         "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."
@@ -2283,7 +3074,14 @@
       "ACLConsumer": {
         "properties": {
           "id": {
-            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Id"
           }
         },
@@ -2294,11 +3092,25 @@
       "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": {
@@ -2308,15 +3120,25 @@
           },
           "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"
           },
@@ -2327,9 +3149,19 @@
             "type": "array",
             "title": "Image Command Arguments"
           },
-          "id": { "type": "string", "format": "uuid", "title": "Id" },
-          "nodes": { "type": "integer", "title": "Nodes" },
-          "nodes_approved": { "type": "integer", "title": "Nodes Approved" },
+          "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"
@@ -2368,7 +3200,9 @@
                   "failed"
                 ]
               },
-              { "type": "null" }
+              {
+                "type": "null"
+              }
             ],
             "title": "Build Status"
           },
@@ -2377,19 +3211,47 @@
             "title": "Build Nodes Valid"
           },
           "build_progress": {
-            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Build Progress"
           },
           "build_hash": {
-            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Build Hash"
           },
           "build_os": {
-            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Build Os"
           },
           "build_size": {
-            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Build Size"
           },
           "distribution_status": {
@@ -2406,12 +3268,21 @@
                   "failed"
                 ]
               },
-              { "type": "null" }
+              {
+                "type": "null"
+              }
             ],
             "title": "Distribution Status"
           },
           "distribution_progress": {
-            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Distribution Progress"
           },
           "execution_status": {
@@ -2428,12 +3299,21 @@
                   "failed"
                 ]
               },
-              { "type": "null" }
+              {
+                "type": "null"
+              }
             ],
             "title": "Execution Status"
           },
           "execution_progress": {
-            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Execution Progress"
           },
           "created_at": {
@@ -2448,8 +3328,12 @@
           },
           "registry": {
             "anyOf": [
-              { "$ref": "#/components/schemas/Registry" },
-              { "type": "null" }
+              {
+                "$ref": "#/components/schemas/Registry"
+              },
+              {
+                "type": "null"
+              }
             ]
           },
           "realm_id": {
@@ -2457,12 +3341,22 @@
             "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"
+              }
             ]
           }
         },
@@ -2501,7 +3395,9 @@
       },
       "AnalysisBucket": {
         "properties": {
-          "type": { "$ref": "#/components/schemas/AnalysisBucketType" },
+          "type": {
+            "$ref": "#/components/schemas/AnalysisBucketType"
+          },
           "bucket_id": {
             "type": "string",
             "format": "uuid",
@@ -2512,7 +3408,11 @@
             "format": "uuid",
             "title": "Analysis Id"
           },
-          "id": { "type": "string", "format": "uuid", "title": "Id" },
+          "id": {
+            "type": "string",
+            "format": "uuid",
+            "title": "Id"
+          },
           "created_at": {
             "type": "string",
             "format": "date-time",
@@ -2523,7 +3423,9 @@
             "format": "date-time",
             "title": "Updated At"
           },
-          "analysis": { "$ref": "#/components/schemas/Analysis" },
+          "analysis": {
+            "$ref": "#/components/schemas/Analysis"
+          },
           "realm_id": {
             "type": "string",
             "format": "uuid",
@@ -2549,23 +3451,60 @@
       },
       "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"
           }
         },
@@ -2580,12 +3519,25 @@
             "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"
           },
@@ -2603,24 +3555,54 @@
                   "failed"
                 ]
               },
-              { "type": "null" }
+              {
+                "type": "null"
+              }
             ],
             "title": "Execution Status"
           },
           "execution_progress": {
-            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "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": {
@@ -2633,8 +3615,12 @@
             "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",
@@ -2666,9 +3652,18 @@
       },
       "AnalysisStatus": {
         "properties": {
-          "status": { "$ref": "#/components/schemas/PodStatus" },
+          "status": {
+            "$ref": "#/components/schemas/PodStatus"
+          },
           "progress": {
-            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Progress"
           }
         },
@@ -2680,12 +3675,26 @@
       "AutostartSettings": {
         "properties": {
           "enabled": {
-            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Enabled",
             "default": false
           },
           "interval": {
-            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Interval",
             "default": 60
           }
@@ -2716,17 +3725,27 @@
         "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"
           },
@@ -2737,8 +3756,13 @@
           },
           "node_id": {
             "anyOf": [
-              { "type": "string", "format": "uuid" },
-              { "type": "string" }
+              {
+                "type": "string",
+                "format": "uuid"
+              },
+              {
+                "type": "string"
+              }
             ],
             "title": "Node Id",
             "description": "Node UUID"
@@ -2778,16 +3802,26 @@
         "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"
@@ -2810,8 +3844,12 @@
           },
           "minio_config": {
             "anyOf": [
-              { "$ref": "#/components/schemas/MinioConfig" },
-              { "type": "null" }
+              {
+                "$ref": "#/components/schemas/MinioConfig"
+              },
+              {
+                "type": "null"
+              }
             ],
             "description": "Minio configuration"
           }
@@ -2824,14 +3862,21 @@
         "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'",
@@ -2848,8 +3893,12 @@
           },
           "minio_config": {
             "anyOf": [
-              { "$ref": "#/components/schemas/MinioConfig" },
-              { "type": "null" }
+              {
+                "$ref": "#/components/schemas/MinioConfig"
+              },
+              {
+                "type": "null"
+              }
             ],
             "description": "Minio configuration"
           }
@@ -2862,16 +3911,26 @@
         "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"
@@ -2879,10 +3938,14 @@
           "methods": {
             "anyOf": [
               {
-                "items": { "$ref": "#/components/schemas/HttpMethodCode" },
+                "items": {
+                  "$ref": "#/components/schemas/HttpMethodCode"
+                },
                 "type": "array"
               },
-              { "type": "null" }
+              {
+                "type": "null"
+              }
             ],
             "title": "Methods",
             "description": "List of acceptable HTTP methods"
@@ -2890,10 +3953,14 @@
           "protocols": {
             "anyOf": [
               {
-                "items": { "$ref": "#/components/schemas/ProtocolCode" },
+                "items": {
+                  "$ref": "#/components/schemas/ProtocolCode"
+                },
                 "type": "array"
               },
-              { "type": "null" }
+              {
+                "type": "null"
+              }
             ],
             "title": "Protocols",
             "description": "List of acceptable transfer protocols. A combo of 'http', 'grpc', 'grpcs', 'tls', 'tcp'"
@@ -2912,16 +3979,26 @@
         "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"
@@ -2933,8 +4010,13 @@
           },
           "node_id": {
             "anyOf": [
-              { "type": "string", "format": "uuid" },
-              { "type": "string" }
+              {
+                "type": "string",
+                "format": "uuid"
+              },
+              {
+                "type": "string"
+              }
             ],
             "title": "Node Id",
             "description": "Node UUID"
@@ -2961,27 +4043,69 @@
       "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"
           }
         },
@@ -2992,29 +4116,64 @@
       "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."
           }
@@ -3026,7 +4185,14 @@
       "CreateServiceRequestClientCertificate": {
         "properties": {
           "id": {
-            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Id"
           }
         },
@@ -3044,12 +4210,23 @@
         "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"
           }
         },
@@ -3058,14 +4235,48 @@
         "title": "DeleteProject",
         "description": "Response from disconnecting a project from a datastore."
       },
+      "DeleteService": {
+        "properties": {
+          "deleted": {
+            "items": {
+              "additionalProperties": true,
+              "type": "object"
+            },
+            "type": "array",
+            "title": "Deleted"
+          },
+          "count": {
+            "type": "integer",
+            "title": "Count"
+          }
+        },
+        "type": "object",
+        "required": ["deleted", "count"],
+        "title": "DeleteService",
+        "description": "Response for deleting orphaned services."
+      },
       "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": {
@@ -3075,15 +4286,25 @@
           },
           "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"
           },
@@ -3094,9 +4315,19 @@
             "type": "array",
             "title": "Image Command Arguments"
           },
-          "id": { "type": "string", "format": "uuid", "title": "Id" },
-          "nodes": { "type": "integer", "title": "Nodes" },
-          "nodes_approved": { "type": "integer", "title": "Nodes Approved" },
+          "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"
@@ -3135,7 +4366,9 @@
                   "failed"
                 ]
               },
-              { "type": "null" }
+              {
+                "type": "null"
+              }
             ],
             "title": "Build Status"
           },
@@ -3144,19 +4377,47 @@
             "title": "Build Nodes Valid"
           },
           "build_progress": {
-            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Build Progress"
           },
           "build_hash": {
-            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Build Hash"
           },
           "build_os": {
-            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Build Os"
           },
           "build_size": {
-            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Build Size"
           },
           "distribution_status": {
@@ -3173,12 +4434,21 @@
                   "failed"
                 ]
               },
-              { "type": "null" }
+              {
+                "type": "null"
+              }
             ],
             "title": "Distribution Status"
           },
           "distribution_progress": {
-            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Distribution Progress"
           },
           "execution_status": {
@@ -3195,12 +4465,21 @@
                   "failed"
                 ]
               },
-              { "type": "null" }
+              {
+                "type": "null"
+              }
             ],
             "title": "Execution Status"
           },
           "execution_progress": {
-            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Execution Progress"
           },
           "created_at": {
@@ -3215,8 +4494,12 @@
           },
           "registry": {
             "anyOf": [
-              { "$ref": "#/components/schemas/Registry" },
-              { "type": "null" }
+              {
+                "$ref": "#/components/schemas/Registry"
+              },
+              {
+                "type": "null"
+              }
             ]
           },
           "realm_id": {
@@ -3224,17 +4507,29 @@
             "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"
+              }
             ]
           }
         },
@@ -3275,11 +4570,18 @@
       "DetailedRoute": {
         "properties": {
           "created_at": {
-            "anyOf": [{ "type": "integer" }, { "type": "null" }],
-            "title": "Created At",
-            "description": "Unix epoch when the resource was created."
-          },
-          "destinations": {
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Created At",
+            "description": "Unix epoch when the resource was created."
+          },
+          "destinations": {
             "anyOf": [
               {
                 "items": {
@@ -3287,108 +4589,212 @@
                 },
                 "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."
@@ -3401,27 +4807,50 @@
                 },
                 "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."
           }
@@ -3434,108 +4863,238 @@
         "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
@@ -3543,10 +5102,14 @@
           "routes": {
             "anyOf": [
               {
-                "items": { "$ref": "#/components/schemas/Route" },
+                "items": {
+                  "$ref": "#/components/schemas/Route"
+                },
                 "type": "array"
               },
-              { "type": "null" }
+              {
+                "type": "null"
+              }
             ],
             "title": "Routes",
             "default": []
@@ -3560,22 +5123,34 @@
         "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"
           }
@@ -3587,15 +5162,27 @@
       },
       "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",
@@ -3617,11 +5204,15 @@
       "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"],
@@ -3631,7 +5222,9 @@
       "HTTPValidationError": {
         "properties": {
           "detail": {
-            "items": { "$ref": "#/components/schemas/ValidationError" },
+            "items": {
+              "$ref": "#/components/schemas/ValidationError"
+            },
             "type": "array",
             "title": "Detail"
           }
@@ -3641,7 +5234,11 @@
       },
       "HealthCheck": {
         "properties": {
-          "status": { "type": "string", "title": "Status", "default": "OK" }
+          "status": {
+            "type": "string",
+            "title": "Status",
+            "default": "OK"
+          }
         },
         "type": "object",
         "title": "HealthCheck",
@@ -3668,15 +5265,25 @@
         "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"
           }
@@ -3689,28 +5296,60 @@
         "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."
@@ -3723,7 +5362,14 @@
       "KeyAuthConsumer": {
         "properties": {
           "id": {
-            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Id"
           }
         },
@@ -3733,9 +5379,15 @@
       },
       "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"],
@@ -3743,9 +5395,15 @@
       },
       "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"],
@@ -3756,15 +5414,26 @@
           "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"
           }
@@ -3778,15 +5447,26 @@
           "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"
           }
@@ -3800,15 +5480,26 @@
           "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"
           }
@@ -3819,10 +5510,21 @@
       },
       "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"
@@ -3831,14 +5533,22 @@
         "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"
+              }
             ]
           }
         },
@@ -3848,12 +5558,26 @@
       },
       "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"
@@ -3872,17 +5596,36 @@
                   "failed"
                 ]
               },
-              { "type": "null" }
+              {
+                "type": "null"
+              }
             ],
             "title": "Build Status"
           },
           "build_progress": {
-            "anyOf": [{ "type": "integer" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Build Progress"
           },
-          "name": { "type": "string", "title": "Name" },
+          "name": {
+            "type": "string",
+            "title": "Name"
+          },
           "command": {
-            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Command"
           },
           "command_arguments": {
@@ -3893,7 +5636,9 @@
                 },
                 "type": "array"
               },
-              { "type": "null" }
+              {
+                "type": "null"
+              }
             ],
             "title": "Command Arguments"
           },
@@ -3926,11 +5671,19 @@
       },
       "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"
           }
@@ -3941,10 +5694,22 @@
       },
       "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"],
@@ -3971,7 +5736,14 @@
             "default": "us-east-1"
           },
           "bucket_name": {
-            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Bucket Name"
           },
           "timeout": {
@@ -3980,7 +5752,14 @@
             "default": 100000
           },
           "strip_path_pattern": {
-            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Strip Path Pattern"
           }
         },
@@ -3992,71 +5771,140 @@
       "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": {
             "anyOf": [
-              { "type": "string", "format": "uuid" },
-              { "type": "null" }
+              {
+                "type": "string",
+                "format": "uuid"
+              },
+              {
+                "type": "null"
+              }
             ],
             "title": "Robot Id"
           },
           "client_id": {
             "anyOf": [
-              { "type": "string", "format": "uuid" },
-              { "type": "null" }
+              {
+                "type": "string",
+                "format": "uuid"
+              },
+              {
+                "type": "null"
+              }
             ],
             "title": "Client Id"
           },
@@ -4106,17 +5954,30 @@
         "additionalProperties": {
           "$ref": "#/components/schemas/AnalysisStatus"
         },
-        "propertyNames": { "format": "uuid" },
+        "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",
         "description": "Response with a list of running pods for a given analysis ID"
@@ -4141,24 +6002,53 @@
       "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": {
@@ -4178,15 +6068,25 @@
           },
           "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"
           }
@@ -4209,20 +6109,35 @@
       },
       "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": {
@@ -4235,8 +6150,12 @@
             "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",
@@ -4270,17 +6189,41 @@
       },
       "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",
@@ -4305,7 +6248,10 @@
       },
       "RegistryProject": {
         "properties": {
-          "name": { "type": "string", "title": "Name" },
+          "name": {
+            "type": "string",
+            "title": "Name"
+          },
           "type": {
             "type": "string",
             "enum": [
@@ -4323,39 +6269,98 @@
             "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": {
@@ -4389,7 +6394,14 @@
       "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."
           },
@@ -4401,106 +6413,208 @@
                 },
                 "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."
@@ -4513,27 +6627,50 @@
                 },
                 "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."
           }
@@ -4544,7 +6681,15 @@
       },
       "RouteDestinationsInner": {
         "properties": {
-          "default": { "anyOf": [{}, { "type": "null" }], "title": "Default" }
+          "default": {
+            "anyOf": [
+              {},
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Default"
+          }
         },
         "type": "object",
         "title": "RouteDestinationsInner",
@@ -4553,7 +6698,14 @@
       "RouteService": {
         "properties": {
           "id": {
-            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Id"
           }
         },
@@ -4565,108 +6717,238 @@
         "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
@@ -4679,7 +6961,14 @@
       "ServiceClientCertificate": {
         "properties": {
           "id": {
-            "anyOf": [{ "type": "string" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Id"
           }
         },
@@ -4690,18 +6979,39 @@
       "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"
           },
@@ -4711,33 +7021,71 @@
             "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. "
@@ -4747,26 +7095,53 @@
               {
                 "$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"],
@@ -4789,23 +7164,50 @@
         ]
       },
       "StatusOnlyResponse": {
-        "additionalProperties": { "$ref": "#/components/schemas/PodStatus" },
-        "propertyNames": { "format": "uuid" },
+        "additionalProperties": {
+          "$ref": "#/components/schemas/PodStatus"
+        },
+        "propertyNames": {
+          "format": "uuid"
+        },
         "type": "object",
         "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"
           }
         },
@@ -4817,16 +7219,30 @@
       "UserSettings": {
         "properties": {
           "require_data_store": {
-            "anyOf": [{ "type": "boolean" }, { "type": "null" }],
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ],
             "title": "Require Data Store",
             "default": true
           },
           "autostart": {
             "anyOf": [
-              { "$ref": "#/components/schemas/AutostartSettings" },
-              { "type": "null" }
+              {
+                "$ref": "#/components/schemas/AutostartSettings"
+              },
+              {
+                "type": "null"
+              }
             ],
-            "default": { "enabled": false, "interval": 60 }
+            "default": {
+              "enabled": false,
+              "interval": 60
+            }
           }
         },
         "additionalProperties": false,
@@ -4837,14 +7253,34 @@
       "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" },
-          "input": { "title": "Input" },
-          "ctx": { "type": "object", "title": "Context" }
+          "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"],
diff --git a/app/utils/format-data-row.ts b/app/utils/format-data-row.ts
index f15bee86..f57cfab2 100644
--- a/app/utils/format-data-row.ts
+++ b/app/utils/format-data-row.ts
@@ -6,47 +6,51 @@
  * @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 {
+  AnalysisNode,
+  DetailedService,
+  ProjectNode,
+  Route,
+} from "~/services/Api";
 import type { ModifiedDetailedService } from "~/services/modifiedApiInterfaces";
 
+type FormattableRow =
+  | ProjectNode
+  | DetailedService
+  | ModifiedDetailedService
+  | Route
+  | AnalysisNode;
+
 export function formatDataRow(
-  rowEntries:
-    | ProjectNode[]
-    | ModifiedDetailedService[]
-    | Route[]
-    | AnalysisNode[]
-    | null
-    | undefined,
+  rowEntries: FormattableRow[] | null | undefined,
   datetimeKeys: string[],
   rowExpansionKeys: string[],
 ) {
   if (rowEntries) {
-    return rowEntries.map(
-      (row: ProjectNode | ModifiedDetailedService | Route | AnalysisNode) => {
-        // Create a shallow copy of the row
-        const newRow = { ...row };
+    return rowEntries.map((row: FormattableRow) => {
+      // 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);
+      // 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;
+      const expandData: object = {};
+      rowExpansionKeys.forEach((key) => {
+        if (key in parsedRow) {
+          expandData[key] = parsedRow[key];
+          delete parsedRow[key];
+        }
+      });
+      parsedRow["expand"] = expandData;
 
-        return parsedRow;
-      },
-    );
+      return parsedRow;
+    });
   }
   return rowEntries;
 }
 
 export function parseUnixTimestamp(
-  dataRow: ProjectNode | ModifiedDetailedService | Route | AnalysisNode,
+  dataRow: FormattableRow,
   keysToModify: string[],
 ) {
   const result = { ...dataRow };
diff --git a/test/components/analysis/AnalysisControlButtons.spec.ts b/test/components/analysis/AnalysisControlButtons.spec.ts
index ce821e97..b511497d 100644
--- a/test/components/analysis/AnalysisControlButtons.spec.ts
+++ b/test/components/analysis/AnalysisControlButtons.spec.ts
@@ -56,6 +56,7 @@ describe("AnalysisControlButtons.vue", () => {
         analysisBuildStatus: ProcessStatus.Executed,
         analysisExecutionStatus: initialExecutionStatus,
         analysisNodeId: "8003eefe-e39b-4bd4-aec4-78046c63b39b",
+        analysisDistributionStatus: ProcessStatus.Executed,
         analysisId: analysisId,
         projectId: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
         nodeId: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
@@ -280,6 +281,7 @@ describe("AnalysisControlButtons.vue", () => {
         analysisBuildStatus: ProcessStatus.Executed,
         analysisExecutionStatus: null,
         analysisNodeId: "8003eefe-e39b-4bd4-aec4-78046c63b39b",
+        analysisDistributionStatus: ProcessStatus.Executed,
         analysisId: fakeAnalysisId,
         projectId: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
         nodeId: "e3b89572-327f-4936-8cf0-fbfbcc6336b7",
diff --git a/test/components/data-stores/constants.ts b/test/components/data-stores/constants.ts
index e6af32b9..9450da27 100644
--- a/test/components/data-stores/constants.ts
+++ b/test/components/data-stores/constants.ts
@@ -3,19 +3,17 @@ import {
   type ListConsumers,
   type ListServices,
   type Project,
-} from "../../../app/services/Api";
+} from "@/app/services/Api";
 
 export const validProjectId = "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483";
 export const duplicateProjectId = "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f";
 
 export const fakeParsedProjects = [
   {
-    dropdown: "my-fake-project-1",
     id: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
     name: "my-fake-project-1",
   },
   {
-    dropdown: "my-fake-project-2",
     id: "bab3aa4f-9144-444c-8ec7-6ebbbe8e300f",
     name: "my-fake-project-2",
   },
@@ -200,11 +198,11 @@ export const fakeProjectResp: Project[] = [
     analyses: 17,
     realm_id: "ab1fbc92-3dc8-4bdd-9d51-3b571c2d7aaa",
     user_id: "5ec456e2-e30c-4a29-96de-6425fe5b9355",
-    master_image_id: undefined,
+    master_image_id: null,
     master_image: undefined,
-    description: undefined,
+    description: null,
     nodes: 0,
-    robot_id: undefined,
+    robot_id: null,
   },
 ];
 export const fakeAnalysisResp: Analysis[] = [
@@ -215,17 +213,31 @@ export const fakeAnalysisResp: Analysis[] = [
     name: "T004",
     nodes: 2,
     build_status: "executed",
-    execution_status: undefined,
+    execution_status: null,
     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,
+    master_image_id: null,
     registry: undefined,
     master_image: undefined,
-    description: undefined,
+    description: null,
     configuration_locked: true,
+    nodes_approved: 0,
+    configuration_entrypoint_valid: false,
+    configuration_image_valid: false,
+    configuration_node_aggregator_valid: false,
+    configuration_node_default_valid: false,
+    configuration_nodes_valid: false,
+    build_nodes_valid: false,
+    build_progress: null,
+    build_hash: null,
+    build_os: null,
+    build_size: null,
+    distribution_status: null,
+    distribution_progress: null,
+    execution_progress: null,
   },
 ];
 export const fakeConsumerResp: ListConsumers = {
diff --git a/test/components/data-stores/create/DataStoreProjectInitializer.spec.ts b/test/components/data-stores/create/DataStoreProjectInitializer.spec.ts
index 5441ada0..f88c3897 100644
--- a/test/components/data-stores/create/DataStoreProjectInitializer.spec.ts
+++ b/test/components/data-stores/create/DataStoreProjectInitializer.spec.ts
@@ -1,4 +1,5 @@
 import { useToast } from "primevue/usetoast";
+import { defineComponent, ref } from "vue";
 import { flushPromises, mount } from "@vue/test-utils";
 import {
   afterEach,
@@ -11,8 +12,13 @@ import {
 } from "vitest";
 import DataStoreProjectInitializer from "../../../../app/components/data-stores/create/DataStoreProjectInitializer.vue";
 import { fakeParsedProjects } from "../constants";
-import type { availableProject } from "../../../../app/components/data-stores/create/ResourceManagerTabs.vue";
+import type { AvailableProject } from "../../../../app/components/data-stores/create/index";
 import { DataStoreType } from "../../../../app/services/Api";
+import { getProjectNodes } from "~/composables/useAPIFetch";
+
+vi.mock("~/composables/useAPIFetch", () => ({
+  getProjectNodes: vi.fn(),
+}));
 
 describe("DataStoreProjectInitializer.vue", () => {
   let spy;
@@ -20,6 +26,11 @@ describe("DataStoreProjectInitializer.vue", () => {
 
   let wrapper;
 
+  const DataStoreProjectInitializerTestComponent = defineComponent({
+    components: { DataStoreProjectInitializer },
+    template: "<Suspense><DataStoreProjectInitializer/></Suspense>",
+  });
+
   beforeAll(() => {
     mockToast = { add: vi.fn() };
     vi.mocked(useToast).mockReturnValue(mockToast);
@@ -27,17 +38,31 @@ describe("DataStoreProjectInitializer.vue", () => {
   });
 
   beforeEach(async () => {
-    wrapper = mount(DataStoreProjectInitializer, {
+    vi.mocked(getProjectNodes).mockResolvedValue({
+      // @ts-expect-error data is right
+      data: ref(
+        fakeParsedProjects.map((p) => ({
+          project: { name: p.name },
+          project_id: p.id,
+        })),
+      ),
+      pending: ref(false),
+      error: ref(undefined),
+      status: ref("success"),
+      refresh: vi.fn(),
+      execute: vi.fn(),
+      clear: vi.fn(),
+    });
+
+    wrapper = mount(DataStoreProjectInitializerTestComponent, {
       attachTo: document.body,
-      props: {
-        projects: fakeParsedProjects,
-      },
       global: {
         stubs: {
           teleport: true, // Now dropdowns are included/teleported in root element
         },
       },
     });
+    await flushPromises();
     expect(wrapper).toBeTruthy();
   });
 
@@ -46,6 +71,10 @@ describe("DataStoreProjectInitializer.vue", () => {
     wrapper.unmount();
   });
 
+  function innerVm() {
+    return wrapper.findComponent(DataStoreProjectInitializer).vm;
+  }
+
   async function checkDropdown(
     className: string,
     listItems: string[],
@@ -79,7 +108,7 @@ describe("DataStoreProjectInitializer.vue", () => {
   });
 
   it("Check data store project dropdown options", () => {
-    const dropDownOptions = fakeParsedProjects.map((item) => item.dropdown);
+    const dropDownOptions = fakeParsedProjects.map((item) => item.name);
     checkDropdown(".project-picker", dropDownOptions, "Select a Project");
   });
 
@@ -108,7 +137,7 @@ describe("DataStoreProjectInitializer.vue", () => {
   });
 
   async function checkDataStoreInit(
-    projectDropdown: availableProject,
+    projectDropdown: AvailableProject,
     validConnection: boolean = true,
     toastSeverity: string,
     toastMsg: string,
@@ -124,16 +153,18 @@ describe("DataStoreProjectInitializer.vue", () => {
     expect(wrapper.findAll(".p-select-option").length).toBe(
       fakeParsedProjects.length,
     );
-    const listItem = wrapper.find(
-      `li[aria-label="${projectDropdown.dropdown}"]`,
-    );
+    const listItem = wrapper.find(`li[aria-label="${projectDropdown.name}"]`);
     expect(listItem.exists()).toBe(true);
     await listItem.trigger("click");
     // Can't get manually clicking option to work so manually setting it
-    wrapper.vm.selectedProject = projectDropdown;
-    await wrapper.vm.$nextTick();
+    // Use the actual availableProjects entry to ensure object identity matches Select options
+    const matchingProject = innerVm().availableProjects.find(
+      (p: AvailableProject) => p.id === projectDropdown.id,
+    );
+    innerVm().selectedProject = matchingProject;
+    await innerVm().$nextTick();
     expect(wrapper.find(".project-picker span").text()).toBe(
-      projectDropdown.dropdown,
+      projectDropdown.name,
     );
 
     // Set server name
@@ -147,8 +178,8 @@ describe("DataStoreProjectInitializer.vue", () => {
     expect(pathWrapper.find(".p-inputtext").attributes("value")).toBe(path);
 
     // Set data store type
-    wrapper.vm.selectedDataStoreType = storeType;
-    await wrapper.vm.$nextTick();
+    innerVm().selectedDataStoreType = storeType;
+    await innerVm().$nextTick();
     expect(
       wrapper.find(".data-store-type-input span").text().toLowerCase(),
     ).toBe(storeType);
@@ -222,15 +253,15 @@ describe("DataStoreProjectInitializer.vue", () => {
     ).toBeFalsy(); // Starts on FHIR so should not be in view
     const select = wrapper.findComponent(".data-store-type-picker");
     await select.vm.$emit("update:modelValue", DataStoreType.S3); // Simulate the S3 option being clicked
-    await wrapper.vm.$nextTick();
+    await innerVm().$nextTick();
     expect(wrapper.find(".bucket-access-policy-radio").exists()).toBe(true); // Check radio options exist now
 
     expect(
       wrapper.findComponent(".data-store-path-input-s3-private").exists(),
     ).toBeTruthy();
 
-    wrapper.vm.selectedBucketAccessPolicy = "Public"; // Simulate public being selected
-    await wrapper.vm.$nextTick();
+    innerVm().selectedBucketAccessPolicy = "Public"; // Simulate public being selected
+    await innerVm().$nextTick();
     expect(
       wrapper.findComponent(".data-store-path-input-s3-private").exists(),
     ).toBeFalsy();
diff --git a/test/composables/useDataStoreList.test.ts b/test/composables/useDataStoreList.test.ts
new file mode 100644
index 00000000..e5ee249f
--- /dev/null
+++ b/test/composables/useDataStoreList.test.ts
@@ -0,0 +1,46 @@
+import { expect, test, describe } from "vitest";
+import {
+  buildProjectNameMap,
+  extractProjectIdFromPath,
+} from "~/composables/useDataStoreList";
+
+describe("buildProjectNameMap", () => {
+  test("maps project id to name", () => {
+    const projects = [
+      { id: "abc-123", name: "My Project" },
+      { id: "def-456", name: "Other Project" },
+    ];
+    const map = buildProjectNameMap(projects as any);
+    expect(map.get("abc-123")).toBe("My Project");
+    expect(map.get("def-456")).toBe("Other Project");
+  });
+
+  test("uses N/A when name is undefined", () => {
+    const projects = [{ id: "abc-123", name: undefined }];
+    const map = buildProjectNameMap(projects as any);
+    expect(map.get("abc-123")).toBe("N/A");
+  });
+
+  test("skips entries without id", () => {
+    const projects = [{ id: undefined, name: "No ID" }];
+    const map = buildProjectNameMap(projects as any);
+    expect(map.size).toBe(0);
+  });
+
+  test("returns empty map for empty array", () => {
+    const map = buildProjectNameMap([]);
+    expect(map.size).toBe(0);
+  });
+});
+
+describe("extractProjectIdFromPath", () => {
+  test("extracts the second path segment", () => {
+    expect(extractProjectIdFromPath(["/abc-123/data"])).toBe("abc-123");
+  });
+
+  test("works with uuid-style ids", () => {
+    expect(
+      extractProjectIdFromPath(["/97ed7bca-d56c-41b1-9625-61d20d90690c/fhir"]),
+    ).toBe("97ed7bca-d56c-41b1-9625-61d20d90690c");
+  });
+});