diff --git a/components/analysis/AnalysesTable.vue b/components/analysis/AnalysesTable.vue
index e40cc16f..5a089231 100644
--- a/components/analysis/AnalysesTable.vue
+++ b/components/analysis/AnalysesTable.vue
@@ -28,11 +28,26 @@ import {
 import { AnalysisBuildStatus, AnalysisNodeRunStatus } from "~/types/analysis";
 import { ApprovalStatus } from "~/types/node";
 import ContainerCounter from "~/components/analysis/ContainerCounter.vue";
-import { useNodeType } from "~/composables/useNodeType";
+import { useDatastoreRequirement } from "~/composables/useDatastoreRequirement";
 import type { ModifiedAnalysisNode } from "~/services/modifiedApiInterfaces";
 
 const toast = useToast();
-const nodeType = await useNodeType();
+
+// Data Store Requirement Check
+const { datastoreState } = await useDatastoreRequirement();
+const datastoreRequired = computed(
+  () => datastoreState.value.datastoreRequired,
+);
+const nodeType = computed(() => datastoreState.value.nodeType);
+
+const datastoreBadgeSeverity = computed(() =>
+  datastoreRequired.value ? "danger" : "secondary",
+);
+const datastoreBadgeTooltip = computed(() =>
+  datastoreRequired.value
+    ? "Data store missing!"
+    : "Data store missing, but not required",
+);
 
 const analysesMap = ref<Map<string, ModifiedAnalysisNode>>(new Map());
 const analyses = computed(() => Array.from(analysesMap.value.values()));
@@ -641,9 +656,11 @@ const onCloseNavToast = () => {
                 ></Badge>
               </div>
               <div v-else class="datastore-badge">
-                <Badge class="w-8 h-8 rounded-full" severity="danger"
+                <Badge
+                  class="w-8 h-8 rounded-full"
+                  :severity="datastoreBadgeSeverity"
                   ><i
-                    v-tooltip.top="'Data store missing!'"
+                    v-tooltip.top="datastoreBadgeTooltip"
                     class="pi pi-times"
                   ></i
                 ></Badge>
@@ -725,7 +742,7 @@ const onCloseNavToast = () => {
                   :analysisRunStatus="slotProps.data.run_status"
                   :datastore="slotProps.data.datastore"
                   :nodeId="slotProps.data.node_id"
-                  :nodeType="nodeType!"
+                  :requireDatastore="datastoreRequired!"
                   :projectId="slotProps.data.analysis.project_id"
                   @missingDataStore="showDataStoreNavToast"
                   @updateAnalysisRow="updateAnalysisRun"
diff --git a/components/analysis/AnalysisControlButtons.vue b/components/analysis/AnalysisControlButtons.vue
index bb893681..ab71484f 100644
--- a/components/analysis/AnalysisControlButtons.vue
+++ b/components/analysis/AnalysisControlButtons.vue
@@ -40,8 +40,8 @@ const props = defineProps({
     type: Boolean,
     required: true,
   },
-  nodeType: {
-    type: String,
+  requireDatastore: {
+    type: Boolean,
     required: true,
   },
 });
@@ -274,7 +274,7 @@ async function onDeleteAnalysis() {
       :disabled="
         !buttonStatuses.playActive ||
         !(props.analysisBuildStatus === AnalysisBuildStatus.Finished) ||
-        (!props.datastore && props.nodeType != 'aggregator')
+        (!props.datastore && props.requireDatastore)
       "
       :loading="loading"
       aria-label="Start"
@@ -289,7 +289,7 @@ async function onDeleteAnalysis() {
       :disabled="
         !buttonStatuses.rerunActive ||
         !(props.analysisBuildStatus === AnalysisBuildStatus.Finished) ||
-        (!props.datastore && props.nodeType != 'aggregator')
+        (!props.datastore && props.requireDatastore)
       "
       :loading="loading"
       aria-label="Rerun"
@@ -303,7 +303,7 @@ async function onDeleteAnalysis() {
       :disabled="
         !buttonStatuses.stopActive ||
         !(props.analysisBuildStatus === AnalysisBuildStatus.Finished) ||
-        (!props.datastore && props.nodeType != 'aggregator')
+        (!props.datastore && props.requireDatastore)
       "
       :loading="loading"
       aria-label="Stop"
@@ -317,7 +317,7 @@ async function onDeleteAnalysis() {
       :disabled="
         !buttonStatuses.deleteActive ||
         !(props.analysisBuildStatus === AnalysisBuildStatus.Finished) ||
-        (!props.datastore && props.nodeType != 'aggregator')
+        (!props.datastore && props.requireDatastore)
       "
       :loading="loading"
       aria-label="Delete"
diff --git a/components/events/EventViewer.vue b/components/events/EventViewer.vue
index 0c0d2628..9d214011 100644
--- a/components/events/EventViewer.vue
+++ b/components/events/EventViewer.vue
@@ -5,7 +5,7 @@ import SearchBar from "~/components/table/SearchBar.vue";
 import {
   EventLogLevelTag,
   EventServiceTag,
-  type EventTag
+  type EventTag,
 } from "~/types/eventTag";
 import TagFilterSidePanel from "~/components/events/TagFilterSidePanel.vue";
 import type { EventLog, EventLogResponse } from "~/services/Api";
@@ -21,21 +21,21 @@ const appliedFilters = ref<EventTag[]>([]);
 const logLevelColorMap = new Map([
   [EventLogLevelTag.Error, "#ef4444"],
   [EventLogLevelTag.Warning, "#eab308"],
-  [EventLogLevelTag.Info, "#3b82f6"]
+  [EventLogLevelTag.Info, "#3b82f6"],
 ]);
 const logLevelDistributions = ref(
   Array.from(logLevelColorMap, ([label, color]) => ({
     label,
     color,
-    value: 0
-  }))
+    value: 0,
+  })),
 );
 
 const filters = ref();
 
 const dateTimeFormat = new Intl.DateTimeFormat(undefined, {
   dateStyle: "short",
-  timeStyle: "long"
+  timeStyle: "long",
 });
 
 const { data: response, status } = await getEvents();
@@ -87,12 +87,16 @@ function formatEventName(eventName: string): string {
   return eventChunks.join("-");
 }
 
-function formatTimestamp(timestamp: string): string {
-  const date = new Date(timestamp + "Z"); // Python does not return timestamp with standard "Z"
-  const formattedDateTime = dateTimeFormat.format(date);
-  const [dateString, timeString] = formattedDateTime.split(", ");
+function formatTimestamp(timestamp: string): string | undefined {
+  try {
+    const date = new Date(timestamp); // Python does not return timestamp with standard "Z"
+    const formattedDateTime = dateTimeFormat.format(date);
+    const [dateString, timeString] = formattedDateTime.split(", ");
 
-  return `${dateString}<br><b>${timeString}</b>`;
+    return `${dateString}<br><b>${timeString}</b>`;
+  } catch (error) {
+    console.error(`Timestamp: ${timestamp}; Error: ${error}`);
+  }
 }
 
 function getLogLevelColor(tags: string[]): string | undefined {
@@ -101,7 +105,7 @@ function getLogLevelColor(tags: string[]): string | undefined {
     for (const tag of [
       EventLogLevelTag.Error,
       EventLogLevelTag.Warning,
-      EventLogLevelTag.Info
+      EventLogLevelTag.Info,
     ]) {
       if (tags.includes(tag)) {
         return logLevelColorMap.get(tag);
@@ -127,7 +131,7 @@ FilterService.register("tagsContainsAny", (value, filter) => {
 
 const defaultFilters = {
   global: { value: null, matchMode: FilterMatchMode.CONTAINS },
-  "attributes.tags": { value: null, matchMode: "tagsContainsAny" }
+  "attributes.tags": { value: null, matchMode: "tagsContainsAny" },
 };
 
 filters.value = defaultFilters;
@@ -140,7 +144,7 @@ function clearAllFilters() {
   const clearedFilters = {};
   for (const filterKey in defaultFilters) {
     clearedFilters[filterKey] = {
-      ...defaultFilters[filterKey]
+      ...defaultFilters[filterKey],
     };
     clearedFilters[filterKey].value = null;
   }
@@ -150,7 +154,7 @@ function clearAllFilters() {
 
 function handleRemoveFilterTag(tag: EventTag) {
   appliedFilters.value = appliedFilters.value.filter(
-    (filter) => filter !== tag
+    (filter) => filter !== tag,
   );
 }
 
@@ -175,7 +179,7 @@ watch(
       filters.value["attributes.tags"].value = null;
     }
   },
-  { deep: true }
+  { deep: true },
 );
 </script>
 
@@ -196,7 +200,7 @@ watch(
           <div class="table-header-row-filter-chips-container">
             <div class="table-header-row-filter-chips-container-counter">
               <span
-              ><b>FILTERS: ({{ appliedFilters.length }})</b></span
+                ><b>FILTERS: ({{ appliedFilters.length }})</b></span
               >
             </div>
             <div class="table-header-row-filter-chips flex flex-wrap gap-2">
diff --git a/components/header/AvatarButton.vue b/components/header/AvatarButton.vue
index 34ced340..042d7a5d 100644
--- a/components/header/AvatarButton.vue
+++ b/components/header/AvatarButton.vue
@@ -3,11 +3,18 @@ import Menu from "primevue/menu";
 import Button from "primevue/button";
 import { useRuntimeConfig } from "#app";
 import CleanupDialog from "~/components/header/CleanupDialog.vue";
+import { useDatastoreRequirement } from "~/composables/useDatastoreRequirement";
 
 const { signIn, signOut, status, data } = useAuth();
 
 const menu = ref();
 
+const { datastoreState, setDatastoreRequired } =
+  await useDatastoreRequirement();
+const datastoreRequired = computed(
+  () => datastoreState.value.datastoreRequired,
+);
+
 const config = useRuntimeConfig();
 const baseUrl = new URL(config.public.baseUrl).origin;
 const idpProvider = config.public.idpProvider;
@@ -28,6 +35,7 @@ const menuItems = ref([
         label: userActionLabel,
         icon: userActionIcon,
         command: () => {
+          // eslint-disable-next-line @typescript-eslint/no-unused-expressions
           isAuthenticated.value ? signOut() : signIn(`${idpProvider}`);
         },
       },
@@ -45,6 +53,11 @@ const menuItems = ref([
         },
         disabled: !isAuthenticated.value,
       },
+      {
+        label: "Require Data Store",
+        icon: "pi pi-database",
+        isToggle: true, // custom flag to identify it in the slot
+      },
     ],
   },
 ]);
@@ -92,6 +105,22 @@ const toggle = (event) => {
     >
       <template #item="{ item, props }">
         <a
+          v-if="item.isToggle"
+          v-ripple
+          class="flex items-center"
+          v-bind="props.action"
+          @click.prevent="setDatastoreRequired(!datastoreRequired)"
+        >
+          <i :class="item.icon" />
+          <span class="ml-2 menu-item-label">{{ item.label }}</span>
+          <ToggleSwitch
+            :modelValue="datastoreRequired ?? false"
+            class="ml-auto"
+            @click.stop="setDatastoreRequired(!datastoreRequired)"
+          />
+        </a>
+        <a
+          v-else
           v-ripple
           :href="item.url"
           :target="item.target"
diff --git a/composables/useAPIFetch.ts b/composables/useAPIFetch.ts
index 13fc9c46..e7d222e3 100644
--- a/composables/useAPIFetch.ts
+++ b/composables/useAPIFetch.ts
@@ -7,6 +7,7 @@ import type {
   ListConsumers,
   ListRoutes,
   ListServices,
+  NodeSettings,
   Project,
   ProjectNode,
   Service,
@@ -32,6 +33,14 @@ export function getEvents(opts?) {
   });
 }
 
+// Node endpoints
+export function getNodeConfiguration(opts?) {
+  return useAPIFetch<NodeSettings>("/node/settings", {
+    ...opts,
+    method: "GET",
+  });
+}
+
 // Hub endpoints
 export function getProjectNodes(opts?) {
   return useAPIFetch<ProjectNode[]>("/project-nodes", {
diff --git a/composables/useDatastoreRequirement.ts b/composables/useDatastoreRequirement.ts
new file mode 100644
index 00000000..9c5605a7
--- /dev/null
+++ b/composables/useDatastoreRequirement.ts
@@ -0,0 +1,58 @@
+import { type NodeTypeResponse } from "~/services/Api";
+import { useNuxtApp, useState } from "#app";
+
+interface DatastoreState {
+  datastoreRequired: boolean | null;
+  nodeType: string | null;
+}
+
+export async function useDatastoreRequirement() {
+  const datastoreState = useState<DatastoreState>("datastoreRequired", () => ({
+    datastoreRequired: null,
+    nodeType: null,
+  }));
+
+  let dataRequired: boolean = true;
+
+  // Get node configuration settings
+  if (!datastoreState.value.datastoreRequired) {
+    const nodeConfigResp = (await useNuxtApp()
+      .$hubApi("/node/settings", { method: "GET" })
+      .catch(() => null)) as NodeSettings;
+    if (nodeConfigResp) {
+      dataRequired = Boolean(nodeConfigResp.data_required);
+    }
+  }
+
+  if (!datastoreState.value.nodeType) {
+    // Re-fetch if node type couldn't be obtained previously
+    const nodeResp = (await useNuxtApp()
+      .$hubApi("/node-type", { method: "GET" })
+      .catch(() => null)) as NodeTypeResponse;
+
+    if (nodeResp) {
+      datastoreState.value = {
+        nodeType: nodeResp.type,
+        datastoreRequired: nodeResp.type !== "aggregator" && dataRequired,
+      };
+    }
+  }
+
+  async function setDatastoreRequired(updatedRequirement: boolean) {
+    const nodeConfigResp = (await useNuxtApp()
+      .$hubApi("/node/settings", {
+        method: "POST",
+        body: { data_required: updatedRequirement },
+      })
+      .catch(() => null)) as NodeSettings;
+
+    if (nodeConfigResp) {
+      datastoreState.value = {
+        ...datastoreState.value,
+        datastoreRequired: nodeConfigResp.data_required,
+      };
+    }
+  }
+
+  return { datastoreState, setDatastoreRequired };
+}
diff --git a/composables/useNodeType.ts b/composables/useNodeType.ts
deleted file mode 100644
index 09aec643..00000000
--- a/composables/useNodeType.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { NodeTypeResponse } from "~/services/Api";
-import { useNuxtApp, useState } from "#app";
-
-const cachedNodeType: string | null = null;
-
-export async function useNodeType() {
-  const nodeType = useState<string | null>("nodeType", () => cachedNodeType);
-
-  if (!nodeType.value) {
-    const nodeResp = (await useNuxtApp()
-      .$hubApi("/node-type", {
-        method: "GET",
-      })
-      .catch(() => null)) as NodeTypeResponse;
-    if (nodeResp) {
-      nodeType.value = nodeResp.type;
-    }
-  }
-
-  return nodeType;
-}
diff --git a/services/Api.ts b/services/Api.ts
index 107a7028..6a0cdd3a 100644
--- a/services/Api.ts
+++ b/services/Api.ts
@@ -382,12 +382,6 @@ export interface BodyKongInitializeKongInitializePost {
    * UUID of the project
    */
   project_id: string;
-  /**
-   * Methods
-   * List of acceptable HTTP methods
-   * @default ["GET"]
-   */
-  methods?: HttpMethodCode[];
   /**
    * Protocols
    * List of acceptable transfer protocols. A combo of 'http', 'grpc', 'grpcs', 'tls', 'tcp'
@@ -826,11 +820,11 @@ export interface DetailedService {
  */
 export interface DownstreamHealthCheck {
   /** Po */
-  po: Record<string, any> | string;
-  /** Results */
-  results: Record<string, any> | string;
+  po: HealthCheck | string;
+  /** Storage */
+  storage: HealthCheck | string;
   /** Kong */
-  kong: Record<string, any> | string;
+  kong: HealthCheck | string;
 }
 
 /**
@@ -1062,9 +1056,15 @@ export interface Meta {
  * Credentials for accessing a private S3 bucket hosted on MinIO.
  */
 export interface MinioConfig {
-  /** Minio Access Key */
+  /**
+   * Minio Access Key
+   * @format password
+   */
   minio_access_key: string;
-  /** Minio Secret Key */
+  /**
+   * Minio Secret Key
+   * @format password
+   */
   minio_secret_key: string;
   /**
    * Minio Region
@@ -1126,6 +1126,15 @@ export interface Node {
   updated_at: string;
 }
 
+/** NodeSettings */
+export interface NodeSettings {
+  /**
+   * Data Required
+   * @default true
+   */
+  data_required?: boolean | null;
+}
+
 /** NodeTypeResponse */
 export interface NodeTypeResponse {
   /** Type */
@@ -2258,6 +2267,48 @@ export class Api<
         ...params,
       }),
   };
+  node = {
+    /**
+     * @description Get the node configuration settings
+     *
+     * @tags Node
+     * @name NodeSettingsGetNodeSettingsGet
+     * @summary Node.Settings.Get
+     * @request GET:/node/settings
+     * @secure
+     */
+    nodeSettingsGetNodeSettingsGet: (params: RequestParams = {}) =>
+      this.request<NodeSettings, void>({
+        path: `/node/settings`,
+        method: "GET",
+        secure: true,
+        format: "json",
+        ...params,
+      }),
+
+    /**
+     * @description Update the node configuration settings.
+     *
+     * @tags Node
+     * @name NodeSettingsUpdateNodeSettingsPost
+     * @summary Node.Settings.Update
+     * @request POST:/node/settings
+     * @secure
+     */
+    nodeSettingsUpdateNodeSettingsPost: (
+      data: NodeSettings,
+      params: RequestParams = {},
+    ) =>
+      this.request<NodeSettings, void | HTTPValidationError>({
+        path: `/node/settings`,
+        method: "POST",
+        body: data,
+        secure: true,
+        type: ContentType.Json,
+        format: "json",
+        ...params,
+      }),
+  };
   projects = {
     /**
      * @description List all projects.
@@ -2674,10 +2725,10 @@ export class Api<
     /**
      * @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.
      *
-     * @tags Results
+     * @tags Storage
      * @name StorageLocalDeleteLocalDelete
      * @summary Storage.Local.Delete
-     * @request DELETE:/local
+     * @request DELETE:/local/
      * @secure
      */
     storageLocalDeleteLocalDelete: (
@@ -2691,7 +2742,7 @@ export class Api<
       params: RequestParams = {},
     ) =>
       this.request<any, void | HTTPValidationError>({
-        path: `/local`,
+        path: `/local/`,
         method: "DELETE",
         query: query,
         secure: true,
@@ -3123,7 +3174,7 @@ export class Api<
         /**
          * Limit
          * Maximum number of events to return
-         * @default 50
+         * @default 100
          */
         limit?: number | null;
         /**
@@ -3133,10 +3184,10 @@ export class Api<
          */
         offset?: number | null;
         /**
-         * Service Name
-         * Filter events by service name
+         * Service Tag
+         * Filter events by service tag
          */
-        service_name?: string | null;
+        service_tag?: string | null;
         /**
          * Event Name
          * Filter events by event name
diff --git a/services/hub_adapter_swagger.json b/services/hub_adapter_swagger.json
index d8710d35..5596f903 100644
--- a/services/hub_adapter_swagger.json
+++ b/services/hub_adapter_swagger.json
@@ -732,6 +732,81 @@
         }
       }
     },
+    "/node/settings": {
+      "get": {
+        "tags": ["Node"],
+        "summary": "Node.Settings.Get",
+        "description": "Get the node configuration settings",
+        "operationId": "node_settings_get_node_settings_get",
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NodeSettings"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not found"
+          }
+        },
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
+      },
+      "post": {
+        "tags": ["Node"],
+        "summary": "Node.Settings.Update",
+        "description": "Update the node configuration settings.",
+        "operationId": "node_settings_update_node_settings_post",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NodeSettings",
+                "description": "Required information to start analysis"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "202": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NodeSettings"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not found"
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/HTTPValidationError"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "JWT": []
+          }
+        ]
+      }
+    },
     "/projects": {
       "get": {
         "tags": ["Hub"],
@@ -1737,12 +1812,12 @@
         }
       }
     },
-    "/local": {
+    "/local/": {
       "delete": {
-        "tags": ["Results"],
+        "tags": ["Storage"],
         "summary": "Storage.Local.Delete",
         "description": "Delete all objects in MinIO and all Postgres database entries related to the specified project.\n\nReturns a 200 on success, a 400 if the project is still available on the Hub and a 403 if it is not the\nHub Adapter client that sends the request. In both error cases nothing is deleted at all.",
-        "operationId": "storage_local_delete_local_delete",
+        "operationId": "storage_local_delete_local__delete",
         "security": [
           {
             "JWT": []
@@ -2687,7 +2762,7 @@
                 }
               ],
               "description": "Maximum number of events to return",
-              "default": 50,
+              "default": 100,
               "title": "Limit"
             },
             "description": "Maximum number of events to return"
@@ -2712,7 +2787,7 @@
             "description": "Number of events to offset by"
           },
           {
-            "name": "service_name",
+            "name": "service_tag",
             "in": "query",
             "required": false,
             "schema": {
@@ -2724,10 +2799,10 @@
                   "type": "null"
                 }
               ],
-              "description": "Filter events by service name",
-              "title": "Service Name"
+              "description": "Filter events by service tag",
+              "title": "Service Tag"
             },
-            "description": "Filter events by service name"
+            "description": "Filter events by service tag"
           },
           {
             "name": "event_name",
@@ -3564,15 +3639,6 @@
             "title": "Project Id",
             "description": "UUID of the project"
           },
-          "methods": {
-            "items": {
-              "$ref": "#/components/schemas/HttpMethodCode"
-            },
-            "type": "array",
-            "title": "Methods",
-            "description": "List of acceptable HTTP methods",
-            "default": ["GET"]
-          },
           "protocols": {
             "items": {
               "$ref": "#/components/schemas/ProtocolCode"
@@ -4663,8 +4729,7 @@
           "po": {
             "anyOf": [
               {
-                "additionalProperties": true,
-                "type": "object"
+                "$ref": "#/components/schemas/HealthCheck"
               },
               {
                 "type": "string"
@@ -4672,23 +4737,21 @@
             ],
             "title": "Po"
           },
-          "results": {
+          "storage": {
             "anyOf": [
               {
-                "additionalProperties": true,
-                "type": "object"
+                "$ref": "#/components/schemas/HealthCheck"
               },
               {
                 "type": "string"
               }
             ],
-            "title": "Results"
+            "title": "Storage"
           },
           "kong": {
             "anyOf": [
               {
-                "additionalProperties": true,
-                "type": "object"
+                "$ref": "#/components/schemas/HealthCheck"
               },
               {
                 "type": "string"
@@ -4698,7 +4761,7 @@
           }
         },
         "type": "object",
-        "required": ["po", "results", "kong"],
+        "required": ["po", "storage", "kong"],
         "title": "DownstreamHealthCheck",
         "description": "Response model for downstream health checks."
       },
@@ -5229,11 +5292,15 @@
         "properties": {
           "minio_access_key": {
             "type": "string",
-            "title": "Minio Access Key"
+            "format": "password",
+            "title": "Minio Access Key",
+            "writeOnly": true
           },
           "minio_secret_key": {
             "type": "string",
-            "title": "Minio Secret Key"
+            "format": "password",
+            "title": "Minio Secret Key",
+            "writeOnly": true
           },
           "minio_region": {
             "type": "string",
@@ -5423,6 +5490,24 @@
         ],
         "title": "Node"
       },
+      "NodeSettings": {
+        "properties": {
+          "data_required": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Data Required",
+            "default": true
+          }
+        },
+        "type": "object",
+        "title": "NodeSettings"
+      },
       "NodeTypeResponse": {
         "properties": {
           "type": {
@@ -6735,16 +6820,20 @@
       "description": "Gateway endpoints for interacting with logged events."
     },
     {
-      "name": "Meta",
-      "description": "Custom Hub Adapter endpoints which combine endpoints from other APIs."
+      "name": "Hub",
+      "description": "Gateway endpoints for the central Hub service."
     },
     {
       "name": "Health",
       "description": "Endpoints for checking the health of this API and the downstream services."
     },
     {
-      "name": "Hub",
-      "description": "Gateway endpoints for the central Hub service."
+      "name": "Meta",
+      "description": "Custom Hub Adapter endpoints which combine endpoints from other APIs."
+    },
+    {
+      "name": "Node",
+      "description": "Endpoints for setting and getting node settings and configuration options."
     },
     {
       "name": "Kong",
diff --git a/test/components/analysis/AnalysisTable.spec.ts b/test/components/analysis/AnalysisTable.spec.ts
index e329397a..f8d34576 100644
--- a/test/components/analysis/AnalysisTable.spec.ts
+++ b/test/components/analysis/AnalysisTable.spec.ts
@@ -1,8 +1,16 @@
-import {type AsyncDataRequestStatus, useFetch, useNuxtApp} from "#app";
+import { type AsyncDataRequestStatus, useFetch, useNuxtApp } from "#app";
 import { useToast } from "primevue/usetoast";
 import { defineComponent } from "vue";
 import { flushPromises, mount } from "@vue/test-utils";
-import {afterEach, beforeAll, beforeEach, describe, expect, test, vi} from "vitest";
+import {
+  afterEach,
+  beforeAll,
+  beforeEach,
+  describe,
+  expect,
+  test,
+  vi,
+} from "vitest";
 import AnalysesTable from "~/components/analysis/AnalysesTable.vue";
 import {
   fakeAnalysisNodes,
@@ -10,37 +18,47 @@ import {
   newFakeAnalysisNode,
 } from "~/test/components/analysis/constants";
 import { getAnalysisNodes } from "~/composables/useAPIFetch";
-import { useNodeType } from "~/composables/useNodeType";
+import { useDatastoreRequirement } from "~/composables/useDatastoreRequirement";
 import type { AnalysisNode } from "~/services/Api";
-import {FetchError} from "ofetch";
+import { FetchError } from "ofetch";
 
 vi.mock("~/composables/useAPIFetch", () => ({
   getAnalysisNodes: vi.fn(),
 }));
 
-vi.mock('~/composables/useNodeType', () => ({
-    useNodeType: vi.fn()
+vi.mock("~/composables/useNodeType", () => ({
+  useNodeType: vi.fn(),
+}));
+
+vi.mock("~/composables/useDatastoreRequirement", () => ({
+  useDatastoreRequirement: vi.fn(),
 }));
 
 describe("AnalysesTable.vue", () => {
-    let spy;
-    let mockToast;
+  let spy;
+  let mockToast;
   let AnalysisTableTestComponent;
 
-    // Render the component with the fake params
-    beforeAll(async () => {
-        AnalysisTableTestComponent = defineComponent({
-            components: { AnalysesTable },
-            template: "<Suspense><AnalysesTable/></Suspense>",
-        });
+  // Render the component with the fake params
+  beforeAll(async () => {
+    AnalysisTableTestComponent = defineComponent({
+      components: { AnalysesTable },
+      template: "<Suspense><AnalysesTable/></Suspense>",
     });
+  });
 
   beforeEach(() => {
-      mockToast = { add: vi.fn() };
-      vi.mocked(useToast).mockReturnValue(mockToast);
-      spy = vi.spyOn(mockToast, "add");
-
-      vi.mocked(useNodeType).mockResolvedValue(ref("default"));
+    mockToast = { add: vi.fn() };
+    vi.mocked(useToast).mockReturnValue(mockToast);
+    spy = vi.spyOn(mockToast, "add");
+
+    vi.mocked(useDatastoreRequirement).mockResolvedValue({
+      datastoreState: ref({
+        datastoreRequired: true,
+        nodeType: "default",
+      }),
+      setDatastoreRequired: vi.fn(),
+    });
 
     // The basic response
     vi.mocked(getAnalysisNodes).mockResolvedValue({
@@ -65,9 +83,9 @@ describe("AnalysesTable.vue", () => {
     vi.mocked(useNuxtApp);
   });
 
-    afterEach(() => {
-        spy.mockReset();
-    });
+  afterEach(() => {
+    spy.mockReset();
+  });
 
   test("Return analysis node data", async () => {
     const wrapper = mount(AnalysisTableTestComponent);
@@ -94,53 +112,53 @@ describe("AnalysesTable.vue", () => {
     expect(secondRowCells[7].text()).toBe("14.03.2025"); // Last Updated
   });
 
-    test("Cached results used", async () => {
-        spy.mockClear();
-
-        const dataRef = ref(fakeAnalysisNodes);
-        const errorRef = ref<FetchError | null>(null);
-        const statusRef = ref<AsyncDataRequestStatus>("success");
-        const mockRefresh = vi.fn();
-
-        // Return results so they are cached
-        vi.mocked(getAnalysisNodes).mockResolvedValueOnce({
-            data: dataRef,
-            pending: ref(false),
-            error: errorRef,
-            status: statusRef,
-            refresh: mockRefresh,
-            execute: vi.fn(),
-            clear: vi.fn(),
-        });
-
-        const wrapper = mount(AnalysisTableTestComponent);
-        await flushPromises();
-
-        const rows = wrapper.findAll("tbody tr");
-        expect(rows.length).toBe(3); // Ensure 3 rows exist as defined in fakeAnalysisNodes
-
-        // Return empty but expect cached results
-        // Simulate refresh returning an error
-        mockRefresh.mockImplementation(async () => {
-            errorRef.value = { statusCode: 500, name: "Hub", message: "" };
-            statusRef.value = "error";
-            dataRef.value = fakeAnalysisNodes; // Keep cached data
-        });
-
-        await wrapper.find(".table-refresh-btn").trigger("click");
-        await flushPromises();
-
-        const cachedRows = wrapper.findAll("tbody tr");
-        expect(cachedRows.length).toBe(3); // Ensure 3 rows exist as defined in fakeAnalysisNode
-
-        expect(spy).toHaveBeenCalledWith({
-            severity: "warn",
-            summary: "Unable to refresh the table",
-            detail: "The Hub is unreachable and the table could not be updated",
-            life: 5000
-        });
+  test("Cached results used", async () => {
+    spy.mockClear();
+
+    const dataRef = ref(fakeAnalysisNodes);
+    const errorRef = ref<FetchError | null>(null);
+    const statusRef = ref<AsyncDataRequestStatus>("success");
+    const mockRefresh = vi.fn();
+
+    // Return results so they are cached
+    vi.mocked(getAnalysisNodes).mockResolvedValueOnce({
+      data: dataRef,
+      pending: ref(false),
+      error: errorRef,
+      status: statusRef,
+      refresh: mockRefresh,
+      execute: vi.fn(),
+      clear: vi.fn(),
     });
 
+    const wrapper = mount(AnalysisTableTestComponent);
+    await flushPromises();
+
+    const rows = wrapper.findAll("tbody tr");
+    expect(rows.length).toBe(3); // Ensure 3 rows exist as defined in fakeAnalysisNodes
+
+    // Return empty but expect cached results
+    // Simulate refresh returning an error
+    mockRefresh.mockImplementation(async () => {
+      errorRef.value = { statusCode: 500, name: "Hub", message: "" };
+      statusRef.value = "error";
+      dataRef.value = fakeAnalysisNodes; // Keep cached data
+    });
+
+    await wrapper.find(".table-refresh-btn").trigger("click");
+    await flushPromises();
+
+    const cachedRows = wrapper.findAll("tbody tr");
+    expect(cachedRows.length).toBe(3); // Ensure 3 rows exist as defined in fakeAnalysisNode
+
+    expect(spy).toHaveBeenCalledWith({
+      severity: "warn",
+      summary: "Unable to refresh the table",
+      detail: "The Hub is unreachable and the table could not be updated",
+      life: 5000,
+    });
+  });
+
   test("Refresh table", async () => {
     const wrapper = mount(AnalysisTableTestComponent);
     await flushPromises();
diff --git a/test/components/header/AvatarButton.spec.ts b/test/components/header/AvatarButton.spec.ts
index 86165b66..63617e07 100644
--- a/test/components/header/AvatarButton.spec.ts
+++ b/test/components/header/AvatarButton.spec.ts
@@ -1,13 +1,37 @@
-import { mount } from "@vue/test-utils";
+import { defineComponent, ref } from "vue";
+import { flushPromises, mount } from "@vue/test-utils"; // add flushPromises
 import { useRuntimeConfig } from "#app";
-import { describe, expect, it, vi } from "vitest";
+import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import AvatarButton from "~/components/header/AvatarButton.vue";
+import { useDatastoreRequirement } from "~/composables/useDatastoreRequirement";
+
+vi.mock("~/composables/useDatastoreRequirement", () => ({
+  useDatastoreRequirement: vi.fn(),
+}));
 
 describe("AvatarButton.vue", () => {
   const testUser = "Johnny Storm";
+  let AvatarButtonTestComponent: typeof AvatarButton;
 
   vi.mocked(useRuntimeConfig);
 
+  beforeAll(async () => {
+    AvatarButtonTestComponent = defineComponent({
+      components: { AvatarButton },
+      template: "<Suspense><AvatarButton/></Suspense>",
+    });
+  });
+
+  beforeEach(() => {
+    vi.mocked(useDatastoreRequirement).mockResolvedValue({
+      datastoreState: ref({
+        datastoreRequired: true,
+        nodeType: "analysis",
+      }),
+      setDatastoreRequired: vi.fn(),
+    });
+  });
+
   async function avatarMenuChecks(authenticated: boolean) {
     const status = authenticated ? "authenticated" : "unauthenticated";
     const expectedIcon = authenticated ? "pi-user" : "pi-question";
@@ -21,13 +45,19 @@ describe("AvatarButton.vue", () => {
       data: ref(userData),
     }));
 
-    const wrapper = mount(AvatarButton, {
+    const wrapper = mount(AvatarButtonTestComponent, {
       global: {
         stubs: {
-          teleport: true, // Now dropdowns are included/teleported in root element
+          teleport: true,
+          CleanupDialog: true,
+          ToggleSwitch: true,
         },
       },
     });
+
+    // flushPromises resolves all pending promises including the async setup
+    await flushPromises();
+
     expect(wrapper).toBeTruthy();
 
     const avatarBtn = wrapper.find(".avatar-btn");
@@ -42,6 +72,7 @@ describe("AvatarButton.vue", () => {
     }
 
     await avatarBtn.trigger("click");
+    await flushPromises(); // use flushPromises here too for consistency
 
     const menu = wrapper.find(".avatar-menu");
     expect(menu.text()).toContain("Keycloak");