diff --git a/app/assets/css/table.css b/app/assets/css/table.css
index 8ee47c8c..8557a462 100644
--- a/app/assets/css/table.css
+++ b/app/assets/css/table.css
@@ -29,15 +29,19 @@
 }
 
 .structured-table {
-    th:not(:first-child) .p-datatable-column-header-content {
-        justify-content: center;
+    th:not(:first-child) {
+        text-align: center;
 
-        .p-datatable-popover-filter {
-            margin-inline-start: 0.2rem;
-        }
+        .p-datatable-column-header-content {
+            justify-content: center;
+
+            .p-datatable-popover-filter {
+                margin-inline-start: 0.2rem;
+            }
 
-        .p-button-icon-only {
-            width: 1.5rem;
+            .p-button-icon-only {
+                width: 1.5rem;
+            }
         }
     }
 
diff --git a/app/components/analysis/AnalysesTable.vue b/app/components/analysis/AnalysesTable.vue
index bb7e8d1f..216c1c7b 100644
--- a/app/components/analysis/AnalysesTable.vue
+++ b/app/components/analysis/AnalysesTable.vue
@@ -27,6 +27,7 @@ import {
   type Route,
 } from "~/services/Api";
 import { ApprovalStatus } from "~/types/node";
+import { parseKongTags } from "~/utils/parse-kong-tags";
 import ContainerCounter from "~/components/analysis/ContainerCounter.vue";
 import { useDatastoreRequirement } from "~/composables/useDatastoreRequirement";
 import type {
@@ -162,11 +163,9 @@ async function getKongRoutes() {
     .catch(() => undefined)) as ListRoutes;
   if (kongRoutesResp && kongRoutesResp.data) {
     const projIds: string[] = [];
-    kongRoutesResp.data.forEach((proj: Route) => {
-      const nameChunks = proj.name?.split("-");
-      if (nameChunks && nameChunks.length > 1) {
-        nameChunks.pop(); // Remove suffix, either "fhir" or "s3"
-        const projUuid = nameChunks.join("-");
+    kongRoutesResp.data.forEach((route: Route) => {
+      const projUuid = parseKongTags(route.tags).project;
+      if (projUuid) {
         projIds.push(projUuid);
       }
     });
@@ -686,7 +685,6 @@ const onCloseNavToast = () => {
             :showFilterOperator="false"
             field="execution_status"
             filterField="execution_status"
-            headerStyle="text-align: center"
           >
             <template #header>
               <span
@@ -762,7 +760,8 @@ const onCloseNavToast = () => {
                 <Badge
                   :severity="datastoreBadgeSeverity"
                   class="w-8 h-8 rounded-full"
-                  ><button
+                >
+                  <button
                     v-tooltip.top="datastoreBadgeTooltip"
                     type="button"
                     :disabled="!datastoreRequired"
@@ -773,8 +772,9 @@ const onCloseNavToast = () => {
                     ]"
                     @click="onCreateDataStore(data.analysis.project_id)"
                   >
-                    <i class="pi pi-times"></i></button
-                ></Badge>
+                    <i class="pi pi-times"></i>
+                  </button>
+                </Badge>
               </div>
             </template>
           </Column>
diff --git a/app/components/data-stores/DataStoreList.vue b/app/components/data-stores/DataStoreList.vue
index 78b46689..d5783bc7 100644
--- a/app/components/data-stores/DataStoreList.vue
+++ b/app/components/data-stores/DataStoreList.vue
@@ -5,8 +5,8 @@ import DetailedDataStoreTable from "~/components/data-stores/DetailedDataStoreTa
 const { dataStores, projectNameMap, loading, refresh } =
   await useDataStoreList();
 
-function onDeleteDataStore(dsName: string) {
-  dataStores.value = dataStores.value.filter((store) => store.name !== dsName);
+function onDeleteDataStore(dsId: string) {
+  dataStores.value = dataStores.value.filter((store) => store.id !== dsId);
   refresh();
 }
 </script>
diff --git a/app/components/data-stores/DetailedDataStoreTable.vue b/app/components/data-stores/DetailedDataStoreTable.vue
index 201c7c82..1a465184 100644
--- a/app/components/data-stores/DetailedDataStoreTable.vue
+++ b/app/components/data-stores/DetailedDataStoreTable.vue
@@ -6,22 +6,28 @@ import { useToast } from "primevue/usetoast";
 import type { Route } from "~/services/Api";
 import { FilterMatchMode } from "@primevue/core/api";
 import SearchBar from "~/components/table/SearchBar.vue";
-import { extractUuid } from "~/utils/extract-uuid-from-kong-username";
+import { parseKongTags } from "~/utils/parse-kong-tags";
 import { parseUnixTimestamp } from "~/utils/format-data-row";
 import { getDataStoreTypeSeverity } from "~/utils/status-tag-severity";
-import type { ModifiedDetailedService } from "~/services/modifiedApiInterfaces";
+import type {
+  ModifiedDetailedService,
+  modifiedTimestamp,
+} from "~/services/modifiedApiInterfaces";
 import { useNuxtApp } from "nuxt/app";
 
 interface DetailedDataStoreTableRow {
-  name?: string | undefined;
+  rowKey: string;
+  datastoreId?: string | undefined;
+  projectId?: string | undefined;
+  name?: string | null | undefined;
   type?: string | undefined;
   project?: string | undefined;
-  path?: string | undefined;
-  host?: string | undefined;
-  port?: number | undefined;
-  protocol?: string | undefined;
-  created_at?: string | undefined;
-  updated_at?: string | undefined;
+  path?: string | null | undefined;
+  host?: string | null | undefined;
+  port?: number | null | undefined;
+  protocol?: string | null | undefined;
+  created_at?: modifiedTimestamp | undefined;
+  updated_at?: modifiedTimestamp | undefined;
 }
 
 const props = defineProps({
@@ -44,31 +50,42 @@ const dataStores = computed(() => {
 
   if (props.stores && props.stores.length > 0) {
     props.stores.forEach((store: ModifiedDetailedService) => {
-      const formattedRow: DetailedDataStoreTableRow = parseUnixTimestamp(
-        store,
-        ["created_at", "updated_at"],
-      );
+      const formattedRow = parseUnixTimestamp(store, [
+        "created_at",
+        "updated_at",
+      ]) as ModifiedDetailedService;
+      const baseRow: DetailedDataStoreTableRow = {
+        rowKey: store.id!,
+        datastoreId: store.id ?? undefined,
+        name: store.name,
+        type: parseKongTags(store.tags).type,
+        project: "N/A",
+        path: store.path,
+        host: store.host,
+        port: store.port,
+        protocol: store.protocol,
+        created_at: formattedRow.created_at,
+        updated_at: formattedRow.updated_at,
+      };
       const routes = store.routes;
       if (routes && routes.length > 0) {
-        routes.forEach((proj: Route) => {
-          const projectParts = extractUuid(proj.name!);
-          const dataStoreType = projectParts[0];
-          const projectUuid = projectParts[1] as string;
-          const newRow: DetailedDataStoreTableRow = {
-            name: store.name,
-            type: dataStoreType,
-            project: props.projectNameMap?.has(projectUuid)
-              ? props.projectNameMap.get(projectUuid)!
-              : "N/A",
-            path: store.path,
-            host: store.host,
-            port: store.port,
-            protocol: store.protocol,
-            created_at: formattedRow.created_at,
-            updated_at: formattedRow.updated_at,
-          };
-          tableRows.push(newRow);
+        routes.forEach((route: Route) => {
+          const routeTags = parseKongTags(route.tags);
+          const projectUuid = routeTags.project ?? route["projectId"];
+          tableRows.push({
+            ...baseRow,
+            rowKey: `${store.id}:${route.id}`,
+            projectId: projectUuid,
+            type: routeTags.type ?? baseRow.type,
+            project:
+              projectUuid && props.projectNameMap?.has(projectUuid)
+                ? props.projectNameMap.get(projectUuid)!
+                : "N/A",
+          });
         });
+      } else {
+        // Data stores can now exist without any linked project
+        tableRows.push(baseRow);
       }
     });
   }
@@ -76,9 +93,11 @@ const dataStores = computed(() => {
   return tableRows;
 });
 
-async function onConfirmDeleteDataStore(dsName: string) {
-  deleteLoadingFor.value = dsName;
-  const { status } = await deleteDataStore(dsName);
+async function onConfirmDeleteDataStore(row: DetailedDataStoreTableRow) {
+  const dsId = row.datastoreId ?? row.name!;
+  deleteLoadingFor.value = dsId;
+  // Cascade removes the project links (routes) along with the store
+  const { status } = await deleteDataStore(dsId, true);
   if (status.value === "success") {
     toast.add({
       severity: "success",
@@ -86,7 +105,7 @@ async function onConfirmDeleteDataStore(dsName: string) {
       detail: "The data store was successfully deleted",
       life: 3000,
     });
-    emit("deleteDataStore", dsName);
+    emit("deleteDataStore", dsId);
   } else {
     toast.add({
       severity: "error",
@@ -98,7 +117,7 @@ async function onConfirmDeleteDataStore(dsName: string) {
   deleteLoadingFor.value = null;
 }
 
-const confirmDelete = (dsName: string) => {
+const confirmDelete = (row: DetailedDataStoreTableRow) => {
   confirm.require({
     header: "Confirm Data Store Removal",
     message:
@@ -115,20 +134,22 @@ const confirmDelete = (dsName: string) => {
       icon: "pi pi-times",
     },
     accept: () => {
-      onConfirmDeleteDataStore(dsName);
+      onConfirmDeleteDataStore(row);
     },
     reject: () => {},
   });
 };
 
-async function onCheckConnection(dsName: string) {
-  checkingConnectionFor.value = dsName;
-  const [dsType, projectId] = extractUuid(dsName);
+async function onCheckConnection(row: DetailedDataStoreTableRow) {
+  checkingConnectionFor.value = row.rowKey;
 
   const connStatus = await useNuxtApp()
-    .$hubApi(`/kong/project/${projectId}/${dsType}/health`, {
-      method: "GET",
-    })
+    .$hubApi(
+      `/kong/project/${row.projectId}/datastore/${row.datastoreId}/health`,
+      {
+        method: "GET",
+      },
+    )
     .catch(() => {
       toast.add({
         severity: "error",
@@ -166,10 +187,12 @@ function resetFilters() {
     };
     clearedFilters[filterKey].value = undefined;
   }
+  // @ts-expect-error filters are fine
   filters.value = clearedFilters;
 }
 
 const updateFilters = (filterText: string) => {
+  // @ts-expect-error filters are fine
   filters.value.global.value = filterText;
 };
 </script>
@@ -285,11 +308,17 @@ const updateFilters = (filterText: string) => {
         <template #body="slotProps">
           <div>
             <Button
-              :loading="checkingConnectionFor === slotProps.data.name"
+              v-tooltip.top="
+                slotProps.data.projectId
+                  ? undefined
+                  : 'No linked project to test through'
+              "
+              :disabled="!slotProps.data.projectId"
+              :loading="checkingConnectionFor === slotProps.data.rowKey"
               aria-label="test-connection"
               icon="pi pi-wifi"
               severity="contrast"
-              @click="onCheckConnection(slotProps.data.name)"
+              @click="onCheckConnection(slotProps.data)"
             />
           </div>
         </template>
@@ -303,10 +332,11 @@ const updateFilters = (filterText: string) => {
         <template #body="slotProps">
           <div>
             <Button
+              :loading="deleteLoadingFor === slotProps.data.datastoreId"
               aria-label="Delete"
               icon="pi pi-trash"
               severity="danger"
-              @click="confirmDelete(slotProps.data.name)"
+              @click="confirmDelete(slotProps.data)"
             />
           </div>
         </template>
diff --git a/app/components/data-stores/create/DataStoreProjectInitializer.vue b/app/components/data-stores/create/DataStoreProjectInitializer.vue
index 5252f144..6453a74b 100644
--- a/app/components/data-stores/create/DataStoreProjectInitializer.vue
+++ b/app/components/data-stores/create/DataStoreProjectInitializer.vue
@@ -9,10 +9,21 @@ 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 { type AvailableProject, 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";
+import {
+  type BodyKongInitializeKongInitializePost,
+  DataStoreType,
+  type ProjectNode,
+} from "~/services/Api";
 import { getProjectNodes } from "~/composables/useAPIFetch";
+import {
+  generateRandomDataStoreName,
+  isValidDataStoreName,
+} from "~/utils/data-store-name";
 
 const loading = ref(false);
 const helpActive = ref<HelpTextField | undefined>();
@@ -86,11 +97,15 @@ const acceptedProtocols = [
   "wss",
 ];
 
-watch(selectedProject, (newSelectedProject) => {
-  if (newSelectedProject) {
-    dataStoreName.value = `${newSelectedProject.id}`;
+function rerollDataStoreName() {
+  if (selectedProject.value) {
+    dataStoreName.value = generateRandomDataStoreName(
+      selectedProject.value.name ?? selectedProject.value.id,
+    );
   }
-});
+}
+
+watch(selectedProject, rerollDataStoreName);
 
 // Preselect the project when navigated here with a projectId query parameter
 const route = useRoute();
@@ -142,6 +157,17 @@ function verifyValuesFilled(settings: object): boolean {
 }
 
 async function onSubmitCreateDataStoreAndProject() {
+  if (!isValidDataStoreName(dataStoreName.value)) {
+    toast.add({
+      severity: "error",
+      summary: "Invalid data store name",
+      detail:
+        "Only letters, digits, '.', '_', '~', and '-' are allowed, and the name cannot be a bare UUID",
+      life: 5000,
+    });
+    return;
+  }
+
   const validatedPath = validatePath(path.value);
   const datastoreSettings = {
     name: dataStoreName.value,
@@ -157,9 +183,9 @@ async function onSubmitCreateDataStoreAndProject() {
     ds_type: selectedDataStoreType.value,
   };
 
-  const minioSettings = {
-    minio_access_key: bucketAccessKey.value || "",
-    minio_secret_key: bucketSecretKey.value || "",
+  const s3Settings = {
+    s3_access_key: bucketAccessKey.value || "",
+    s3_secret_key: bucketSecretKey.value || "",
   };
 
   let settingsValidated = verifyValuesFilled(datastoreSettings);
@@ -168,8 +194,8 @@ async function onSubmitCreateDataStoreAndProject() {
     selectedDataStoreType.value === DataStoreType.S3 &&
     selectedBucketAccessPolicy.value === "Private"
   ) {
-    configSettings.minio_config = minioSettings;
-    settingsValidated = settingsValidated && verifyValuesFilled(minioSettings);
+    configSettings.s3_config = s3Settings;
+    settingsValidated = settingsValidated && verifyValuesFilled(s3Settings);
   }
 
   if (settingsValidated) {
@@ -284,13 +310,27 @@ async function onSubmitCreateDataStoreAndProject() {
               <InputGroupAddon class="data-store-field-name">
                 <i class="pi pi-barcode"></i>
                 <p
-                  v-tooltip.top="'Generated name of the data store'"
+                  v-tooltip.top="'Display name of the data store'"
                   class="data-store-field-name-box"
                 >
                   Data Store
                 </p>
               </InputGroupAddon>
-              <InputText v-model="dataStoreName" disabled />
+              <InputText
+                v-model="dataStoreName"
+                :invalid="
+                  dataStoreName !== '' && !isValidDataStoreName(dataStoreName)
+                "
+                placeholder="Name of the data store"
+              />
+              <Button
+                v-tooltip.top="'Suggest a new random name'"
+                :disabled="!selectedProject"
+                class="reroll-name-btn"
+                icon="pi pi-refresh"
+                severity="secondary"
+                @click="rerollDataStoreName"
+              />
             </InputGroup>
             <InputGroup class="data-store-type-input">
               <InputGroupAddon class="data-store-field-name">
@@ -568,6 +608,7 @@ async function onSubmitCreateDataStoreAndProject() {
   gap: 0.6rem;
   margin-bottom: 1rem;
 }
+
 .data-store-input-fields {
   width: 80%;
   margin-right: 24px;
diff --git a/app/components/header/CleanupDialog.vue b/app/components/header/CleanupDialog.vue
index a17af81e..47a2cb0a 100644
--- a/app/components/header/CleanupDialog.vue
+++ b/app/components/header/CleanupDialog.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { type CleanupPodResponse, type DeleteService } from "~/services/Api";
+import { type CleanupPodResponse } from "~/services/Api";
 import { useToast } from "primevue/usetoast";
 import { useNuxtApp } from "nuxt/app";
 import Dialog from "primevue/dialog";
@@ -52,13 +52,6 @@ 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: {
@@ -87,44 +80,23 @@ const handleCleanupShow = () => {
 
 async function cleanUpResource(endpoint: string) {
   loading.value = true;
-  let cleanupResponse: CleanupPodResponse | DeleteService | null;
   let modifiedResources: number | string = 0;
 
-  // 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;
-    }
+  const 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) {
+    const count = cleanupResponse[endpoint as keyof CleanupPodResponse];
+    if (count) modifiedResources = count;
   }
 
   if (cleanupResponse) {
diff --git a/app/composables/useAPIFetch.ts b/app/composables/useAPIFetch.ts
index d4a4ba40..d53f6e9a 100644
--- a/app/composables/useAPIFetch.ts
+++ b/app/composables/useAPIFetch.ts
@@ -1,16 +1,13 @@
 import type {
-  AnalysisLogsResponse,
   AnalysisNode,
-  DeleteProject,
+  BodyKongProjectLinkKongProjectProjectIdDatastoreDatastoreIdPost,
   DetailedAnalysis,
   EventLogResponse,
   LinkDataStoreProject,
-  ListConsumers,
-  ListRoutes,
   ListServices,
   Project,
   ProjectNode,
-  Service,
+  UnlinkResponse,
   UserSettings,
 } from "~/services/Api";
 
@@ -111,63 +108,43 @@ export function getDataStores(includeProject: boolean, opts?) {
   });
 }
 
-export function createDataStore(dataStoreProps: Service, opts?) {
-  return useAPIFetch<{ data: Service }>(`/kong/datastore`, {
-    ...opts,
-    method: "POST",
-    body: dataStoreProps,
-  });
-}
-
-export function deleteDataStore(dataStoreName: string, opts?) {
-  return useAPIFetch(`/kong/datastore/${dataStoreName}`, {
+export function deleteDataStore(
+  dataStoreIdOrName: string,
+  cascade: boolean = false,
+  opts?,
+) {
+  return useAPIFetch(`/kong/datastore/${dataStoreIdOrName}`, {
     ...opts,
     method: "DELETE",
+    query: {
+      cascade,
+    },
   });
 }
 
-export function createProject(routeProps: ListRoutes, opts?) {
-  return useAPIFetch<{ data: LinkDataStoreProject }>(`/kong/project`, {
-    ...opts,
-    method: "POST",
-    body: routeProps,
-  });
+export function linkProjectToDataStore(
+  projectId: string,
+  datastoreId: string,
+  linkProps: BodyKongProjectLinkKongProjectProjectIdDatastoreDatastoreIdPost = {},
+  opts?,
+) {
+  return useAPIFetch<LinkDataStoreProject>(
+    `/kong/project/${projectId}/datastore/${datastoreId}`,
+    {
+      ...opts,
+      method: "POST",
+      body: linkProps,
+    },
+  );
 }
 
 export function deleteProjectFromKong(projectId: string, opts?) {
-  return useAPIFetch<{ data: DeleteProject }>(`/kong/project/${projectId}`, {
+  return useAPIFetch<UnlinkResponse>(`/kong/project/${projectId}`, {
     ...opts,
     method: "DELETE",
   });
 }
 
-export function getAnalysesFromKong(opts?) {
-  return useAPIFetch<ListConsumers>(`/kong/analysis`, {
-    ...opts,
-    method: "GET",
-  });
-}
-
-export function deleteAnalysisFromKong(analysisId: string, opts?) {
-  return useAPIFetch<{ data: DeleteProject }>(`/kong/analysis/${analysisId}`, {
-    ...opts,
-    method: "DELETE",
-  });
-}
-
-// PodOrc endpoints
-export function getAnalysisLogs(
-  analysisId: string,
-  query?: { limit?: number | null; start_date?: string | null },
-  opts?,
-) {
-  return useAPIFetch<AnalysisLogsResponse>(`/logs/${analysisId}`, {
-    ...opts,
-    method: "GET",
-    query,
-  });
-}
-
 // Results endpoints
 export function downloadLocalObject(objectId: string, opts?) {
   return useAPIFetch(`/local/${objectId}`, {
diff --git a/app/composables/useDataStoreList.ts b/app/composables/useDataStoreList.ts
index 70e51ab1..a31efcb9 100644
--- a/app/composables/useDataStoreList.ts
+++ b/app/composables/useDataStoreList.ts
@@ -1,6 +1,7 @@
 import { ref, watchEffect } from "vue";
 import { getDataStores, getProjects } from "~/composables/useAPIFetch";
 import { formatDataRow } from "~/utils/format-data-row";
+import { parseKongTags } from "~/utils/parse-kong-tags";
 import type { ModifiedDetailedService } from "~/services/modifiedApiInterfaces";
 import type { DetailedAnalysis, Project, Route } from "~/services/Api";
 
@@ -59,7 +60,9 @@ export async function useDataStoreList() {
             [],
           ) as Route[];
           store.routes?.forEach((route: Route) => {
-            route["projectId"] = extractProjectIdFromPath(route.paths);
+            route["projectId"] =
+              parseKongTags(route.tags).project ??
+              extractProjectIdFromPath(route.paths);
           });
         }
       });
diff --git a/app/services/Api.ts b/app/services/Api.ts
index bb80cd9b..ee6d599d 100644
--- a/app/services/Api.ts
+++ b/app/services/Api.ts
@@ -17,6 +17,7 @@
 export enum ServiceTag {
   Auth = "Auth",
   Autostart = "Autostart",
+  KongCleanup = "Kong Cleanup",
   Logs = "Logs",
   Health = "Health",
   Hub = "Hub",
@@ -243,6 +244,8 @@ export interface Analysis {
    * @format uuid
    */
   user_id: string;
+  /** Client Id */
+  client_id: string | null;
   project?: Project;
   master_image?: MasterImage | null;
 }
@@ -512,8 +515,8 @@ export interface BodyKongDatastoreCreateKongDatastorePost {
   datastore: ServiceRequest;
   /** Data store type. Either 's3' or 'fhir' */
   ds_type: DataStoreType;
-  /** Minio configuration */
-  minio_config?: MinioConfig | null;
+  /** S3 configuration */
+  s3_config?: S3Config | null;
 }
 
 /** Body_kong_initialize_kong_initialize_post */
@@ -529,29 +532,24 @@ export interface BodyKongInitializeKongInitializePost {
    * @default ["http"]
    */
   protocols?: ProtocolCode[];
-  /** Data store type. Either 's3' or 'fhir' */
-  ds_type: DataStoreType;
+  /**
+   * Methods
+   * List of acceptable HTTP methods
+   */
+  methods?: HttpMethodCode[] | null;
   /**
    * Data store metadata.
    * Required information for creating a new data store.
    */
   datastore: ServiceRequest;
-  /** Minio configuration */
-  minio_config?: MinioConfig | null;
+  /** Data store type. Either 's3' or 'fhir' */
+  ds_type: DataStoreType;
+  /** S3 configuration */
+  s3_config?: S3Config | null;
 }
 
-/** Body_kong_project_create_kong_project_post */
-export interface BodyKongProjectCreateKongProjectPost {
-  /**
-   * Data Store Id
-   * UUID of the data store or 'service'
-   */
-  data_store_id: string;
-  /**
-   * Project Id
-   * UUID of the project
-   */
-  project_id: string;
+/** Body_kong_project_link_kong_project__project_id__datastore__datastore_id__post */
+export interface BodyKongProjectLinkKongProjectProjectIdDatastoreDatastoreIdPost {
   /**
    * Methods
    * List of acceptable HTTP methods
@@ -562,11 +560,6 @@ export interface BodyKongProjectCreateKongProjectPost {
    * List of acceptable transfer protocols. A combo of 'http', 'grpc', 'grpcs', 'tls', 'tcp'
    */
   protocols?: ProtocolCode[] | null;
-  /**
-   * Data store type. Either 's3' or 'fhir'
-   * @default "fhir"
-   */
-  ds_type?: DataStoreType;
 }
 
 /** Body_podorc_pods_create_po_post */
@@ -650,27 +643,6 @@ export interface CreateServiceRequestClientCertificate {
   id?: string | null;
 }
 
-/**
- * DeleteProject
- * Response from disconnecting a project from a datastore.
- */
-export interface DeleteProject {
-  removed: Route | null;
-  /** Status */
-  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.
@@ -779,6 +751,8 @@ export interface DetailedAnalysis {
    * @format uuid
    */
   user_id: string;
+  /** Client Id */
+  client_id: string | null;
   project?: Project | null;
   master_image?: MasterImage | null;
 }
@@ -1008,12 +982,22 @@ export interface DetailedService {
  * Response model for downstream health checks.
  */
 export interface DownstreamHealthCheck {
-  /** Po */
-  po: HealthCheck | string;
-  /** Storage */
-  storage: HealthCheck | string;
-  /** Kong */
-  kong: HealthCheck | string;
+  /** Response model to validate and return when performing a health check. */
+  po: HealthCheck;
+  /** Response model to validate and return when performing a health check. */
+  storage: HealthCheck;
+  /** Response model to validate and return when performing a health check. */
+  hub_core: HealthCheck;
+  /** Response model to validate and return when performing a health check. */
+  hub_auth: HealthCheck;
+  /** Response model to validate and return when performing a health check. */
+  idp: HealthCheck;
+  /** Response model to validate and return when performing a health check. */
+  kong: HealthCheck;
+  victoria_logs?: HealthCheck | null;
+  message_broker?: HealthCheck | null;
+  s3?: HealthCheck | null;
+  fhir?: HealthCheck | null;
 }
 
 /**
@@ -1064,11 +1048,12 @@ export interface HTTPValidationError {
  * Response model to validate and return when performing a health check.
  */
 export interface HealthCheck {
-  /**
-   * Status
-   * @default "OK"
-   */
-  status?: string;
+  /** Status */
+  status: "OK" | "WARNING" | "ERROR" | "CRITICAL";
+  /** Status Code */
+  status_code?: number | null;
+  /** Message */
+  message?: string | null;
 }
 
 /** InitializeAnalysis */
@@ -1113,6 +1098,19 @@ export interface KeyAuthConsumer {
   id?: string | null;
 }
 
+/**
+ * KongCleanupSettings
+ * Settings for the background sweep that deletes Kong analysis consumers once their analysis
+ * reaches a terminal status. Always runs; only the interval is configurable.
+ */
+export interface KongCleanupSettings {
+  /**
+   * Interval
+   * @default 30
+   */
+  interval?: number | null;
+}
+
 /** LinkDataStoreProject */
 export interface LinkDataStoreProject {
   /** Route entities define rules to match client requests. Every request matching a given route will be proxied to its associated service. */
@@ -1275,37 +1273,6 @@ export interface Meta {
   offset?: number | null;
 }
 
-/**
- * MinioConfig
- * Credentials for accessing a private S3 bucket hosted on MinIO.
- */
-export interface MinioConfig {
-  /**
-   * Minio Access Key
-   * @format password
-   */
-  minio_access_key: string;
-  /**
-   * Minio Secret Key
-   * @format password
-   */
-  minio_secret_key: string;
-  /**
-   * Minio Region
-   * @default "us-east-1"
-   */
-  minio_region?: string;
-  /** Bucket Name */
-  bucket_name?: string | null;
-  /**
-   * Timeout
-   * @default 100000
-   */
-  timeout?: number;
-  /** Strip Path Pattern */
-  strip_path_pattern?: string | null;
-}
-
 /** NetStatResponse */
 export interface NetStatResponse {
   /** Data */
@@ -1375,8 +1342,6 @@ export interface Node {
   /** Registry Project Id */
   registry_project_id: string | null;
   registry_project?: RegistryProject | null;
-  /** Robot Id */
-  robot_id: string | null;
   /** Client Id */
   client_id: string | null;
   /**
@@ -1461,8 +1426,6 @@ export interface Project {
   realm_id: string;
   /** User Id */
   user_id: string | null;
-  /** Robot Id */
-  robot_id: string | null;
 }
 
 /** ProjectNode */
@@ -1733,6 +1696,37 @@ export interface RunLogs {
   analysis_logs: PodLog[];
 }
 
+/**
+ * S3Config
+ * Credentials for accessing a private S3 bucket.
+ */
+export interface S3Config {
+  /**
+   * S3 Access Key
+   * @format password
+   */
+  s3_access_key: string;
+  /**
+   * S3 Secret Key
+   * @format password
+   */
+  s3_secret_key: string;
+  /**
+   * S3 Region
+   * @default "us-east-1"
+   */
+  s3_region?: string;
+  /** Bucket Name */
+  bucket_name?: string | null;
+  /**
+   * Timeout
+   * @default 100000
+   */
+  timeout?: number;
+  /** Strip Path Pattern */
+  strip_path_pattern?: string | null;
+}
+
 /**
  * Service
  * service entities are abstractions of upstream services. The main attribute of a service is its URL which can be set as a single string or by specifying the `protocol`, `host`, `port` and `path` individually.
@@ -1940,6 +1934,22 @@ export interface Token {
   refresh_expires_in?: number | null;
 }
 
+/**
+ * UnlinkResponse
+ * Response for unlinking a data store from a project or deleting a whole project.
+ */
+export interface UnlinkResponse {
+  /** Removed Routes */
+  removed_routes: Route[];
+  /**
+   * Removed Consumers
+   * @default []
+   */
+  removed_consumers?: Consumer[];
+  /** Status */
+  status?: number | null;
+}
+
 /**
  * UserSettings
  * Node configuration settings set by the user.
@@ -1952,6 +1962,8 @@ export interface UserSettings {
   require_data_store?: boolean | null;
   /** @default {"enabled":false,"interval":60} */
   autostart?: AutostartSettings | null;
+  /** @default {"interval":30} */
+  kong_cleanup?: KongCleanupSettings | null;
 }
 
 /** ValidationError */
@@ -3106,7 +3118,7 @@ export class Api<
   };
   local = {
     /**
-     * @description Delete all objects in MinIO and all Postgres database entries related to the specified project. Returns a 200 on success, a 400 if the project is still available on the Hub and a 403 if it is not the Hub Adapter client that sends the request. In both error cases nothing is deleted at all.
+     * @description Delete all objects in S3 and all Postgres database entries related to the specified project. Returns a 200 on success, a 400 if the project is still available on the Hub and a 403 if it is not the Hub Adapter client that sends the request. In both error cases nothing is deleted at all.
      *
      * @tags Storage
      * @name StorageLocalDeleteLocalDelete
@@ -3145,9 +3157,14 @@ export class Api<
      */
     kongDatastoreGetKongDatastoreGet: (
       query?: {
+        /**
+         * Ds Type
+         * Filter by data store type
+         */
+        ds_type?: DataStoreType | null;
         /**
          * Detailed
-         * Whether to include detailed information on projects
+         * Whether to include linked projects (routes)
          * @default false
          */
         detailed?: boolean;
@@ -3164,27 +3181,7 @@ export class Api<
       }),
 
     /**
-     * @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.
+     * @description Create a data store (service), independent of any project. The admin chosen display name must not be a bare UUID, the Kong service ID returned in the response is the main identifier.
      *
      * @tags Kong
      * @name KongDatastoreCreateKongDatastorePost
@@ -3207,20 +3204,20 @@ export class Api<
       }),
 
     /**
-     * @description Retrieve a specific data store using the project UUID
+     * @description Retrieve a specific data store by its Kong service ID or display name. For backwards compatibility, a project ID is also accepted. If no service matches directly, all data stores currently linked to that project are returned instead.
      *
      * @tags Kong
-     * @name KongDatastoreGetKongDatastoreProjectIdGet
+     * @name KongDatastoreGetKongDatastoreDatastoreIdOrNameGet
      * @summary Kong.Datastore.Get
-     * @request GET:/kong/datastore/{project_id}
+     * @request GET:/kong/datastore/{datastore_id_or_name}
      * @secure
      */
-    kongDatastoreGetKongDatastoreProjectIdGet: (
-      projectId: string,
+    kongDatastoreGetKongDatastoreDatastoreIdOrNameGet: (
+      datastoreIdOrName: string,
       query?: {
         /**
          * Detailed
-         * Whether to include detailed information on projects
+         * Whether to include linked projects (routes)
          * @default false
          */
         detailed?: boolean;
@@ -3228,7 +3225,7 @@ export class Api<
       params: RequestParams = {},
     ) =>
       this.request<ListServices, void | HTTPValidationError>({
-        path: `/kong/datastore/${projectId}`,
+        path: `/kong/datastore/${datastoreIdOrName}`,
         method: "GET",
         query: query,
         secure: true,
@@ -3237,21 +3234,30 @@ export class Api<
       }),
 
     /**
-     * @description Delete the listed data store (referred to as services by kong).
+     * @description Delete a data store (service). Refused with 409 while projects link it, unless cascade=true. Cascading removes the link routes only, consumers (analyses) belong to projects and are untouched. For backwards compatibility, a project ID is also accepted in place of the data store id/name, but only if it resolves to exactly one linked data store, otherwise refused with 409 if the project is linked to more than 1
      *
      * @tags Kong
-     * @name KongDatastoreDeleteKongDatastoreDataStoreNameDelete
+     * @name KongDatastoreDeleteKongDatastoreDatastoreIdOrNameDelete
      * @summary Kong.Datastore.Delete
-     * @request DELETE:/kong/datastore/{data_store_name}
+     * @request DELETE:/kong/datastore/{datastore_id_or_name}
      * @secure
      */
-    kongDatastoreDeleteKongDatastoreDataStoreNameDelete: (
-      dataStoreName: string,
+    kongDatastoreDeleteKongDatastoreDatastoreIdOrNameDelete: (
+      datastoreIdOrName: string,
+      query?: {
+        /**
+         * Cascade
+         * Also delete existing project links (routes)
+         * @default false
+         */
+        cascade?: boolean;
+      },
       params: RequestParams = {},
     ) =>
       this.request<any, void | HTTPValidationError>({
-        path: `/kong/datastore/${dataStoreName}`,
+        path: `/kong/datastore/${datastoreIdOrName}`,
         method: "DELETE",
+        query: query,
         secure: true,
         format: "json",
         ...params,
@@ -3286,29 +3292,6 @@ export class Api<
         ...params,
       }),
 
-    /**
-     * @description Connect a project to a data store (referred to as a route by kong).
-     *
-     * @tags Kong
-     * @name KongProjectCreateKongProjectPost
-     * @summary Kong.Project.Create
-     * @request POST:/kong/project
-     * @secure
-     */
-    kongProjectCreateKongProjectPost: (
-      data: BodyKongProjectCreateKongProjectPost,
-      params: RequestParams = {},
-    ) =>
-      this.request<LinkDataStoreProject, void | HTTPValidationError>({
-        path: `/kong/project`,
-        method: "POST",
-        body: data,
-        secure: true,
-        type: ContentType.Json,
-        format: "json",
-        ...params,
-      }),
-
     /**
      * @description List a specific projects (referred to as routes by kong) using the project UUID. Set "detailed" to True to include detailed information on the linked kong service.
      *
@@ -3340,20 +3323,43 @@ export class Api<
       }),
 
     /**
-     * @description Creates a new datastore (service) and a new project (route), then links them together with a health consumer.
+     * @description Disconnect a project from all data stores and delete all its consumers (analyses + health).
      *
      * @tags Kong
-     * @name KongInitializeKongInitializePost
-     * @summary Kong.Initialize
-     * @request POST:/kong/initialize
+     * @name KongProjectDeleteKongProjectProjectIdDelete
+     * @summary Kong.Project.Delete
+     * @request DELETE:/kong/project/{project_id}
      * @secure
      */
-    kongInitializeKongInitializePost: (
-      data: BodyKongInitializeKongInitializePost,
+    kongProjectDeleteKongProjectProjectIdDelete: (
+      projectId: string,
+      params: RequestParams = {},
+    ) =>
+      this.request<UnlinkResponse, void | HTTPValidationError>({
+        path: `/kong/project/${projectId}`,
+        method: "DELETE",
+        secure: true,
+        format: "json",
+        ...params,
+      }),
+
+    /**
+     * @description Link a project to a data store by creating a route on the store's service. A data store can only be linked to one project at a time. The route's matching path is "/{service_name}/{type}" with no project identifier in it.
+     *
+     * @tags Kong
+     * @name KongProjectLinkKongProjectProjectIdDatastoreDatastoreIdPost
+     * @summary Kong.Project.Link
+     * @request POST:/kong/project/{project_id}/datastore/{datastore_id}
+     * @secure
+     */
+    kongProjectLinkKongProjectProjectIdDatastoreDatastoreIdPost: (
+      projectId: string,
+      datastoreId: string,
+      data: BodyKongProjectLinkKongProjectProjectIdDatastoreDatastoreIdPost,
       params: RequestParams = {},
     ) =>
       this.request<LinkDataStoreProject, void | HTTPValidationError>({
-        path: `/kong/initialize`,
+        path: `/kong/project/${projectId}/datastore/${datastoreId}`,
         method: "POST",
         body: data,
         secure: true,
@@ -3363,20 +3369,21 @@ export class Api<
       }),
 
     /**
-     * @description Disconnect a project (route) from all data stores (services) and delete associated analyses (consumers).
+     * @description Unlink a single data store from a project. Consumers (analyses) are kept.
      *
      * @tags Kong
-     * @name KongProjectDeleteKongProjectProjectRouteIdDelete
-     * @summary Kong.Project.Delete
-     * @request DELETE:/kong/project/{project_route_id}
+     * @name KongProjectUnlinkKongProjectProjectIdDatastoreDatastoreIdDelete
+     * @summary Kong.Project.Unlink
+     * @request DELETE:/kong/project/{project_id}/datastore/{datastore_id}
      * @secure
      */
-    kongProjectDeleteKongProjectProjectRouteIdDelete: (
-      projectRouteId: string,
+    kongProjectUnlinkKongProjectProjectIdDatastoreDatastoreIdDelete: (
+      projectId: string,
+      datastoreId: string,
       params: RequestParams = {},
     ) =>
-      this.request<DeleteProject, void | HTTPValidationError>({
-        path: `/kong/project/${projectRouteId}`,
+      this.request<UnlinkResponse, void | HTTPValidationError>({
+        path: `/kong/project/${projectId}/datastore/${datastoreId}`,
         method: "DELETE",
         secure: true,
         format: "json",
@@ -3384,7 +3391,30 @@ export class Api<
       }),
 
     /**
-     * @description List all analyses (referred to as consumers by kong) available. Can be filtered by project UUID using tag.
+     * @description Creates a new datastore (service) and a new project (route), then links them together with a health consumer.
+     *
+     * @tags Kong
+     * @name KongInitializeKongInitializePost
+     * @summary Kong.Initialize
+     * @request POST:/kong/initialize
+     * @secure
+     */
+    kongInitializeKongInitializePost: (
+      data: BodyKongInitializeKongInitializePost,
+      params: RequestParams = {},
+    ) =>
+      this.request<LinkDataStoreProject, void | HTTPValidationError>({
+        path: `/kong/initialize`,
+        method: "POST",
+        body: data,
+        secure: true,
+        type: ContentType.Json,
+        format: "json",
+        ...params,
+      }),
+
+    /**
+     * @description List all analyses (referred to as consumers by kong) available. Can be filtered by project UUID.
      *
      * @tags Kong
      * @name KongAnalysisGetKongAnalysisGet
@@ -3395,10 +3425,10 @@ export class Api<
     kongAnalysisGetKongAnalysisGet: (
       query?: {
         /**
-         * Tag
-         * Filter consumers by project using the project UUID
+         * Project Id
+         * Filter consumers by project UUID
          */
-        tag?: string | null;
+        project_id?: string | null;
       },
       params: RequestParams = {},
     ) =>
@@ -3447,10 +3477,10 @@ export class Api<
       analysisId: string | null,
       query?: {
         /**
-         * Tag
-         * Filter consumers by project using the project UUID
+         * Project Id
+         * Filter consumers by project UUID
          */
-        tag?: string | null;
+        project_id?: string | null;
       },
       params: RequestParams = {},
     ) =>
@@ -3464,7 +3494,7 @@ export class Api<
       }),
 
     /**
-     * @description Delete the listed analysis.
+     * @description Delete the listed analysis (consumer), resolved via its tag.
      *
      * @tags Kong
      * @name KongAnalysisDeleteKongAnalysisAnalysisIdDelete
@@ -3485,21 +3515,21 @@ export class Api<
       }),
 
     /**
-     * @description Test whether Kong can read the requested data source. Because we use the key-auth plugin, a consumer is required for pinging the data service.
+     * @description Test whether Kong can read the given data store through the project's link. Because we use the key-auth plugin, a consumer is required for pinging the data service.
      *
      * @tags Kong
-     * @name KongProbeKongProjectProjectIdDsTypeHealthGet
+     * @name KongProbeKongProjectProjectIdDatastoreDatastoreIdHealthGet
      * @summary Kong.Probe
-     * @request GET:/kong/project/{project_id}/{ds_type}/health
+     * @request GET:/kong/project/{project_id}/datastore/{datastore_id}/health
      * @secure
      */
-    kongProbeKongProjectProjectIdDsTypeHealthGet: (
+    kongProbeKongProjectProjectIdDatastoreDatastoreIdHealthGet: (
       projectId: string,
-      dsType: DataStoreType,
+      datastoreId: string,
       params: RequestParams = {},
     ) =>
       this.request<any, void | HTTPValidationError>({
-        path: `/kong/project/${projectId}/${dsType}/health`,
+        path: `/kong/project/${projectId}/datastore/${datastoreId}/health`,
         method: "GET",
         secure: true,
         format: "json",
diff --git a/app/services/hub_adapter_swagger.json b/app/services/hub_adapter_swagger.json
index 8cc3188f..1255d2eb 100644
--- a/app/services/hub_adapter_swagger.json
+++ b/app/services/hub_adapter_swagger.json
@@ -2151,7 +2151,7 @@
       "delete": {
         "tags": ["Storage"],
         "summary": "Storage.Local.Delete",
-        "description": "Delete all objects in MinIO and all Postgres database entries related to the specified project.\n\nReturns a 200 on success, a 400 if the project is still available on the Hub and a 403 if it is not the\nHub Adapter client that sends the request. In both error cases nothing is deleted at all.",
+        "description": "Delete all objects in S3 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": [
           {
@@ -2216,17 +2216,35 @@
           }
         ],
         "parameters": [
+          {
+            "name": "ds_type",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "anyOf": [
+                {
+                  "$ref": "#/components/schemas/DataStoreType"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "description": "Filter by data store type",
+              "title": "Ds Type"
+            },
+            "description": "Filter by data store type"
+          },
           {
             "name": "detailed",
             "in": "query",
             "required": false,
             "schema": {
               "type": "boolean",
-              "description": "Whether to include detailed information on projects",
+              "description": "Whether to include linked projects (routes)",
               "default": false,
               "title": "Detailed"
             },
-            "description": "Whether to include detailed information on projects"
+            "description": "Whether to include linked projects (routes)"
           }
         ],
         "responses": {
@@ -2255,36 +2273,10 @@
           }
         }
       },
-      "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"
-          }
-        }
-      },
       "post": {
         "tags": ["Kong"],
         "summary": "Kong.Datastore.Create",
-        "description": "Create a datastore (referred to as services by kong) by providing necessary metadata.",
+        "description": "Create a data store (service), independent of any project.\n\nThe admin chosen display name must not be a bare UUID, the Kong service ID returned in the response is the main\nidentifier.",
         "operationId": "kong_datastore_create_kong_datastore_post",
         "security": [
           {
@@ -2328,12 +2320,12 @@
         }
       }
     },
-    "/kong/datastore/{project_id}": {
+    "/kong/datastore/{datastore_id_or_name}": {
       "get": {
         "tags": ["Kong"],
         "summary": "Kong.Datastore.Get",
-        "description": "Retrieve a specific data store using the project UUID",
-        "operationId": "kong_datastore_get_kong_datastore__project_id__get",
+        "description": "Retrieve a specific data store by its Kong service ID or display name.\n\nFor backwards compatibility, a project ID is also accepted. If no service matches directly,\nall data stores currently linked to that project are returned instead.",
+        "operationId": "kong_datastore_get_kong_datastore__datastore_id_or_name__get",
         "security": [
           {
             "JWT": []
@@ -2341,23 +2333,15 @@
         ],
         "parameters": [
           {
-            "name": "project_id",
+            "name": "datastore_id_or_name",
             "in": "path",
             "required": true,
             "schema": {
-              "anyOf": [
-                {
-                  "type": "string",
-                  "format": "uuid"
-                },
-                {
-                  "type": "string"
-                }
-              ],
-              "description": "UUID of the associated project.",
-              "title": "Project Id"
+              "type": "string",
+              "description": "Kong service ID or display name of the data store.",
+              "title": "Datastore Id Or Name"
             },
-            "description": "UUID of the associated project."
+            "description": "Kong service ID or display name of the data store."
           },
           {
             "name": "detailed",
@@ -2365,11 +2349,11 @@
             "required": false,
             "schema": {
               "type": "boolean",
-              "description": "Whether to include detailed information on projects",
+              "description": "Whether to include linked projects (routes)",
               "default": false,
               "title": "Detailed"
             },
-            "description": "Whether to include detailed information on projects"
+            "description": "Whether to include linked projects (routes)"
           }
         ],
         "responses": {
@@ -2397,14 +2381,12 @@
             }
           }
         }
-      }
-    },
-    "/kong/datastore/{data_store_name}": {
+      },
       "delete": {
         "tags": ["Kong"],
         "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",
+        "description": "Delete a data store (service). Refused with 409 while projects link it, unless cascade=true.\n\nCascading removes the link routes only, consumers (analyses) belong to projects and are untouched.\n\nFor backwards compatibility, a project ID is also accepted in place of the data store id/name, but only if\nit resolves to exactly one linked data store, otherwise refused with 409 if the project is linked to more than 1",
+        "operationId": "kong_datastore_delete_kong_datastore__datastore_id_or_name__delete",
         "security": [
           {
             "JWT": []
@@ -2412,15 +2394,27 @@
         ],
         "parameters": [
           {
-            "name": "data_store_name",
+            "name": "datastore_id_or_name",
             "in": "path",
             "required": true,
             "schema": {
               "type": "string",
-              "description": "Unique name of the data store.",
-              "title": "Data Store Name"
+              "description": "Kong service ID or display name of the data store.",
+              "title": "Datastore Id Or Name"
             },
-            "description": "Unique name of the data store."
+            "description": "Kong service ID or display name of the data store."
+          },
+          {
+            "name": "cascade",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "boolean",
+              "description": "Also delete existing project links (routes)",
+              "default": false,
+              "title": "Cascade"
+            },
+            "description": "Also delete existing project links (routes)"
           }
         ],
         "responses": {
@@ -2498,34 +2492,59 @@
             }
           }
         }
-      },
-      "post": {
+      }
+    },
+    "/kong/project/{project_id}": {
+      "get": {
         "tags": ["Kong"],
-        "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",
+        "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": []
           }
         ],
-        "requestBody": {
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/Body_kong_project_create_kong_project_post"
-              }
-            }
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "string"
+                }
+              ],
+              "description": "UUID of the associated project.",
+              "title": "Project Id"
+            },
+            "description": "UUID of the associated project."
+          },
+          {
+            "name": "detailed",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "boolean",
+              "description": "Whether to include detailed information on the connected kong service",
+              "default": false,
+              "title": "Detailed"
+            },
+            "description": "Whether to include detailed information on the connected kong service"
           }
-        },
+        ],
         "responses": {
-          "201": {
+          "200": {
             "description": "Successful Response",
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/LinkDataStoreProject"
+                  "$ref": "#/components/schemas/ListRoutes"
                 }
               }
             }
@@ -2544,14 +2563,12 @@
             }
           }
         }
-      }
-    },
-    "/kong/project/{project_id}": {
-      "get": {
+      },
+      "delete": {
         "tags": ["Kong"],
-        "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",
+        "summary": "Kong.Project.Delete",
+        "description": "Disconnect a project from all data stores and delete all its consumers (analyses + health).",
+        "operationId": "kong_project_delete_kong_project__project_id__delete",
         "security": [
           {
             "JWT": []
@@ -2572,22 +2589,10 @@
                   "type": "string"
                 }
               ],
-              "description": "UUID of the associated project.",
+              "description": "UUID of the project",
               "title": "Project Id"
             },
-            "description": "UUID of the associated project."
-          },
-          {
-            "name": "detailed",
-            "in": "query",
-            "required": false,
-            "schema": {
-              "type": "boolean",
-              "description": "Whether to include detailed information on the connected kong service",
-              "default": false,
-              "title": "Detailed"
-            },
-            "description": "Whether to include detailed information on the connected kong service"
+            "description": "UUID of the project"
           }
         ],
         "responses": {
@@ -2596,7 +2601,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/ListRoutes"
+                  "$ref": "#/components/schemas/UnlinkResponse"
                 }
               }
             }
@@ -2617,21 +2622,65 @@
         }
       }
     },
-    "/kong/initialize": {
+    "/kong/project/{project_id}/datastore/{datastore_id}": {
       "post": {
         "tags": ["Kong"],
-        "summary": "Kong.Initialize",
-        "description": "Creates a new datastore (service) and a new project (route), then links them together with a health consumer.",
-        "operationId": "kong_initialize_kong_initialize_post",
+        "summary": "Kong.Project.Link",
+        "description": "Link a project to a data store by creating a route on the store's service.\n\nA data store can only be linked to one project at a time.\nThe route's matching path is \"/{service_name}/{type}\" with no project identifier in it.",
+        "operationId": "kong_project_link_kong_project__project_id__datastore__datastore_id__post",
+        "security": [
+          {
+            "JWT": []
+          }
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "string"
+                }
+              ],
+              "description": "UUID of the project",
+              "title": "Project Id"
+            },
+            "description": "UUID of the project"
+          },
+          {
+            "name": "datastore_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "string"
+                }
+              ],
+              "description": "Kong service ID of the data store",
+              "title": "Datastore Id"
+            },
+            "description": "Kong service ID of the data store"
+          }
+        ],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/Body_kong_initialize_kong_initialize_post"
+                "$ref": "#/components/schemas/Body_kong_project_link_kong_project__project_id__datastore__datastore_id__post"
               }
             }
-          },
-          "required": true
+          }
         },
         "responses": {
           "201": {
@@ -2657,20 +2706,13 @@
               }
             }
           }
-        },
-        "security": [
-          {
-            "JWT": []
-          }
-        ]
-      }
-    },
-    "/kong/project/{project_route_id}": {
+        }
+      },
       "delete": {
         "tags": ["Kong"],
-        "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",
+        "summary": "Kong.Project.Unlink",
+        "description": "Unlink a single data store from a project. Consumers (analyses) are kept.",
+        "operationId": "kong_project_unlink_kong_project__project_id__datastore__datastore_id__delete",
         "security": [
           {
             "JWT": []
@@ -2678,15 +2720,42 @@
         ],
         "parameters": [
           {
-            "name": "project_route_id",
+            "name": "project_id",
             "in": "path",
             "required": true,
             "schema": {
-              "type": "string",
-              "description": "Unique identifier of the route to be deleted, must include datastore type hyphenated at the end",
-              "title": "Project Route Id"
+              "anyOf": [
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "string"
+                }
+              ],
+              "description": "UUID of the project",
+              "title": "Project Id"
+            },
+            "description": "UUID of the project"
+          },
+          {
+            "name": "datastore_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                {
+                  "type": "string"
+                }
+              ],
+              "description": "Kong service ID of the data store",
+              "title": "Datastore Id"
             },
-            "description": "Unique identifier of the route to be deleted, must include datastore type hyphenated at the end"
+            "description": "Kong service ID of the data store"
           }
         ],
         "responses": {
@@ -2695,7 +2764,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/DeleteProject"
+                  "$ref": "#/components/schemas/UnlinkResponse"
                 }
               }
             }
@@ -2716,11 +2785,59 @@
         }
       }
     },
+    "/kong/initialize": {
+      "post": {
+        "tags": ["Kong"],
+        "summary": "Kong.Initialize",
+        "description": "Creates a new datastore (service) and a new project (route), then links them together with a health consumer.",
+        "operationId": "kong_initialize_kong_initialize_post",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Body_kong_initialize_kong_initialize_post"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "201": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/LinkDataStoreProject"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not found"
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/HTTPValidationError"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
+      }
+    },
     "/kong/analysis": {
       "get": {
         "tags": ["Kong"],
         "summary": "Kong.Analysis.Get",
-        "description": "List all analyses (referred to as consumers by kong) available. Can be filtered by project UUID using tag.",
+        "description": "List all analyses (referred to as consumers by kong) available. Can be filtered by project UUID.",
         "operationId": "kong_analysis_get_kong_analysis_get",
         "security": [
           {
@@ -2729,7 +2846,7 @@
         ],
         "parameters": [
           {
-            "name": "tag",
+            "name": "project_id",
             "in": "query",
             "required": false,
             "schema": {
@@ -2741,10 +2858,10 @@
                   "type": "null"
                 }
               ],
-              "description": "Filter consumers by project using the project UUID",
-              "title": "Tag"
+              "description": "Filter consumers by project UUID",
+              "title": "Project Id"
             },
-            "description": "Filter consumers by project using the project UUID"
+            "description": "Filter consumers by project UUID"
           }
         ],
         "responses": {
@@ -2855,7 +2972,7 @@
             "description": "UUID of the analysis."
           },
           {
-            "name": "tag",
+            "name": "project_id",
             "in": "query",
             "required": false,
             "schema": {
@@ -2867,10 +2984,10 @@
                   "type": "null"
                 }
               ],
-              "description": "Filter consumers by project using the project UUID",
-              "title": "Tag"
+              "description": "Filter consumers by project UUID",
+              "title": "Project Id"
             },
-            "description": "Filter consumers by project using the project UUID"
+            "description": "Filter consumers by project UUID"
           }
         ],
         "responses": {
@@ -2902,7 +3019,7 @@
       "delete": {
         "tags": ["Kong"],
         "summary": "Kong.Analysis.Delete",
-        "description": "Delete the listed analysis.",
+        "description": "Delete the listed analysis (consumer), resolved via its tag.",
         "operationId": "kong_analysis_delete_kong_analysis__analysis_id__delete",
         "security": [
           {
@@ -2924,10 +3041,10 @@
                   "format": "uuid"
                 }
               ],
-              "description": "UUID or unique name of the analysis.",
+              "description": "UUID of the analysis.",
               "title": "Analysis Id"
             },
-            "description": "UUID or unique name of the analysis."
+            "description": "UUID of the analysis."
           }
         ],
         "responses": {
@@ -2955,12 +3072,12 @@
         }
       }
     },
-    "/kong/project/{project_id}/{ds_type}/health": {
+    "/kong/project/{project_id}/datastore/{datastore_id}/health": {
       "get": {
         "tags": ["Kong"],
         "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",
+        "description": "Test whether Kong can read the given data store through the project's link.\n\nBecause we use the key-auth plugin, a consumer is required for pinging the data service.",
+        "operationId": "kong_probe_kong_project__project_id__datastore__datastore_id__health_get",
         "security": [
           {
             "JWT": []
@@ -2981,20 +3098,29 @@
                   "format": "uuid"
                 }
               ],
-              "description": "UUID or unique name of the project.",
+              "description": "UUID of the project.",
               "title": "Project Id"
             },
-            "description": "UUID or unique name of the project."
+            "description": "UUID of the project."
           },
           {
-            "name": "ds_type",
+            "name": "datastore_id",
             "in": "path",
             "required": true,
             "schema": {
-              "$ref": "#/components/schemas/DataStoreType",
-              "description": "Either \"fhir\" or \"s3\""
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              ],
+              "description": "Kong service ID of the data store.",
+              "title": "Datastore Id"
             },
-            "description": "Either \"fhir\" or \"s3\""
+            "description": "Kong service ID of the data store."
           }
         ],
         "responses": {
@@ -4182,6 +4308,18 @@
             "format": "uuid",
             "title": "User Id"
           },
+          "client_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "uuid"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Client Id"
+          },
           "project": {
             "$ref": "#/components/schemas/Project"
           },
@@ -4226,7 +4364,8 @@
           "created_at",
           "updated_at",
           "realm_id",
-          "user_id"
+          "user_id",
+          "client_id"
         ],
         "title": "Analysis"
       },
@@ -4593,7 +4732,8 @@
           "interval": {
             "anyOf": [
               {
-                "type": "integer"
+                "type": "integer",
+                "exclusiveMinimum": 0.0
               },
               {
                 "type": "null"
@@ -4746,16 +4886,16 @@
             "$ref": "#/components/schemas/DataStoreType",
             "description": "Data store type. Either 's3' or 'fhir'"
           },
-          "minio_config": {
+          "s3_config": {
             "anyOf": [
               {
-                "$ref": "#/components/schemas/MinioConfig"
+                "$ref": "#/components/schemas/S3Config"
               },
               {
                 "type": "null"
               }
             ],
-            "description": "Minio configuration"
+            "description": "S3 configuration"
           }
         },
         "type": "object",
@@ -4786,59 +4926,48 @@
             "description": "List of acceptable transfer protocols. A combo of 'http', 'grpc', 'grpcs', 'tls', 'tcp'",
             "default": ["http"]
           },
-          "ds_type": {
-            "$ref": "#/components/schemas/DataStoreType",
-            "description": "Data store type. Either 's3' or 'fhir'"
+          "methods": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/HttpMethodCode"
+                },
+                "type": "array"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Methods",
+            "description": "List of acceptable HTTP methods"
           },
           "datastore": {
             "$ref": "#/components/schemas/ServiceRequest",
             "title": "Data store metadata.",
             "description": "Required information for creating a new data store."
           },
-          "minio_config": {
+          "ds_type": {
+            "$ref": "#/components/schemas/DataStoreType",
+            "description": "Data store type. Either 's3' or 'fhir'"
+          },
+          "s3_config": {
             "anyOf": [
               {
-                "$ref": "#/components/schemas/MinioConfig"
+                "$ref": "#/components/schemas/S3Config"
               },
               {
                 "type": "null"
               }
             ],
-            "description": "Minio configuration"
+            "description": "S3 configuration"
           }
         },
         "type": "object",
-        "required": ["project_id", "ds_type", "datastore"],
+        "required": ["project_id", "datastore", "ds_type"],
         "title": "Body_kong_initialize_kong_initialize_post"
       },
-      "Body_kong_project_create_kong_project_post": {
+      "Body_kong_project_link_kong_project__project_id__datastore__datastore_id__post": {
         "properties": {
-          "data_store_id": {
-            "anyOf": [
-              {
-                "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"
-              }
-            ],
-            "title": "Project Id",
-            "description": "UUID of the project"
-          },
           "methods": {
             "anyOf": [
               {
@@ -4868,16 +4997,10 @@
             ],
             "title": "Protocols",
             "description": "List of acceptable transfer protocols. A combo of 'http', 'grpc', 'grpcs', 'tls', 'tcp'"
-          },
-          "ds_type": {
-            "$ref": "#/components/schemas/DataStoreType",
-            "description": "Data store type. Either 's3' or 'fhir'",
-            "default": "fhir"
           }
         },
         "type": "object",
-        "required": ["data_store_id", "project_id"],
-        "title": "Body_kong_project_create_kong_project_post"
+        "title": "Body_kong_project_link_kong_project__project_id__datastore__datastore_id__post"
       },
       "Body_podorc_pods_create_po_post": {
         "properties": {
@@ -5072,92 +5195,43 @@
           "username": {
             "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."
-          }
-        },
-        "type": "object",
-        "title": "Consumer",
-        "description": "The Consumer object represents a consumer - or a user - of a service. You can either rely on Kong as the primary datastore, or you can map the consumer list with your database to keep consistency between Kong and your existing primary datastore."
-      },
-      "CreateServiceRequestClientCertificate": {
-        "properties": {
-          "id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Id"
-          }
-        },
-        "type": "object",
-        "title": "CreateServiceRequestClientCertificate",
-        "description": "Certificate to be used as client certificate while TLS handshaking to the upstream server. With form-encoded, the notation is `client_certificate.id=<client_certificate id>`. With JSON, use `\"client_certificate\":{\"id\":\"<client_certificate id>\"}`."
-      },
-      "DataStoreType": {
-        "type": "string",
-        "enum": ["s3", "fhir"],
-        "title": "DataStoreType",
-        "description": "Data store types."
-      },
-      "DeleteProject": {
-        "properties": {
-          "removed": {
-            "anyOf": [
-              {
-                "$ref": "#/components/schemas/Route"
-              },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "status": {
-            "anyOf": [
-              {
-                "type": "integer"
+                "type": "string"
               },
               {
                 "type": "null"
               }
             ],
-            "title": "Status"
+            "title": "Username",
+            "description": "The unique username of the Consumer. You must send either this field or `custom_id` with the request."
           }
         },
         "type": "object",
-        "required": ["removed"],
-        "title": "DeleteProject",
-        "description": "Response from disconnecting a project from a datastore."
+        "title": "Consumer",
+        "description": "The Consumer object represents a consumer - or a user - of a service. You can either rely on Kong as the primary datastore, or you can map the consumer list with your database to keep consistency between Kong and your existing primary datastore."
       },
-      "DeleteService": {
+      "CreateServiceRequestClientCertificate": {
         "properties": {
-          "deleted": {
-            "items": {
-              "additionalProperties": true,
-              "type": "object"
-            },
-            "type": "array",
-            "title": "Deleted"
-          },
-          "count": {
-            "type": "integer",
-            "title": "Count"
+          "id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Id"
           }
         },
         "type": "object",
-        "required": ["deleted", "count"],
-        "title": "DeleteService",
-        "description": "Response for deleting orphaned services."
+        "title": "CreateServiceRequestClientCertificate",
+        "description": "Certificate to be used as client certificate while TLS handshaking to the upstream server. With form-encoded, the notation is `client_certificate.id=<client_certificate id>`. With JSON, use `\"client_certificate\":{\"id\":\"<client_certificate id>\"}`."
+      },
+      "DataStoreType": {
+        "type": "string",
+        "enum": ["s3", "fhir"],
+        "title": "DataStoreType",
+        "description": "Data store types."
       },
       "DetailedAnalysis": {
         "properties": {
@@ -5427,6 +5501,18 @@
             "format": "uuid",
             "title": "User Id"
           },
+          "client_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "uuid"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Client Id"
+          },
           "project": {
             "anyOf": [
               {
@@ -5478,7 +5564,8 @@
           "created_at",
           "updated_at",
           "realm_id",
-          "user_id"
+          "user_id",
+          "client_id"
         ],
         "title": "DetailedAnalysis",
         "description": "Model representing a single detailed analysis."
@@ -6038,41 +6125,66 @@
       "DownstreamHealthCheck": {
         "properties": {
           "po": {
+            "$ref": "#/components/schemas/HealthCheck"
+          },
+          "storage": {
+            "$ref": "#/components/schemas/HealthCheck"
+          },
+          "hub_core": {
+            "$ref": "#/components/schemas/HealthCheck"
+          },
+          "hub_auth": {
+            "$ref": "#/components/schemas/HealthCheck"
+          },
+          "idp": {
+            "$ref": "#/components/schemas/HealthCheck"
+          },
+          "kong": {
+            "$ref": "#/components/schemas/HealthCheck"
+          },
+          "victoria_logs": {
             "anyOf": [
               {
                 "$ref": "#/components/schemas/HealthCheck"
               },
               {
-                "type": "string"
+                "type": "null"
               }
-            ],
-            "title": "Po"
+            ]
           },
-          "storage": {
+          "message_broker": {
             "anyOf": [
               {
                 "$ref": "#/components/schemas/HealthCheck"
               },
               {
-                "type": "string"
+                "type": "null"
               }
-            ],
-            "title": "Storage"
+            ]
           },
-          "kong": {
+          "s3": {
             "anyOf": [
               {
                 "$ref": "#/components/schemas/HealthCheck"
               },
               {
-                "type": "string"
+                "type": "null"
               }
-            ],
-            "title": "Kong"
+            ]
+          },
+          "fhir": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/HealthCheck"
+              },
+              {
+                "type": "null"
+              }
+            ]
           }
         },
         "type": "object",
-        "required": ["po", "storage", "kong"],
+        "required": ["po", "storage", "hub_core", "hub_auth", "idp", "kong"],
         "title": "DownstreamHealthCheck",
         "description": "Response model for downstream health checks."
       },
@@ -6166,11 +6278,34 @@
         "properties": {
           "status": {
             "type": "string",
-            "title": "Status",
-            "default": "OK"
+            "enum": ["OK", "WARNING", "ERROR", "CRITICAL"],
+            "title": "Status"
+          },
+          "status_code": {
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Status Code"
+          },
+          "message": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Message"
           }
         },
         "type": "object",
+        "required": ["status"],
         "title": "HealthCheck",
         "description": "Response model to validate and return when performing a health check."
       },
@@ -6307,6 +6442,27 @@
         "title": "KeyAuthConsumer",
         "description": "The Consumer to which this Key is associated. A Consumer can have many Key-auth credentials."
       },
+      "KongCleanupSettings": {
+        "properties": {
+          "interval": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "exclusiveMinimum": 0.0
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Interval",
+            "default": 30
+          }
+        },
+        "additionalProperties": false,
+        "type": "object",
+        "title": "KongCleanupSettings",
+        "description": "Settings for the background sweep that deletes Kong analysis consumers once their analysis\nreaches a terminal status. Always runs; only the interval is configurable."
+      },
       "LinkDataStoreProject": {
         "properties": {
           "route": {
@@ -6670,58 +6826,6 @@
         "title": "Meta",
         "description": "Event log metadata model."
       },
-      "MinioConfig": {
-        "properties": {
-          "minio_access_key": {
-            "type": "string",
-            "format": "password",
-            "title": "Minio Access Key",
-            "writeOnly": true
-          },
-          "minio_secret_key": {
-            "type": "string",
-            "format": "password",
-            "title": "Minio Secret Key",
-            "writeOnly": true
-          },
-          "minio_region": {
-            "type": "string",
-            "title": "Minio Region",
-            "default": "us-east-1"
-          },
-          "bucket_name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Bucket Name"
-          },
-          "timeout": {
-            "type": "integer",
-            "title": "Timeout",
-            "default": 100000
-          },
-          "strip_path_pattern": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Strip Path Pattern"
-          }
-        },
-        "type": "object",
-        "required": ["minio_access_key", "minio_secret_key"],
-        "title": "MinioConfig",
-        "description": "Credentials for accessing a private S3 bucket hosted on MinIO."
-      },
       "NetStatResponse": {
         "properties": {
           "data": {
@@ -6921,18 +7025,6 @@
               }
             ]
           },
-          "robot_id": {
-            "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Robot Id"
-          },
           "client_id": {
             "anyOf": [
               {
@@ -6968,7 +7060,6 @@
           "public_key",
           "online",
           "registry_project_id",
-          "robot_id",
           "client_id",
           "created_at",
           "updated_at"
@@ -7064,8 +7155,6 @@
           "started",
           "stopping",
           "stopped",
-          "running",
-          "finished",
           "executing",
           "executed",
           "stuck",
@@ -7163,18 +7252,6 @@
               }
             ],
             "title": "User Id"
-          },
-          "robot_id": {
-            "anyOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Robot Id"
           }
         },
         "type": "object",
@@ -7189,8 +7266,7 @@
           "created_at",
           "updated_at",
           "realm_id",
-          "user_id",
-          "robot_id"
+          "user_id"
         ],
         "title": "Project"
       },
@@ -7835,6 +7911,58 @@
         "title": "RunLogs",
         "description": "Logs for a single analysis run."
       },
+      "S3Config": {
+        "properties": {
+          "s3_access_key": {
+            "type": "string",
+            "format": "password",
+            "title": "S3 Access Key",
+            "writeOnly": true
+          },
+          "s3_secret_key": {
+            "type": "string",
+            "format": "password",
+            "title": "S3 Secret Key",
+            "writeOnly": true
+          },
+          "s3_region": {
+            "type": "string",
+            "title": "S3 Region",
+            "default": "us-east-1"
+          },
+          "bucket_name": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Bucket Name"
+          },
+          "timeout": {
+            "type": "integer",
+            "title": "Timeout",
+            "default": 100000
+          },
+          "strip_path_pattern": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Strip Path Pattern"
+          }
+        },
+        "type": "object",
+        "required": ["s3_access_key", "s3_secret_key"],
+        "title": "S3Config",
+        "description": "Credentials for accessing a private S3 bucket."
+      },
       "Service": {
         "properties": {
           "ca_certificates": {
@@ -8290,6 +8418,7 @@
         "enum": [
           "Auth",
           "Autostart",
+          "Kong Cleanup",
           "Logs",
           "Health",
           "Hub",
@@ -8365,6 +8494,40 @@
         "title": "Token",
         "description": "IDP token model."
       },
+      "UnlinkResponse": {
+        "properties": {
+          "removed_routes": {
+            "items": {
+              "$ref": "#/components/schemas/Route"
+            },
+            "type": "array",
+            "title": "Removed Routes"
+          },
+          "removed_consumers": {
+            "items": {
+              "$ref": "#/components/schemas/Consumer"
+            },
+            "type": "array",
+            "title": "Removed Consumers",
+            "default": []
+          },
+          "status": {
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Status"
+          }
+        },
+        "type": "object",
+        "required": ["removed_routes"],
+        "title": "UnlinkResponse",
+        "description": "Response for unlinking a data store from a project or deleting a whole project."
+      },
       "UserSettings": {
         "properties": {
           "require_data_store": {
@@ -8392,6 +8555,19 @@
               "enabled": false,
               "interval": 60
             }
+          },
+          "kong_cleanup": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/KongCleanupSettings"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "default": {
+              "interval": 30
+            }
           }
         },
         "type": "object",
diff --git a/app/utils/data-store-name.ts b/app/utils/data-store-name.ts
new file mode 100644
index 00000000..442ad6cb
--- /dev/null
+++ b/app/utils/data-store-name.ts
@@ -0,0 +1,101 @@
+// Sanitize with regex!
+const DATA_STORE_NAME_PATTERN = /^[a-zA-Z0-9._~-]+$/;
+const UUID_PATTERN =
+  /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;
+
+export function isValidDataStoreName(name: string): boolean {
+  return DATA_STORE_NAME_PATTERN.test(name) && !UUID_PATTERN.test(name);
+}
+
+// Derive a valid default data store name from a project name
+export function generateDataStoreName(projectName: string): string {
+  const sanitized = projectName
+    .trim()
+    .replace(/[^a-zA-Z0-9._~-]+/g, "-")
+    .replace(/^-+|-+$/g, "");
+
+  if (!sanitized) {
+    return "datastore";
+  }
+
+  return UUID_PATTERN.test(sanitized) ? `${sanitized}-datastore` : sanitized;
+}
+
+// Words for generating pseduo random data store name suggestions
+const ADJECTIVES = [
+  "able",
+  "agile",
+  "amber",
+  "bold",
+  "brave",
+  "bright",
+  "calm",
+  "clever",
+  "cosmic",
+  "crisp",
+  "daring",
+  "eager",
+  "fancy",
+  "gentle",
+  "golden",
+  "happy",
+  "humble",
+  "jolly",
+  "keen",
+  "lively",
+  "lucid",
+  "mellow",
+  "mighty",
+  "nimble",
+  "noble",
+  "polished",
+  "proud",
+  "quick",
+  "quiet",
+  "silver",
+  "swift",
+  "witty"
+] as const;
+
+const NOUNS = [
+  "badger",
+  "bison",
+  "crane",
+  "dolphin",
+  "falcon",
+  "finch",
+  "fox",
+  "gazelle",
+  "heron",
+  "ibex",
+  "jaguar",
+  "koala",
+  "lemur",
+  "lynx",
+  "marmot",
+  "marten",
+  "mole",
+  "narwhal",
+  "otter",
+  "owl",
+  "panda",
+  "pelican",
+  "puffin",
+  "quokka",
+  "rabbit",
+  "raven",
+  "salmon",
+  "seal",
+  "sparrow",
+  "tern",
+  "walrus",
+  "wren"
+] as const;
+
+function randomItem(items: readonly string[]): string {
+  return items[Math.floor(Math.random() * items.length)]!;
+}
+
+export function generateRandomDataStoreName(projectName: string): string {
+  return `${generateDataStoreName(projectName)}-${randomItem(ADJECTIVES)}-${randomItem(NOUNS)}`;
+}
diff --git a/app/utils/extract-uuid-from-kong-username.ts b/app/utils/extract-uuid-from-kong-username.ts
deleted file mode 100644
index 61f5fdee..00000000
--- a/app/utils/extract-uuid-from-kong-username.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export function extractUuid(kongName: string): string[] {
-  const uuid = kongName.split("-");
-  const dsType = uuid.pop() as string;
-  return [dsType, uuid.join("-")];
-}
diff --git a/app/utils/parse-kong-tags.ts b/app/utils/parse-kong-tags.ts
new file mode 100644
index 00000000..19ca9c93
--- /dev/null
+++ b/app/utils/parse-kong-tags.ts
@@ -0,0 +1,16 @@
+// Mirrors the hub adapter's kong_ident.parse_tags: relationships between FLAME
+// entities and Kong entities are carried in tags like "project:<uuid>",
+// "datastore:<kong service id>", and "type:<s3|fhir>". Valueless tags
+// (e.g. "health") are skipped.
+export function parseKongTags(
+  tags: string[] | null | undefined,
+): Record<string, string> {
+  const parsed: Record<string, string> = {};
+  for (const tag of tags ?? []) {
+    const separatorIdx = tag.indexOf(":");
+    if (separatorIdx > 0) {
+      parsed[tag.slice(0, separatorIdx)] = tag.slice(separatorIdx + 1);
+    }
+  }
+  return parsed;
+}
diff --git a/test/components/data-stores/DataStoreList.spec.ts b/test/components/data-stores/DataStoreList.spec.ts
index cf3e0a25..578d2fea 100644
--- a/test/components/data-stores/DataStoreList.spec.ts
+++ b/test/components/data-stores/DataStoreList.spec.ts
@@ -9,7 +9,6 @@ import { fakeDataStoreResp, fakeProjectResp } from "./constants";
 vi.mock("~/composables/useAPIFetch", () => ({
   getProjects: vi.fn(),
   getAnalyses: vi.fn(),
-  getAnalysesFromKong: vi.fn(),
   getDataStores: vi.fn(),
 }));
 
diff --git a/test/components/data-stores/constants.ts b/test/components/data-stores/constants.ts
index 9450da27..9434b16a 100644
--- a/test/components/data-stores/constants.ts
+++ b/test/components/data-stores/constants.ts
@@ -28,9 +28,11 @@ export const fakeDataStoreInitSuccess = {
     https_redirect_status_code: 426,
     id: "abbbf2f8-0c2d-4c23-a2dc-d3ebb5cf9708",
     methods: ["GET"],
-    name: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483-fhir",
+    name: null,
     path_handling: "v0",
-    paths: ["/7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483/fhir"],
+    paths: [
+      "/7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483/2ad18d4d-395a-49f3-a553-981a02f52422",
+    ],
     preserve_host: false,
     protocols: ["http"],
     regex_priority: 0,
@@ -42,7 +44,11 @@ export const fakeDataStoreInitSuccess = {
     snis: undefined,
     sources: undefined,
     strip_path: true,
-    tags: ["7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483", "fhir"],
+    tags: [
+      "project:7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
+      "datastore:2ad18d4d-395a-49f3-a553-981a02f52422",
+      "type:fhir",
+    ],
     updated_at: 1743059035,
   },
   keyauth: {
@@ -261,13 +267,13 @@ export const fakeDataStoreResp: ListServices = {
       enabled: true,
       host: "whonnock",
       id: "2ad18d4d-395a-49f3-a553-981a02f52422",
-      name: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
+      name: "ds-store-test",
       path: "/foo",
       port: 80,
       protocol: "http",
       read_timeout: 6000,
       retries: 5,
-      tags: ["7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483"],
+      tags: ["type:fhir"],
       tls_verify: undefined,
       tls_verify_depth: undefined,
       updated_at: 1743059035,
@@ -282,9 +288,11 @@ export const fakeDataStoreResp: ListServices = {
           https_redirect_status_code: 426,
           id: "abbbf2f8-0c2d-4c23-a2dc-d3ebb5cf9708",
           methods: ["GET"],
-          name: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483-fhir",
+          name: null,
           path_handling: "v0",
-          paths: ["/7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483/fhir"],
+          paths: [
+            "/7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483/2ad18d4d-395a-49f3-a553-981a02f52422",
+          ],
           preserve_host: false,
           protocols: ["http"],
           regex_priority: 0,
@@ -294,7 +302,11 @@ export const fakeDataStoreResp: ListServices = {
           snis: undefined,
           sources: undefined,
           strip_path: true,
-          tags: ["7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483", "fhir"],
+          tags: [
+            "project:7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
+            "datastore:2ad18d4d-395a-49f3-a553-981a02f52422",
+            "type:fhir",
+          ],
           updated_at: 1743059035,
         },
       ],
diff --git a/test/components/data-stores/create/DataStoreProjectInitializer.spec.ts b/test/components/data-stores/create/DataStoreProjectInitializer.spec.ts
index 25fd23ea..dc96f137 100644
--- a/test/components/data-stores/create/DataStoreProjectInitializer.spec.ts
+++ b/test/components/data-stores/create/DataStoreProjectInitializer.spec.ts
@@ -290,8 +290,11 @@ describe("DataStoreProjectInitializer.vue", () => {
 
     const vm = localWrapper.findComponent(DataStoreProjectInitializer).vm;
     expect(vm.selectedProject?.id).toBe(target.id);
-    // The generated data store name is derived from the selected project id
-    expect(vm.dataStoreName).toBe(target.id);
+    // The generated data store name is derived from the selected project name
+    // plus a random adjective-noun suffix
+    expect(vm.dataStoreName).toMatch(
+      new RegExp(`^${target.name}-[a-z]+-[a-z]+$`),
+    );
 
     localWrapper.unmount();
   });
@@ -380,4 +383,34 @@ describe("DataStoreProjectInitializer.vue", () => {
       expect(wrapper.find(".data-store-path-input-fhir").exists()).toBe(true);
     });
   });
+
+  it("Generates a random data store name and rerolls it", async () => {
+    const randomSpy = vi.spyOn(Math, "random").mockReturnValue(0);
+
+    // Disabled until a project is selected
+    const rerollBtn = wrapper.find(".reroll-name-btn");
+    expect(rerollBtn.exists()).toBe(true);
+    expect(rerollBtn.attributes("disabled")).toBeDefined();
+
+    const project = innerVm().availableProjects[0];
+    innerVm().selectedProject = project;
+    await innerVm().$nextTick();
+
+    const namePattern = new RegExp(`^${project.name}-[a-z]+-[a-z]+$`);
+    const firstName = innerVm().dataStoreName;
+    expect(firstName).toMatch(namePattern);
+    expect(
+      wrapper.find(".reroll-name-btn").attributes("disabled"),
+    ).toBeUndefined();
+
+    // Force a different pair and reroll
+    randomSpy.mockReturnValue(0.999);
+    await wrapper.find(".reroll-name-btn").trigger("click");
+
+    const secondName = innerVm().dataStoreName;
+    expect(secondName).toMatch(namePattern);
+    expect(secondName).not.toBe(firstName);
+
+    randomSpy.mockRestore();
+  });
 });
diff --git a/test/components/header/CleanupDialog.spec.ts b/test/components/header/CleanupDialog.spec.ts
index c54d6e75..e905069f 100644
--- a/test/components/header/CleanupDialog.spec.ts
+++ b/test/components/header/CleanupDialog.spec.ts
@@ -60,7 +60,8 @@ describe("CleanupDialog.vue", () => {
       expect(spy).toHaveBeenCalledWith({
         severity: "success",
         summary: "Cleanup Started",
-        detail: "Cleanup request successfully submitted",
+        detail:
+          "Cleanup request successfully submitted, number of modified resources: Valid response",
         life: 5000,
       });
     }
diff --git a/test/mockapi/handlers.ts b/test/mockapi/handlers.ts
index 9222c3e8..5d13614f 100644
--- a/test/mockapi/handlers.ts
+++ b/test/mockapi/handlers.ts
@@ -260,9 +260,11 @@ export const handlers = [
           https_redirect_status_code: 426,
           id: "ca6ba716-3e3a-4841-a9c3-0db732a74cd9",
           methods: ["GET"],
-          name: "7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483-fhir",
+          name: null,
           path_handling: "v0",
-          paths: ["/7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483-fhir/fhir"],
+          paths: [
+            "/7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483/1b7bc86e-fe14-4e15-ade5-4187183aad46",
+          ],
           preserve_host: false,
           protocols: ["http"],
           regex_priority: 0,
@@ -274,7 +276,11 @@ export const handlers = [
           snis: undefined,
           sources: undefined,
           strip_path: true,
-          tags: ["7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483", "fhir"],
+          tags: [
+            "project:7f2f3b59-3b6d-4fb6-a900-2a4d5c2ea483",
+            "datastore:1b7bc86e-fe14-4e15-ade5-4187183aad46",
+            "type:fhir",
+          ],
           updated_at: 1749192126,
         },
       ],
diff --git a/test/utils/data-store-name.test.ts b/test/utils/data-store-name.test.ts
new file mode 100644
index 00000000..5acd0135
--- /dev/null
+++ b/test/utils/data-store-name.test.ts
@@ -0,0 +1,88 @@
+import { afterEach, describe, expect, test, vi } from "vitest";
+import {
+  generateDataStoreName,
+  generateRandomDataStoreName,
+  isValidDataStoreName,
+} from "~/utils/data-store-name";
+
+describe("isValidDataStoreName", () => {
+  test("accepts URL-safe names", () => {
+    expect(isValidDataStoreName("my-data.store_1~x")).toBe(true);
+  });
+
+  test("rejects names with invalid characters", () => {
+    expect(isValidDataStoreName("my data store")).toBe(false);
+    expect(isValidDataStoreName("store/1")).toBe(false);
+    expect(isValidDataStoreName("")).toBe(false);
+  });
+
+  test("rejects bare UUIDs", () => {
+    expect(isValidDataStoreName("97ed7bca-d56c-41b1-9625-61d20d90690c")).toBe(
+      false,
+    );
+  });
+});
+
+describe("generateDataStoreName", () => {
+  test("keeps already valid names", () => {
+    expect(generateDataStoreName("my-fake-project-1")).toBe(
+      "my-fake-project-1",
+    );
+  });
+
+  test("replaces invalid characters", () => {
+    expect(generateDataStoreName("My Fancy Project!")).toBe("My-Fancy-Project");
+  });
+
+  test("suffixes bare UUIDs", () => {
+    expect(generateDataStoreName("97ed7bca-d56c-41b1-9625-61d20d90690c")).toBe(
+      "97ed7bca-d56c-41b1-9625-61d20d90690c-datastore",
+    );
+  });
+
+  test("falls back for empty names", () => {
+    expect(generateDataStoreName("  ")).toBe("datastore");
+  });
+});
+
+describe("generateRandomDataStoreName", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  test("prefixes the sanitized project name and appends an adjective-noun pair", () => {
+    expect(generateRandomDataStoreName("My Fancy Project!")).toMatch(
+      /^My-Fancy-Project-[a-z]+-[a-z]+$/,
+    );
+  });
+
+  test("is deterministic for a fixed random source", () => {
+    vi.spyOn(Math, "random").mockReturnValue(0);
+    const first = generateRandomDataStoreName("proj");
+    const second = generateRandomDataStoreName("proj");
+    expect(first).toBe(second);
+    expect(first).toMatch(/^proj-[a-z]+-[a-z]+$/);
+  });
+
+  test("varies with the random source", () => {
+    const spy = vi.spyOn(Math, "random").mockReturnValue(0);
+    const first = generateRandomDataStoreName("proj");
+    spy.mockReturnValue(0.999);
+    const second = generateRandomDataStoreName("proj");
+    expect(first).not.toBe(second);
+  });
+
+  test("always produces valid names, even for hostile project names", () => {
+    for (const projectName of [
+      "  ",
+      "97ed7bca-d56c-41b1-9625-61d20d90690c",
+      "spaces and / slashes",
+    ]) {
+      for (let i = 0; i < 20; i++) {
+        expect(
+          isValidDataStoreName(generateRandomDataStoreName(projectName)),
+        ).toBe(true);
+      }
+    }
+  });
+});
diff --git a/test/utils/extract-uuid.test.ts b/test/utils/extract-uuid.test.ts
deleted file mode 100644
index fcd2f586..00000000
--- a/test/utils/extract-uuid.test.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { expect, test } from "vitest";
-import { extractUuid } from "~/utils/extract-uuid-from-kong-username";
-
-test("Extract UUID from Kong name", () => {
-  expect(
-    extractUuid("97ed7bca-d56c-41b1-9625-61d20d90690c-fhir"),
-  ).toStrictEqual(["fhir", "97ed7bca-d56c-41b1-9625-61d20d90690c"]);
-});
diff --git a/test/utils/parse-kong-tags.test.ts b/test/utils/parse-kong-tags.test.ts
new file mode 100644
index 00000000..6aec09eb
--- /dev/null
+++ b/test/utils/parse-kong-tags.test.ts
@@ -0,0 +1,30 @@
+import { expect, test } from "vitest";
+import { parseKongTags } from "~/utils/parse-kong-tags";
+
+test("Parse relationship tags from a Kong entity", () => {
+  expect(
+    parseKongTags([
+      "project:97ed7bca-d56c-41b1-9625-61d20d90690c",
+      "datastore:2ad18d4d-395a-49f3-a553-981a02f52422",
+      "type:fhir",
+    ]),
+  ).toStrictEqual({
+    project: "97ed7bca-d56c-41b1-9625-61d20d90690c",
+    datastore: "2ad18d4d-395a-49f3-a553-981a02f52422",
+    type: "fhir",
+  });
+});
+
+test("Skip valueless tags", () => {
+  expect(
+    parseKongTags(["health", "project:97ed7bca-d56c-41b1-9625-61d20d90690c"]),
+  ).toStrictEqual({
+    project: "97ed7bca-d56c-41b1-9625-61d20d90690c",
+  });
+});
+
+test("Handle missing tags", () => {
+  expect(parseKongTags(undefined)).toStrictEqual({});
+  expect(parseKongTags(null)).toStrictEqual({});
+  expect(parseKongTags([])).toStrictEqual({});
+});