From 8ddf7adaeff90bb18c8b792f0c6d505dd9dc9ad9 Mon Sep 17 00:00:00 2001
From: Eli Bosley <ekbosley@gmail.com>
Date: Wed, 20 Aug 2025 13:22:14 -0400
Subject: [PATCH 1/6] feat(api): restructure versioning information in GraphQL
 schema

- Introduced new CoreVersions and PackageVersions types to encapsulate core system and software package version details.
- Updated InfoVersions type to include references to CoreVersions and PackageVersions.
- Modified the versions resolver to return structured version information.
- Added a new query for fetching version information in the frontend.
- Updated the HeaderOsVersion component to display the new version information.
- Created a ReleaseNotesModal component for viewing OS release notes.
---
 api/dev/configs/api.json                      |   2 +-
 api/generated-schema.graphql                  |  21 ++-
 api/src/unraid-api/cli/generated/graphql.ts   |   2 +
 .../graph/resolvers/info/info.module.ts       |   6 +-
 .../info/info.resolver.integration.spec.ts    |   7 +-
 .../graph/resolvers/info/info.resolver.ts     |   2 +-
 .../info/versions/core-versions.resolver.ts   |  14 ++
 .../info/versions/get-api-version.ts          |  20 +++
 .../resolvers/info/versions/versions.model.ts |  23 ++-
 .../info/versions/versions.resolver.ts        |  63 ++++++++
 .../info/versions/versions.service.ts         |  12 +-
 web/components/HeaderOsVersion.ce.vue         |  94 ++++++++++--
 web/components/ReleaseNotesModal.vue          |  93 ++++++++++++
 web/components/UserProfile/versions.query.ts  |  20 +++
 web/composables/api/use-notifications.ts      |   2 +-
 web/composables/gql/gql.ts                    |   6 +
 web/composables/gql/graphql.ts                | 140 ++++++++++--------
 17 files changed, 424 insertions(+), 103 deletions(-)
 create mode 100644 api/src/unraid-api/graph/resolvers/info/versions/core-versions.resolver.ts
 create mode 100644 api/src/unraid-api/graph/resolvers/info/versions/get-api-version.ts
 create mode 100644 api/src/unraid-api/graph/resolvers/info/versions/versions.resolver.ts
 create mode 100644 web/components/ReleaseNotesModal.vue
 create mode 100644 web/components/UserProfile/versions.query.ts

diff --git a/api/dev/configs/api.json b/api/dev/configs/api.json
index df4db6b519..de99ec62a2 100644
--- a/api/dev/configs/api.json
+++ b/api/dev/configs/api.json
@@ -1,5 +1,5 @@
 {
-  "version": "4.13.1",
+  "version": "4.14.0",
   "extraOrigins": [],
   "sandbox": true,
   "ssoSubIds": [],
diff --git a/api/generated-schema.graphql b/api/generated-schema.graphql
index 25631cb056..1bdd2a6b6d 100644
--- a/api/generated-schema.graphql
+++ b/api/generated-schema.graphql
@@ -1501,12 +1501,18 @@ type InfoBaseboard implements Node {
   memSlots: Float
 }
 
-type InfoVersions implements Node {
-  id: PrefixedID!
+type CoreVersions {
+  """Unraid version"""
+  unraid: String
+
+  """Unraid API version"""
+  api: String
 
   """Kernel version"""
   kernel: String
+}
 
+type PackageVersions {
   """OpenSSL version"""
   openssl: String
 
@@ -1590,9 +1596,16 @@ type InfoVersions implements Node {
 
   """Docker version"""
   docker: String
+}
 
-  """Unraid version"""
-  unraid: String
+type InfoVersions implements Node {
+  id: PrefixedID!
+
+  """Core system versions"""
+  core: CoreVersions!
+
+  """Software package versions"""
+  packages: PackageVersions!
 }
 
 type Info implements Node {
diff --git a/api/src/unraid-api/cli/generated/graphql.ts b/api/src/unraid-api/cli/generated/graphql.ts
index d0b08eeb9f..9f367a3da9 100644
--- a/api/src/unraid-api/cli/generated/graphql.ts
+++ b/api/src/unraid-api/cli/generated/graphql.ts
@@ -1041,6 +1041,8 @@ export type InfoVersions = Node & {
   __typename?: 'InfoVersions';
   /** Apache version */
   apache?: Maybe<Scalars['String']['output']>;
+  /** Unraid API version */
+  api?: Maybe<Scalars['String']['output']>;
   /** Docker version */
   docker?: Maybe<Scalars['String']['output']>;
   /** gcc version */
diff --git a/api/src/unraid-api/graph/resolvers/info/info.module.ts b/api/src/unraid-api/graph/resolvers/info/info.module.ts
index a28a472b5f..c9684061fb 100644
--- a/api/src/unraid-api/graph/resolvers/info/info.module.ts
+++ b/api/src/unraid-api/graph/resolvers/info/info.module.ts
@@ -8,6 +8,8 @@ import { DisplayService } from '@app/unraid-api/graph/resolvers/info/display/dis
 import { InfoResolver } from '@app/unraid-api/graph/resolvers/info/info.resolver.js';
 import { MemoryService } from '@app/unraid-api/graph/resolvers/info/memory/memory.service.js';
 import { OsService } from '@app/unraid-api/graph/resolvers/info/os/os.service.js';
+import { CoreVersionsResolver } from '@app/unraid-api/graph/resolvers/info/versions/core-versions.resolver.js';
+import { VersionsResolver } from '@app/unraid-api/graph/resolvers/info/versions/versions.resolver.js';
 import { VersionsService } from '@app/unraid-api/graph/resolvers/info/versions/versions.service.js';
 import { ServicesModule } from '@app/unraid-api/graph/services/services.module.js';
 
@@ -19,6 +21,8 @@ import { ServicesModule } from '@app/unraid-api/graph/services/services.module.j
 
         // Sub-resolvers
         DevicesResolver,
+        VersionsResolver,
+        CoreVersionsResolver,
 
         // Services
         CpuService,
@@ -28,6 +32,6 @@ import { ServicesModule } from '@app/unraid-api/graph/services/services.module.j
         VersionsService,
         DisplayService,
     ],
-    exports: [InfoResolver, DevicesResolver, DisplayService],
+    exports: [InfoResolver, DevicesResolver, VersionsResolver, CoreVersionsResolver, DisplayService],
 })
 export class InfoModule {}
diff --git a/api/src/unraid-api/graph/resolvers/info/info.resolver.integration.spec.ts b/api/src/unraid-api/graph/resolvers/info/info.resolver.integration.spec.ts
index 2745cfae87..eb21908e9b 100644
--- a/api/src/unraid-api/graph/resolvers/info/info.resolver.integration.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/info/info.resolver.integration.spec.ts
@@ -169,12 +169,7 @@ describe('InfoResolver Integration Tests', () => {
             const result = await infoResolver.versions();
 
             expect(result).toHaveProperty('id', 'info/versions');
-            expect(result).toHaveProperty('unraid');
-            expect(result).toHaveProperty('kernel');
-            expect(result).toHaveProperty('node');
-            expect(result).toHaveProperty('npm');
-            // Verify unraid version from mock
-            expect(result.unraid).toBe('6.12.0');
+            // Versions now returns a stub object, with actual data resolved via field resolvers
         });
     });
 
diff --git a/api/src/unraid-api/graph/resolvers/info/info.resolver.ts b/api/src/unraid-api/graph/resolvers/info/info.resolver.ts
index c021800087..b029a24c0d 100644
--- a/api/src/unraid-api/graph/resolvers/info/info.resolver.ts
+++ b/api/src/unraid-api/graph/resolvers/info/info.resolver.ts
@@ -94,7 +94,7 @@ export class InfoResolver {
     }
 
     @ResolveField(() => InfoVersions)
-    public async versions(): Promise<InfoVersions> {
+    public versions(): Partial<InfoVersions> {
         return this.versionsService.generateVersions();
     }
 }
diff --git a/api/src/unraid-api/graph/resolvers/info/versions/core-versions.resolver.ts b/api/src/unraid-api/graph/resolvers/info/versions/core-versions.resolver.ts
new file mode 100644
index 0000000000..6ee8b24797
--- /dev/null
+++ b/api/src/unraid-api/graph/resolvers/info/versions/core-versions.resolver.ts
@@ -0,0 +1,14 @@
+import { ResolveField, Resolver } from '@nestjs/graphql';
+
+import { versions } from 'systeminformation';
+
+import { CoreVersions } from '@app/unraid-api/graph/resolvers/info/versions/versions.model.js';
+
+@Resolver(() => CoreVersions)
+export class CoreVersionsResolver {
+    @ResolveField(() => String, { nullable: true })
+    async kernel(): Promise<string | undefined> {
+        const softwareVersions = await versions();
+        return softwareVersions.kernel;
+    }
+}
diff --git a/api/src/unraid-api/graph/resolvers/info/versions/get-api-version.ts b/api/src/unraid-api/graph/resolvers/info/versions/get-api-version.ts
new file mode 100644
index 0000000000..f6c6d0eebd
--- /dev/null
+++ b/api/src/unraid-api/graph/resolvers/info/versions/get-api-version.ts
@@ -0,0 +1,20 @@
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+
+let cachedVersion: string | undefined;
+
+export function getApiVersion(): string {
+    if (cachedVersion) {
+        return cachedVersion;
+    }
+
+    try {
+        const packagePath = join(process.cwd(), 'package.json');
+        const packageJson = JSON.parse(readFileSync(packagePath, 'utf-8'));
+        cachedVersion = packageJson.version || 'unknown';
+        return cachedVersion;
+    } catch (error) {
+        console.error('Failed to read API version from package.json:', error);
+        return 'unknown';
+    }
+}
diff --git a/api/src/unraid-api/graph/resolvers/info/versions/versions.model.ts b/api/src/unraid-api/graph/resolvers/info/versions/versions.model.ts
index 37ad2003ac..c7983bec1e 100644
--- a/api/src/unraid-api/graph/resolvers/info/versions/versions.model.ts
+++ b/api/src/unraid-api/graph/resolvers/info/versions/versions.model.ts
@@ -2,11 +2,20 @@ import { Field, ObjectType } from '@nestjs/graphql';
 
 import { Node } from '@unraid/shared/graphql.model.js';
 
-@ObjectType({ implements: () => Node })
-export class InfoVersions extends Node {
+@ObjectType()
+export class CoreVersions {
+    @Field(() => String, { nullable: true, description: 'Unraid version' })
+    unraid?: string;
+
+    @Field(() => String, { nullable: true, description: 'Unraid API version' })
+    api?: string;
+
     @Field(() => String, { nullable: true, description: 'Kernel version' })
     kernel?: string;
+}
 
+@ObjectType()
+export class PackageVersions {
     @Field(() => String, { nullable: true, description: 'OpenSSL version' })
     openssl?: string;
 
@@ -90,7 +99,13 @@ export class InfoVersions extends Node {
 
     @Field(() => String, { nullable: true, description: 'Docker version' })
     docker?: string;
+}
 
-    @Field(() => String, { nullable: true, description: 'Unraid version' })
-    unraid?: string;
+@ObjectType({ implements: () => Node })
+export class InfoVersions extends Node {
+    @Field(() => CoreVersions, { description: 'Core system versions' })
+    core!: CoreVersions;
+
+    @Field(() => PackageVersions, { description: 'Software package versions' })
+    packages!: PackageVersions;
 }
diff --git a/api/src/unraid-api/graph/resolvers/info/versions/versions.resolver.ts b/api/src/unraid-api/graph/resolvers/info/versions/versions.resolver.ts
new file mode 100644
index 0000000000..b50f8ad2e5
--- /dev/null
+++ b/api/src/unraid-api/graph/resolvers/info/versions/versions.resolver.ts
@@ -0,0 +1,63 @@
+import { ConfigService } from '@nestjs/config';
+import { ResolveField, Resolver } from '@nestjs/graphql';
+
+import { versions } from 'systeminformation';
+
+import {
+    CoreVersions,
+    InfoVersions,
+    PackageVersions,
+} from '@app/unraid-api/graph/resolvers/info/versions/versions.model.js';
+
+@Resolver(() => InfoVersions)
+export class VersionsResolver {
+    constructor(private readonly configService: ConfigService) {}
+
+    @ResolveField(() => CoreVersions)
+    core(): CoreVersions {
+        const unraid = this.configService.get<string>('store.emhttp.var.version') || 'unknown';
+        const api = this.configService.get<string>('api.version') || 'unknown';
+
+        return {
+            unraid,
+            api,
+            kernel: undefined, // Will be resolved separately if requested
+        };
+    }
+
+    @ResolveField(() => PackageVersions)
+    async packages(): Promise<PackageVersions> {
+        const softwareVersions = await versions();
+
+        return {
+            openssl: softwareVersions.openssl,
+            systemOpenssl: softwareVersions.systemOpenssl,
+            node: softwareVersions.node,
+            v8: softwareVersions.v8,
+            npm: softwareVersions.npm,
+            yarn: softwareVersions.yarn,
+            pm2: softwareVersions.pm2,
+            gulp: softwareVersions.gulp,
+            grunt: softwareVersions.grunt,
+            git: softwareVersions.git,
+            tsc: softwareVersions.tsc,
+            mysql: softwareVersions.mysql,
+            redis: softwareVersions.redis,
+            mongodb: softwareVersions.mongodb,
+            apache: (softwareVersions as any).apache,
+            nginx: softwareVersions.nginx,
+            php: softwareVersions.php,
+            postfix: softwareVersions.postfix,
+            postgresql: softwareVersions.postgresql,
+            perl: softwareVersions.perl,
+            python: softwareVersions.python,
+            python3: softwareVersions.python3,
+            pip: softwareVersions.pip,
+            pip3: softwareVersions.pip3,
+            java: softwareVersions.java,
+            gcc: softwareVersions.gcc,
+            virtualbox: softwareVersions.virtualbox,
+            docker: softwareVersions.docker,
+        };
+    }
+}
diff --git a/api/src/unraid-api/graph/resolvers/info/versions/versions.service.ts b/api/src/unraid-api/graph/resolvers/info/versions/versions.service.ts
index 42c399c19a..c1cdce42f6 100644
--- a/api/src/unraid-api/graph/resolvers/info/versions/versions.service.ts
+++ b/api/src/unraid-api/graph/resolvers/info/versions/versions.service.ts
@@ -1,22 +1,12 @@
 import { Injectable } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-
-import { versions } from 'systeminformation';
 
 import { InfoVersions } from '@app/unraid-api/graph/resolvers/info/versions/versions.model.js';
 
 @Injectable()
 export class VersionsService {
-    constructor(private readonly configService: ConfigService) {}
-
-    async generateVersions(): Promise<InfoVersions> {
-        const unraid = this.configService.get<string>('store.emhttp.var.version') || 'unknown';
-        const softwareVersions = await versions();
-
+    generateVersions(): Partial<InfoVersions> {
         return {
             id: 'info/versions',
-            unraid,
-            ...softwareVersions,
         };
     }
 }
diff --git a/web/components/HeaderOsVersion.ce.vue b/web/components/HeaderOsVersion.ce.vue
index bb76d4a597..165ffd8e28 100644
--- a/web/components/HeaderOsVersion.ce.vue
+++ b/web/components/HeaderOsVersion.ce.vue
@@ -1,16 +1,19 @@
 <script lang="ts" setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
+import { useQuery } from '@vue/apollo-composable';
 
-import { BellAlertIcon, ExclamationTriangleIcon, InformationCircleIcon } from '@heroicons/vue/24/solid';
-import { Badge } from '@unraid/ui';
-import { getReleaseNotesUrl, WEBGUI_TOOLS_DOWNGRADE, WEBGUI_TOOLS_UPDATE } from '~/helpers/urls';
+import { BellAlertIcon, ExclamationTriangleIcon, InformationCircleIcon, DocumentTextIcon, ArrowTopRightOnSquareIcon } from '@heroicons/vue/24/solid';
+import { Badge, DropdownMenuRoot, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator } from '@unraid/ui';
+import { WEBGUI_TOOLS_DOWNGRADE, WEBGUI_TOOLS_UPDATE } from '~/helpers/urls';
 
 import { useActivationCodeDataStore } from '~/components/Activation/store/activationCodeData';
 import { useServerStore } from '~/store/server';
 import { useUpdateOsStore } from '~/store/updateOs';
 import { useUpdateOsActionsStore } from '~/store/updateOsActions';
+import { INFO_VERSIONS_QUERY } from './UserProfile/versions.query';
+import ReleaseNotesModal from '~/components/ReleaseNotesModal.vue';
 
 const { t } = useI18n();
 
@@ -23,6 +26,20 @@ const { osVersion, rebootType, stateDataError } = storeToRefs(serverStore);
 const { available, availableWithRenewal } = storeToRefs(updateOsStore);
 const { rebootTypeText } = storeToRefs(updateOsActionsStore);
 
+// Query for version information
+const { result: versionsResult } = useQuery(INFO_VERSIONS_QUERY, null, {
+  fetchPolicy: 'cache-first',
+});
+
+// Use versions endpoint as primary source, fallback to store
+const displayOsVersion = computed(() => versionsResult.value?.info?.versions?.core?.unraid || osVersion.value || null);
+const apiVersion = computed(() => versionsResult.value?.info?.versions?.core?.api || null);
+const showOsReleaseNotesModal = ref(false);
+
+const openApiChangelog = () => {
+  window.open('https://github.com/unraid/api/releases', '_blank');
+};
+
 const unraidLogoHeaderLink = computed<{ href: string; title: string }>(() => {
   if (partnerInfo.value?.partnerUrl) {
     return {
@@ -94,16 +111,56 @@ const updateOsStatus = computed(() => {
     </a>
 
     <div class="flex flex-wrap justify-start gap-2">
-      <a
-        class="text-xs xs:text-sm flex flex-row items-center gap-x-1 font-semibold text-header-text-secondary hover:text-orange-dark focus:text-orange-dark hover:underline focus:underline leading-none"
-        :title="t('View release notes')"
-        :href="getReleaseNotesUrl(osVersion).toString()"
-        target="_blank"
-        rel="noopener"
-      >
-        <InformationCircleIcon class="fill-current w-3 h-3 xs:w-4 xs:h-4 shrink-0" />
-        {{ osVersion }}
-      </a>
+      <DropdownMenuRoot>
+        <DropdownMenuTrigger as-child>
+          <button 
+            class="text-xs xs:text-sm flex flex-row items-center gap-x-1 font-semibold text-header-text-secondary hover:text-orange-dark focus:text-orange-dark hover:underline focus:underline leading-none"
+            :title="t('Version Information')"
+          >
+            <InformationCircleIcon class="fill-current w-3 h-3 xs:w-4 xs:h-4 shrink-0" />
+            {{ displayOsVersion }}
+          </button>
+        </DropdownMenuTrigger>
+        
+        <DropdownMenuContent class="min-w-[200px]" align="start" :side-offset="4">
+          <DropdownMenuLabel>
+            {{ t('Version Information') }}
+          </DropdownMenuLabel>
+          
+          <DropdownMenuItem disabled class="text-xs opacity-100">
+            <span class="flex justify-between w-full">
+              <span>{{ t('Unraid OS') }}</span>
+              <span class="font-semibold">{{ displayOsVersion || t('Unknown') }}</span>
+            </span>
+          </DropdownMenuItem>
+          
+          <DropdownMenuItem disabled class="text-xs opacity-100">
+            <span class="flex justify-between w-full">
+              <span>{{ t('Unraid API') }}</span>
+              <span class="font-semibold">{{ apiVersion || t('Unknown') }}</span>
+            </span>
+          </DropdownMenuItem>
+          
+          <DropdownMenuSeparator />
+          
+          <DropdownMenuItem @click="showOsReleaseNotesModal = true">
+            <span class="flex items-center gap-x-2">
+              <InformationCircleIcon class="w-4 h-4" />
+              {{ t('View OS Release Notes') }}
+            </span>
+          </DropdownMenuItem>
+          
+          <DropdownMenuItem @click="openApiChangelog">
+            <span class="flex items-center justify-between w-full">
+              <span class="flex items-center gap-x-2">
+                <DocumentTextIcon class="w-4 h-4" />
+                {{ t('View API Changelog') }}
+              </span>
+              <ArrowTopRightOnSquareIcon class="w-3 h-3 opacity-60" />
+            </span>
+          </DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenuRoot>
       <component
         :is="updateOsStatus.href ? 'a' : 'button'"
         v-if="updateOsStatus"
@@ -125,5 +182,14 @@ const updateOsStatus = computed(() => {
         </template>
       </component>
     </div>
+    
+    <!-- OS Release Notes Modal -->
+    <ReleaseNotesModal
+      v-if="displayOsVersion"
+      :open="showOsReleaseNotesModal"
+      :version="displayOsVersion"
+      :t="t"
+      @close="showOsReleaseNotesModal = false"
+    />
   </div>
 </template>
diff --git a/web/components/ReleaseNotesModal.vue b/web/components/ReleaseNotesModal.vue
new file mode 100644
index 0000000000..dcd78bd061
--- /dev/null
+++ b/web/components/ReleaseNotesModal.vue
@@ -0,0 +1,93 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import type { ComposerTranslation } from 'vue-i18n';
+import { ArrowTopRightOnSquareIcon } from '@heroicons/vue/24/solid';
+import { BrandButton, BrandLoading } from '@unraid/ui';
+import Modal from '~/components/Modal.vue';
+import { getReleaseNotesUrl } from '~/helpers/urls';
+
+export interface Props {
+  open: boolean;
+  version: string;
+  t: ComposerTranslation;
+}
+
+const props = defineProps<Props>();
+const emit = defineEmits<{
+  close: [];
+}>();
+
+const iframeRef = ref<HTMLIFrameElement | null>(null);
+const isLoading = ref(true);
+
+const releaseNotesUrl = computed(() => {
+  return getReleaseNotesUrl(props.version).toString();
+});
+
+const handleIframeLoad = () => {
+  isLoading.value = false;
+};
+
+const handleClose = () => {
+  emit('close');
+};
+
+const openInNewTab = () => {
+  window.open(releaseNotesUrl.value, '_blank');
+};
+</script>
+
+<template>
+  <Modal
+    :center-content="false"
+    max-width="max-w-[800px]"
+    :open="open"
+    :show-close-x="true"
+    :t="t"
+    :tall-content="true"
+    :title="`Unraid OS ${version} Release Notes`"
+    :disable-overlay-close="false"
+    @close="handleClose"
+  >
+    <template #main>
+      <div class="flex flex-col gap-4 min-w-[280px] sm:min-w-[400px]">
+        <!-- Loading state -->
+        <div
+          v-if="isLoading"
+          class="text-center flex flex-col justify-center w-full min-h-[250px] min-w-[280px] sm:min-w-[400px]"
+        >
+          <BrandLoading class="w-[150px] mx-auto mt-6" />
+          <p>Loading release notes…</p>
+        </div>
+        
+        <!-- iframe for release notes -->
+        <div class="w-[calc(100%+3rem)] h-[475px] -mx-6 -my-6">
+          <iframe
+            ref="iframeRef"
+            :src="releaseNotesUrl"
+            class="w-full h-full border-0 rounded-md"
+            sandbox="allow-scripts allow-same-origin"
+            title="Unraid Release Notes"
+            @load="handleIframeLoad"
+          />
+        </div>
+      </div>
+    </template>
+
+    <template #footer>
+      <div class="flex justify-end">
+        <!-- View on docs button -->
+        <BrandButton
+          variant="underline"
+          :external="true"
+          :href="releaseNotesUrl"
+          :icon="ArrowTopRightOnSquareIcon"
+          aria-label="View on Docs"
+          @click="openInNewTab"
+        >
+          Open in New Tab
+        </BrandButton>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/web/components/UserProfile/versions.query.ts b/web/components/UserProfile/versions.query.ts
new file mode 100644
index 0000000000..58f706d730
--- /dev/null
+++ b/web/components/UserProfile/versions.query.ts
@@ -0,0 +1,20 @@
+import { graphql } from '~/composables/gql';
+
+export const INFO_VERSIONS_QUERY = graphql(/* GraphQL */ `
+  query InfoVersions {
+    info {
+      id
+      os {
+        id
+        hostname
+      }
+      versions {
+        id
+        core {
+          unraid
+          api
+        }
+      }
+    }
+  }
+`);
diff --git a/web/composables/api/use-notifications.ts b/web/composables/api/use-notifications.ts
index 81e02194bf..0248058d19 100644
--- a/web/composables/api/use-notifications.ts
+++ b/web/composables/api/use-notifications.ts
@@ -39,7 +39,7 @@ export function useHaveSeenNotifications() {
      *
      * Writing this ref will persist to local storage and affect global state.
      */
-    haveSeenNotifications: useStorage<boolean>(HAVE_SEEN_NOTIFICATIONS_KEY, null),
+    haveSeenNotifications: useStorage<boolean>(HAVE_SEEN_NOTIFICATIONS_KEY, false),
   };
 }
 
diff --git a/web/composables/gql/gql.ts b/web/composables/gql/gql.ts
index 93b52cff7e..81343fc08f 100644
--- a/web/composables/gql/gql.ts
+++ b/web/composables/gql/gql.ts
@@ -44,6 +44,7 @@ type Documents = {
     "\n  mutation DeleteRCloneRemote($input: DeleteRCloneRemoteInput!) {\n    rclone {\n      deleteRCloneRemote(input: $input)\n    }\n  }\n": typeof types.DeleteRCloneRemoteDocument,
     "\n  query GetRCloneConfigForm($formOptions: RCloneConfigFormInput) {\n    rclone {\n      configForm(formOptions: $formOptions) {\n        id\n        dataSchema\n        uiSchema\n      }\n    }\n  }\n": typeof types.GetRCloneConfigFormDocument,
     "\n  query ListRCloneRemotes {\n    rclone {\n      remotes {\n        name\n        type\n        parameters\n        config\n      }\n    }\n  }\n": typeof types.ListRCloneRemotesDocument,
+    "\n  query InfoVersions {\n    info {\n      id\n      os {\n        id\n        hostname\n      }\n      versions {\n        id\n        core {\n          unraid\n          api\n        }\n      }\n    }\n  }\n": typeof types.InfoVersionsDocument,
     "\n  query OidcProviders {\n    settings {\n      sso {\n        oidcProviders {\n          id\n          name\n          clientId\n          issuer\n          authorizationEndpoint\n          tokenEndpoint\n          jwksUri\n          scopes\n          authorizationRules {\n            claim\n            operator\n            value\n          }\n          authorizationRuleMode\n          buttonText\n          buttonIcon\n        }\n      }\n    }\n  }\n": typeof types.OidcProvidersDocument,
     "\n  query PublicOidcProviders {\n    publicOidcProviders {\n      id\n      name\n      buttonText\n      buttonIcon\n      buttonVariant\n      buttonStyle\n    }\n  }\n": typeof types.PublicOidcProvidersDocument,
     "\n  query serverInfo {\n    info {\n      os {\n        hostname\n      }\n    }\n    vars {\n      comment\n    }\n  }\n": typeof types.ServerInfoDocument,
@@ -86,6 +87,7 @@ const documents: Documents = {
     "\n  mutation DeleteRCloneRemote($input: DeleteRCloneRemoteInput!) {\n    rclone {\n      deleteRCloneRemote(input: $input)\n    }\n  }\n": types.DeleteRCloneRemoteDocument,
     "\n  query GetRCloneConfigForm($formOptions: RCloneConfigFormInput) {\n    rclone {\n      configForm(formOptions: $formOptions) {\n        id\n        dataSchema\n        uiSchema\n      }\n    }\n  }\n": types.GetRCloneConfigFormDocument,
     "\n  query ListRCloneRemotes {\n    rclone {\n      remotes {\n        name\n        type\n        parameters\n        config\n      }\n    }\n  }\n": types.ListRCloneRemotesDocument,
+    "\n  query InfoVersions {\n    info {\n      id\n      os {\n        id\n        hostname\n      }\n      versions {\n        id\n        core {\n          unraid\n          api\n        }\n      }\n    }\n  }\n": types.InfoVersionsDocument,
     "\n  query OidcProviders {\n    settings {\n      sso {\n        oidcProviders {\n          id\n          name\n          clientId\n          issuer\n          authorizationEndpoint\n          tokenEndpoint\n          jwksUri\n          scopes\n          authorizationRules {\n            claim\n            operator\n            value\n          }\n          authorizationRuleMode\n          buttonText\n          buttonIcon\n        }\n      }\n    }\n  }\n": types.OidcProvidersDocument,
     "\n  query PublicOidcProviders {\n    publicOidcProviders {\n      id\n      name\n      buttonText\n      buttonIcon\n      buttonVariant\n      buttonStyle\n    }\n  }\n": types.PublicOidcProvidersDocument,
     "\n  query serverInfo {\n    info {\n      os {\n        hostname\n      }\n    }\n    vars {\n      comment\n    }\n  }\n": types.ServerInfoDocument,
@@ -232,6 +234,10 @@ export function graphql(source: "\n  query GetRCloneConfigForm($formOptions: RCl
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function graphql(source: "\n  query ListRCloneRemotes {\n    rclone {\n      remotes {\n        name\n        type\n        parameters\n        config\n      }\n    }\n  }\n"): (typeof documents)["\n  query ListRCloneRemotes {\n    rclone {\n      remotes {\n        name\n        type\n        parameters\n        config\n      }\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  query InfoVersions {\n    info {\n      id\n      os {\n        id\n        hostname\n      }\n      versions {\n        id\n        core {\n          unraid\n          api\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query InfoVersions {\n    info {\n      id\n      os {\n        id\n        hostname\n      }\n      versions {\n        id\n        core {\n          unraid\n          api\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/web/composables/gql/graphql.ts b/web/composables/gql/graphql.ts
index 32c5ffa435..af0d03b4ff 100644
--- a/web/composables/gql/graphql.ts
+++ b/web/composables/gql/graphql.ts
@@ -520,6 +520,16 @@ export enum ContainerState {
   RUNNING = 'RUNNING'
 }
 
+export type CoreVersions = {
+  __typename?: 'CoreVersions';
+  /** Unraid API version */
+  api?: Maybe<Scalars['String']['output']>;
+  /** Kernel version */
+  kernel?: Maybe<Scalars['String']['output']>;
+  /** Unraid version */
+  unraid?: Maybe<Scalars['String']['output']>;
+};
+
 /** CPU load for a single core */
 export type CpuLoad = {
   __typename?: 'CpuLoad';
@@ -1039,67 +1049,11 @@ export type InfoUsb = Node & {
 
 export type InfoVersions = Node & {
   __typename?: 'InfoVersions';
-  /** Apache version */
-  apache?: Maybe<Scalars['String']['output']>;
-  /** Docker version */
-  docker?: Maybe<Scalars['String']['output']>;
-  /** gcc version */
-  gcc?: Maybe<Scalars['String']['output']>;
-  /** Git version */
-  git?: Maybe<Scalars['String']['output']>;
-  /** Grunt version */
-  grunt?: Maybe<Scalars['String']['output']>;
-  /** Gulp version */
-  gulp?: Maybe<Scalars['String']['output']>;
+  /** Core system versions */
+  core: CoreVersions;
   id: Scalars['PrefixedID']['output'];
-  /** Java version */
-  java?: Maybe<Scalars['String']['output']>;
-  /** Kernel version */
-  kernel?: Maybe<Scalars['String']['output']>;
-  /** MongoDB version */
-  mongodb?: Maybe<Scalars['String']['output']>;
-  /** MySQL version */
-  mysql?: Maybe<Scalars['String']['output']>;
-  /** nginx version */
-  nginx?: Maybe<Scalars['String']['output']>;
-  /** Node.js version */
-  node?: Maybe<Scalars['String']['output']>;
-  /** npm version */
-  npm?: Maybe<Scalars['String']['output']>;
-  /** OpenSSL version */
-  openssl?: Maybe<Scalars['String']['output']>;
-  /** Perl version */
-  perl?: Maybe<Scalars['String']['output']>;
-  /** PHP version */
-  php?: Maybe<Scalars['String']['output']>;
-  /** pip version */
-  pip?: Maybe<Scalars['String']['output']>;
-  /** pip3 version */
-  pip3?: Maybe<Scalars['String']['output']>;
-  /** pm2 version */
-  pm2?: Maybe<Scalars['String']['output']>;
-  /** Postfix version */
-  postfix?: Maybe<Scalars['String']['output']>;
-  /** PostgreSQL version */
-  postgresql?: Maybe<Scalars['String']['output']>;
-  /** Python version */
-  python?: Maybe<Scalars['String']['output']>;
-  /** Python3 version */
-  python3?: Maybe<Scalars['String']['output']>;
-  /** Redis version */
-  redis?: Maybe<Scalars['String']['output']>;
-  /** System OpenSSL version */
-  systemOpenssl?: Maybe<Scalars['String']['output']>;
-  /** tsc version */
-  tsc?: Maybe<Scalars['String']['output']>;
-  /** Unraid version */
-  unraid?: Maybe<Scalars['String']['output']>;
-  /** V8 engine version */
-  v8?: Maybe<Scalars['String']['output']>;
-  /** VirtualBox version */
-  virtualbox?: Maybe<Scalars['String']['output']>;
-  /** Yarn version */
-  yarn?: Maybe<Scalars['String']['output']>;
+  /** Software package versions */
+  packages: PackageVersions;
 };
 
 export type InitiateFlashBackupInput = {
@@ -1526,6 +1480,66 @@ export type Owner = {
   username: Scalars['String']['output'];
 };
 
+export type PackageVersions = {
+  __typename?: 'PackageVersions';
+  /** Apache version */
+  apache?: Maybe<Scalars['String']['output']>;
+  /** Docker version */
+  docker?: Maybe<Scalars['String']['output']>;
+  /** gcc version */
+  gcc?: Maybe<Scalars['String']['output']>;
+  /** Git version */
+  git?: Maybe<Scalars['String']['output']>;
+  /** Grunt version */
+  grunt?: Maybe<Scalars['String']['output']>;
+  /** Gulp version */
+  gulp?: Maybe<Scalars['String']['output']>;
+  /** Java version */
+  java?: Maybe<Scalars['String']['output']>;
+  /** MongoDB version */
+  mongodb?: Maybe<Scalars['String']['output']>;
+  /** MySQL version */
+  mysql?: Maybe<Scalars['String']['output']>;
+  /** nginx version */
+  nginx?: Maybe<Scalars['String']['output']>;
+  /** Node.js version */
+  node?: Maybe<Scalars['String']['output']>;
+  /** npm version */
+  npm?: Maybe<Scalars['String']['output']>;
+  /** OpenSSL version */
+  openssl?: Maybe<Scalars['String']['output']>;
+  /** Perl version */
+  perl?: Maybe<Scalars['String']['output']>;
+  /** PHP version */
+  php?: Maybe<Scalars['String']['output']>;
+  /** pip version */
+  pip?: Maybe<Scalars['String']['output']>;
+  /** pip3 version */
+  pip3?: Maybe<Scalars['String']['output']>;
+  /** pm2 version */
+  pm2?: Maybe<Scalars['String']['output']>;
+  /** Postfix version */
+  postfix?: Maybe<Scalars['String']['output']>;
+  /** PostgreSQL version */
+  postgresql?: Maybe<Scalars['String']['output']>;
+  /** Python version */
+  python?: Maybe<Scalars['String']['output']>;
+  /** Python3 version */
+  python3?: Maybe<Scalars['String']['output']>;
+  /** Redis version */
+  redis?: Maybe<Scalars['String']['output']>;
+  /** System OpenSSL version */
+  systemOpenssl?: Maybe<Scalars['String']['output']>;
+  /** tsc version */
+  tsc?: Maybe<Scalars['String']['output']>;
+  /** V8 engine version */
+  v8?: Maybe<Scalars['String']['output']>;
+  /** VirtualBox version */
+  virtualbox?: Maybe<Scalars['String']['output']>;
+  /** Yarn version */
+  yarn?: Maybe<Scalars['String']['output']>;
+};
+
 export type ParityCheck = {
   __typename?: 'ParityCheck';
   /** Whether corrections are being written to parity */
@@ -2707,6 +2721,11 @@ export type ListRCloneRemotesQueryVariables = Exact<{ [key: string]: never; }>;
 
 export type ListRCloneRemotesQuery = { __typename?: 'Query', rclone: { __typename?: 'RCloneBackupSettings', remotes: Array<{ __typename?: 'RCloneRemote', name: string, type: string, parameters: any, config: any }> } };
 
+export type InfoVersionsQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type InfoVersionsQuery = { __typename?: 'Query', info: { __typename?: 'Info', id: string, os: { __typename?: 'InfoOs', id: string, hostname?: string | null }, versions: { __typename?: 'InfoVersions', id: string, core: { __typename?: 'CoreVersions', unraid?: string | null, api?: string | null } } } };
+
 export type OidcProvidersQueryVariables = Exact<{ [key: string]: never; }>;
 
 
@@ -2790,6 +2809,7 @@ export const CreateRCloneRemoteDocument = {"kind":"Document","definitions":[{"ki
 export const DeleteRCloneRemoteDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteRCloneRemote"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"DeleteRCloneRemoteInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"rclone"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteRCloneRemote"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]}}]} as unknown as DocumentNode<DeleteRCloneRemoteMutation, DeleteRCloneRemoteMutationVariables>;
 export const GetRCloneConfigFormDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetRCloneConfigForm"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"formOptions"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"RCloneConfigFormInput"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"rclone"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configForm"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"formOptions"},"value":{"kind":"Variable","name":{"kind":"Name","value":"formOptions"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSchema"}},{"kind":"Field","name":{"kind":"Name","value":"uiSchema"}}]}}]}}]}}]} as unknown as DocumentNode<GetRCloneConfigFormQuery, GetRCloneConfigFormQueryVariables>;
 export const ListRCloneRemotesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ListRCloneRemotes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"rclone"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"remotes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"parameters"}},{"kind":"Field","name":{"kind":"Name","value":"config"}}]}}]}}]}}]} as unknown as DocumentNode<ListRCloneRemotesQuery, ListRCloneRemotesQueryVariables>;
+export const InfoVersionsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"InfoVersions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"os"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"hostname"}}]}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"core"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraid"}},{"kind":"Field","name":{"kind":"Name","value":"api"}}]}}]}}]}}]}}]} as unknown as DocumentNode<InfoVersionsQuery, InfoVersionsQueryVariables>;
 export const OidcProvidersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"OidcProviders"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"settings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sso"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"oidcProviders"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"clientId"}},{"kind":"Field","name":{"kind":"Name","value":"issuer"}},{"kind":"Field","name":{"kind":"Name","value":"authorizationEndpoint"}},{"kind":"Field","name":{"kind":"Name","value":"tokenEndpoint"}},{"kind":"Field","name":{"kind":"Name","value":"jwksUri"}},{"kind":"Field","name":{"kind":"Name","value":"scopes"}},{"kind":"Field","name":{"kind":"Name","value":"authorizationRules"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"claim"}},{"kind":"Field","name":{"kind":"Name","value":"operator"}},{"kind":"Field","name":{"kind":"Name","value":"value"}}]}},{"kind":"Field","name":{"kind":"Name","value":"authorizationRuleMode"}},{"kind":"Field","name":{"kind":"Name","value":"buttonText"}},{"kind":"Field","name":{"kind":"Name","value":"buttonIcon"}}]}}]}}]}}]}}]} as unknown as DocumentNode<OidcProvidersQuery, OidcProvidersQueryVariables>;
 export const PublicOidcProvidersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"PublicOidcProviders"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"publicOidcProviders"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"buttonText"}},{"kind":"Field","name":{"kind":"Name","value":"buttonIcon"}},{"kind":"Field","name":{"kind":"Name","value":"buttonVariant"}},{"kind":"Field","name":{"kind":"Name","value":"buttonStyle"}}]}}]}}]} as unknown as DocumentNode<PublicOidcProvidersQuery, PublicOidcProvidersQueryVariables>;
 export const ServerInfoDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"serverInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"os"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hostname"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"vars"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"comment"}}]}}]}}]} as unknown as DocumentNode<ServerInfoQuery, ServerInfoQueryVariables>;

From c8330947325574ae7dd6f78330f5bde2d046813f Mon Sep 17 00:00:00 2001
From: Eli Bosley <ekbosley@gmail.com>
Date: Wed, 20 Aug 2025 14:25:42 -0400
Subject: [PATCH 2/6] fix(api): improve version retrieval logic in
 getApiVersion function

- Refactored the getApiVersion function to store the version in a local variable before caching it.
- Enhanced readability by separating the version assignment from the caching logic.
---
 .../graph/resolvers/info/versions/get-api-version.ts         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/src/unraid-api/graph/resolvers/info/versions/get-api-version.ts b/api/src/unraid-api/graph/resolvers/info/versions/get-api-version.ts
index f6c6d0eebd..c1ac6305c3 100644
--- a/api/src/unraid-api/graph/resolvers/info/versions/get-api-version.ts
+++ b/api/src/unraid-api/graph/resolvers/info/versions/get-api-version.ts
@@ -11,8 +11,9 @@ export function getApiVersion(): string {
     try {
         const packagePath = join(process.cwd(), 'package.json');
         const packageJson = JSON.parse(readFileSync(packagePath, 'utf-8'));
-        cachedVersion = packageJson.version || 'unknown';
-        return cachedVersion;
+        const version = packageJson.version || 'unknown';
+        cachedVersion = version;
+        return version;
     } catch (error) {
         console.error('Failed to read API version from package.json:', error);
         return 'unknown';

From 41e0c779853fd0f0977cfbc829337d33570998dc Mon Sep 17 00:00:00 2001
From: Eli Bosley <ekbosley@gmail.com>
Date: Wed, 20 Aug 2025 14:36:59 -0400
Subject: [PATCH 3/6] feat(api): restructure versioning information in GraphQL
 schema

- Removed deprecated version fields from PackageVersions type.
- Introduced CoreVersions type to encapsulate core system version details.
- Updated InfoVersions type to include references to CoreVersions and PackageVersions.
- Modified SystemReport query to return structured version information.
- Enhanced versions resolver to align with the new schema structure.
---
 api/generated-schema.graphql                  | 60 ------------
 api/src/unraid-api/cli/generated/gql.ts       |  6 +-
 api/src/unraid-api/cli/generated/graphql.ts   | 98 +++++++------------
 .../cli/queries/system-report.query.ts        | 10 +-
 .../resolvers/info/versions/versions.model.ts | 60 ------------
 .../info/versions/versions.resolver.ts        | 20 ----
 .../components/HeaderOsVersion.test.ts        | 43 ++++++--
 7 files changed, 79 insertions(+), 218 deletions(-)

diff --git a/api/generated-schema.graphql b/api/generated-schema.graphql
index 1bdd2a6b6d..b8f15b3b13 100644
--- a/api/generated-schema.graphql
+++ b/api/generated-schema.graphql
@@ -1516,84 +1516,24 @@ type PackageVersions {
   """OpenSSL version"""
   openssl: String
 
-  """System OpenSSL version"""
-  systemOpenssl: String
-
   """Node.js version"""
   node: String
 
-  """V8 engine version"""
-  v8: String
-
   """npm version"""
   npm: String
 
-  """Yarn version"""
-  yarn: String
-
   """pm2 version"""
   pm2: String
 
-  """Gulp version"""
-  gulp: String
-
-  """Grunt version"""
-  grunt: String
-
   """Git version"""
   git: String
 
-  """tsc version"""
-  tsc: String
-
-  """MySQL version"""
-  mysql: String
-
-  """Redis version"""
-  redis: String
-
-  """MongoDB version"""
-  mongodb: String
-
-  """Apache version"""
-  apache: String
-
   """nginx version"""
   nginx: String
 
   """PHP version"""
   php: String
 
-  """Postfix version"""
-  postfix: String
-
-  """PostgreSQL version"""
-  postgresql: String
-
-  """Perl version"""
-  perl: String
-
-  """Python version"""
-  python: String
-
-  """Python3 version"""
-  python3: String
-
-  """pip version"""
-  pip: String
-
-  """pip3 version"""
-  pip3: String
-
-  """Java version"""
-  java: String
-
-  """gcc version"""
-  gcc: String
-
-  """VirtualBox version"""
-  virtualbox: String
-
   """Docker version"""
   docker: String
 }
diff --git a/api/src/unraid-api/cli/generated/gql.ts b/api/src/unraid-api/cli/generated/gql.ts
index 1f89d183f2..7a8613665d 100644
--- a/api/src/unraid-api/cli/generated/gql.ts
+++ b/api/src/unraid-api/cli/generated/gql.ts
@@ -20,7 +20,7 @@ type Documents = {
     "\n    mutation UpdateSandboxSettings($input: JSON!) {\n        updateSettings(input: $input) {\n            restartRequired\n            values\n        }\n    }\n": typeof types.UpdateSandboxSettingsDocument,
     "\n    query GetPlugins {\n        plugins {\n            name\n            version\n            hasApiModule\n            hasCliModule\n        }\n    }\n": typeof types.GetPluginsDocument,
     "\n    query GetSSOUsers {\n        settings {\n            api {\n                ssoSubIds\n            }\n        }\n    }\n": typeof types.GetSsoUsersDocument,
-    "\n    query SystemReport {\n        info {\n            id\n            machineId\n            system {\n                manufacturer\n                model\n                version\n                sku\n                serial\n                uuid\n            }\n            versions {\n                unraid\n                kernel\n                openssl\n            }\n        }\n        config {\n            id\n            valid\n            error\n        }\n        server {\n            id\n            name\n        }\n    }\n": typeof types.SystemReportDocument,
+    "\n    query SystemReport {\n        info {\n            id\n            machineId\n            system {\n                manufacturer\n                model\n                version\n                sku\n                serial\n                uuid\n            }\n            versions {\n                core {\n                    unraid\n                    kernel\n                }\n                packages {\n                    openssl\n                }\n            }\n        }\n        config {\n            id\n            valid\n            error\n        }\n        server {\n            id\n            name\n        }\n    }\n": typeof types.SystemReportDocument,
     "\n    query ConnectStatus {\n        connect {\n            id\n            dynamicRemoteAccess {\n                enabledType\n                runningType\n                error\n            }\n        }\n    }\n": typeof types.ConnectStatusDocument,
     "\n    query Services {\n        services {\n            id\n            name\n            online\n            uptime {\n                timestamp\n            }\n            version\n        }\n    }\n": typeof types.ServicesDocument,
     "\n    query ValidateOidcSession($token: String!) {\n        validateOidcSession(token: $token) {\n            valid\n            username\n        }\n    }\n": typeof types.ValidateOidcSessionDocument,
@@ -32,7 +32,7 @@ const documents: Documents = {
     "\n    mutation UpdateSandboxSettings($input: JSON!) {\n        updateSettings(input: $input) {\n            restartRequired\n            values\n        }\n    }\n": types.UpdateSandboxSettingsDocument,
     "\n    query GetPlugins {\n        plugins {\n            name\n            version\n            hasApiModule\n            hasCliModule\n        }\n    }\n": types.GetPluginsDocument,
     "\n    query GetSSOUsers {\n        settings {\n            api {\n                ssoSubIds\n            }\n        }\n    }\n": types.GetSsoUsersDocument,
-    "\n    query SystemReport {\n        info {\n            id\n            machineId\n            system {\n                manufacturer\n                model\n                version\n                sku\n                serial\n                uuid\n            }\n            versions {\n                unraid\n                kernel\n                openssl\n            }\n        }\n        config {\n            id\n            valid\n            error\n        }\n        server {\n            id\n            name\n        }\n    }\n": types.SystemReportDocument,
+    "\n    query SystemReport {\n        info {\n            id\n            machineId\n            system {\n                manufacturer\n                model\n                version\n                sku\n                serial\n                uuid\n            }\n            versions {\n                core {\n                    unraid\n                    kernel\n                }\n                packages {\n                    openssl\n                }\n            }\n        }\n        config {\n            id\n            valid\n            error\n        }\n        server {\n            id\n            name\n        }\n    }\n": types.SystemReportDocument,
     "\n    query ConnectStatus {\n        connect {\n            id\n            dynamicRemoteAccess {\n                enabledType\n                runningType\n                error\n            }\n        }\n    }\n": types.ConnectStatusDocument,
     "\n    query Services {\n        services {\n            id\n            name\n            online\n            uptime {\n                timestamp\n            }\n            version\n        }\n    }\n": types.ServicesDocument,
     "\n    query ValidateOidcSession($token: String!) {\n        validateOidcSession(token: $token) {\n            valid\n            username\n        }\n    }\n": types.ValidateOidcSessionDocument,
@@ -79,7 +79,7 @@ export function gql(source: "\n    query GetSSOUsers {\n        settings {\n
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function gql(source: "\n    query SystemReport {\n        info {\n            id\n            machineId\n            system {\n                manufacturer\n                model\n                version\n                sku\n                serial\n                uuid\n            }\n            versions {\n                unraid\n                kernel\n                openssl\n            }\n        }\n        config {\n            id\n            valid\n            error\n        }\n        server {\n            id\n            name\n        }\n    }\n"): (typeof documents)["\n    query SystemReport {\n        info {\n            id\n            machineId\n            system {\n                manufacturer\n                model\n                version\n                sku\n                serial\n                uuid\n            }\n            versions {\n                unraid\n                kernel\n                openssl\n            }\n        }\n        config {\n            id\n            valid\n            error\n        }\n        server {\n            id\n            name\n        }\n    }\n"];
+export function gql(source: "\n    query SystemReport {\n        info {\n            id\n            machineId\n            system {\n                manufacturer\n                model\n                version\n                sku\n                serial\n                uuid\n            }\n            versions {\n                core {\n                    unraid\n                    kernel\n                }\n                packages {\n                    openssl\n                }\n            }\n        }\n        config {\n            id\n            valid\n            error\n        }\n        server {\n            id\n            name\n        }\n    }\n"): (typeof documents)["\n    query SystemReport {\n        info {\n            id\n            machineId\n            system {\n                manufacturer\n                model\n                version\n                sku\n                serial\n                uuid\n            }\n            versions {\n                core {\n                    unraid\n                    kernel\n                }\n                packages {\n                    openssl\n                }\n            }\n        }\n        config {\n            id\n            valid\n            error\n        }\n        server {\n            id\n            name\n        }\n    }\n"];
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/api/src/unraid-api/cli/generated/graphql.ts b/api/src/unraid-api/cli/generated/graphql.ts
index 9f367a3da9..bd8ab14a32 100644
--- a/api/src/unraid-api/cli/generated/graphql.ts
+++ b/api/src/unraid-api/cli/generated/graphql.ts
@@ -520,6 +520,16 @@ export enum ContainerState {
   RUNNING = 'RUNNING'
 }
 
+export type CoreVersions = {
+  __typename?: 'CoreVersions';
+  /** Unraid API version */
+  api?: Maybe<Scalars['String']['output']>;
+  /** Kernel version */
+  kernel?: Maybe<Scalars['String']['output']>;
+  /** Unraid version */
+  unraid?: Maybe<Scalars['String']['output']>;
+};
+
 /** CPU load for a single core */
 export type CpuLoad = {
   __typename?: 'CpuLoad';
@@ -1039,69 +1049,11 @@ export type InfoUsb = Node & {
 
 export type InfoVersions = Node & {
   __typename?: 'InfoVersions';
-  /** Apache version */
-  apache?: Maybe<Scalars['String']['output']>;
-  /** Unraid API version */
-  api?: Maybe<Scalars['String']['output']>;
-  /** Docker version */
-  docker?: Maybe<Scalars['String']['output']>;
-  /** gcc version */
-  gcc?: Maybe<Scalars['String']['output']>;
-  /** Git version */
-  git?: Maybe<Scalars['String']['output']>;
-  /** Grunt version */
-  grunt?: Maybe<Scalars['String']['output']>;
-  /** Gulp version */
-  gulp?: Maybe<Scalars['String']['output']>;
+  /** Core system versions */
+  core: CoreVersions;
   id: Scalars['PrefixedID']['output'];
-  /** Java version */
-  java?: Maybe<Scalars['String']['output']>;
-  /** Kernel version */
-  kernel?: Maybe<Scalars['String']['output']>;
-  /** MongoDB version */
-  mongodb?: Maybe<Scalars['String']['output']>;
-  /** MySQL version */
-  mysql?: Maybe<Scalars['String']['output']>;
-  /** nginx version */
-  nginx?: Maybe<Scalars['String']['output']>;
-  /** Node.js version */
-  node?: Maybe<Scalars['String']['output']>;
-  /** npm version */
-  npm?: Maybe<Scalars['String']['output']>;
-  /** OpenSSL version */
-  openssl?: Maybe<Scalars['String']['output']>;
-  /** Perl version */
-  perl?: Maybe<Scalars['String']['output']>;
-  /** PHP version */
-  php?: Maybe<Scalars['String']['output']>;
-  /** pip version */
-  pip?: Maybe<Scalars['String']['output']>;
-  /** pip3 version */
-  pip3?: Maybe<Scalars['String']['output']>;
-  /** pm2 version */
-  pm2?: Maybe<Scalars['String']['output']>;
-  /** Postfix version */
-  postfix?: Maybe<Scalars['String']['output']>;
-  /** PostgreSQL version */
-  postgresql?: Maybe<Scalars['String']['output']>;
-  /** Python version */
-  python?: Maybe<Scalars['String']['output']>;
-  /** Python3 version */
-  python3?: Maybe<Scalars['String']['output']>;
-  /** Redis version */
-  redis?: Maybe<Scalars['String']['output']>;
-  /** System OpenSSL version */
-  systemOpenssl?: Maybe<Scalars['String']['output']>;
-  /** tsc version */
-  tsc?: Maybe<Scalars['String']['output']>;
-  /** Unraid version */
-  unraid?: Maybe<Scalars['String']['output']>;
-  /** V8 engine version */
-  v8?: Maybe<Scalars['String']['output']>;
-  /** VirtualBox version */
-  virtualbox?: Maybe<Scalars['String']['output']>;
-  /** Yarn version */
-  yarn?: Maybe<Scalars['String']['output']>;
+  /** Software package versions */
+  packages: PackageVersions;
 };
 
 export type InitiateFlashBackupInput = {
@@ -1528,6 +1480,24 @@ export type Owner = {
   username: Scalars['String']['output'];
 };
 
+export type PackageVersions = {
+  __typename?: 'PackageVersions';
+  /** Docker version */
+  docker?: Maybe<Scalars['String']['output']>;
+  /** Git version */
+  git?: Maybe<Scalars['String']['output']>;
+  /** OpenSSL version */
+  openssl?: Maybe<Scalars['String']['output']>;
+  /** Perl version */
+  perl?: Maybe<Scalars['String']['output']>;
+  /** PHP version */
+  php?: Maybe<Scalars['String']['output']>;
+  /** Python version */
+  python?: Maybe<Scalars['String']['output']>;
+  /** Python3 version */
+  python3?: Maybe<Scalars['String']['output']>;
+};
+
 export type ParityCheck = {
   __typename?: 'ParityCheck';
   /** Whether corrections are being written to parity */
@@ -2555,7 +2525,7 @@ export type GetSsoUsersQuery = { __typename?: 'Query', settings: { __typename?:
 export type SystemReportQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type SystemReportQuery = { __typename?: 'Query', info: { __typename?: 'Info', id: any, machineId?: string | null, system: { __typename?: 'InfoSystem', manufacturer?: string | null, model?: string | null, version?: string | null, sku?: string | null, serial?: string | null, uuid?: string | null }, versions: { __typename?: 'InfoVersions', unraid?: string | null, kernel?: string | null, openssl?: string | null } }, config: { __typename?: 'Config', id: any, valid?: boolean | null, error?: string | null }, server?: { __typename?: 'Server', id: any, name: string } | null };
+export type SystemReportQuery = { __typename?: 'Query', info: { __typename?: 'Info', id: any, machineId?: string | null, system: { __typename?: 'InfoSystem', manufacturer?: string | null, model?: string | null, version?: string | null, sku?: string | null, serial?: string | null, uuid?: string | null }, versions: { __typename?: 'InfoVersions', core: { __typename?: 'CoreVersions', unraid?: string | null, kernel?: string | null }, packages: { __typename?: 'PackageVersions', openssl?: string | null } } }, config: { __typename?: 'Config', id: any, valid?: boolean | null, error?: string | null }, server?: { __typename?: 'Server', id: any, name: string } | null };
 
 export type ConnectStatusQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -2581,7 +2551,7 @@ export const UpdateSsoUsersDocument = {"kind":"Document","definitions":[{"kind":
 export const UpdateSandboxSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateSandboxSettings"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"JSON"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateSettings"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"restartRequired"}},{"kind":"Field","name":{"kind":"Name","value":"values"}}]}}]}}]} as unknown as DocumentNode<UpdateSandboxSettingsMutation, UpdateSandboxSettingsMutationVariables>;
 export const GetPluginsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetPlugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"plugins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"hasApiModule"}},{"kind":"Field","name":{"kind":"Name","value":"hasCliModule"}}]}}]}}]} as unknown as DocumentNode<GetPluginsQuery, GetPluginsQueryVariables>;
 export const GetSsoUsersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetSSOUsers"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"settings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"api"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"ssoSubIds"}}]}}]}}]}}]} as unknown as DocumentNode<GetSsoUsersQuery, GetSsoUsersQueryVariables>;
-export const SystemReportDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"SystemReport"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"machineId"}},{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"manufacturer"}},{"kind":"Field","name":{"kind":"Name","value":"model"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"sku"}},{"kind":"Field","name":{"kind":"Name","value":"serial"}},{"kind":"Field","name":{"kind":"Name","value":"uuid"}}]}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraid"}},{"kind":"Field","name":{"kind":"Name","value":"kernel"}},{"kind":"Field","name":{"kind":"Name","value":"openssl"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"config"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"valid"}},{"kind":"Field","name":{"kind":"Name","value":"error"}}]}},{"kind":"Field","name":{"kind":"Name","value":"server"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]} as unknown as DocumentNode<SystemReportQuery, SystemReportQueryVariables>;
+export const SystemReportDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"SystemReport"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"info"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"machineId"}},{"kind":"Field","name":{"kind":"Name","value":"system"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"manufacturer"}},{"kind":"Field","name":{"kind":"Name","value":"model"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"sku"}},{"kind":"Field","name":{"kind":"Name","value":"serial"}},{"kind":"Field","name":{"kind":"Name","value":"uuid"}}]}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"core"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unraid"}},{"kind":"Field","name":{"kind":"Name","value":"kernel"}}]}},{"kind":"Field","name":{"kind":"Name","value":"packages"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"openssl"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"config"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"valid"}},{"kind":"Field","name":{"kind":"Name","value":"error"}}]}},{"kind":"Field","name":{"kind":"Name","value":"server"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]} as unknown as DocumentNode<SystemReportQuery, SystemReportQueryVariables>;
 export const ConnectStatusDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ConnectStatus"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"connect"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dynamicRemoteAccess"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"enabledType"}},{"kind":"Field","name":{"kind":"Name","value":"runningType"}},{"kind":"Field","name":{"kind":"Name","value":"error"}}]}}]}}]}}]} as unknown as DocumentNode<ConnectStatusQuery, ConnectStatusQueryVariables>;
 export const ServicesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Services"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"services"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"online"}},{"kind":"Field","name":{"kind":"Name","value":"uptime"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timestamp"}}]}},{"kind":"Field","name":{"kind":"Name","value":"version"}}]}}]}}]} as unknown as DocumentNode<ServicesQuery, ServicesQueryVariables>;
 export const ValidateOidcSessionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ValidateOidcSession"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"token"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"validateOidcSession"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"token"},"value":{"kind":"Variable","name":{"kind":"Name","value":"token"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"valid"}},{"kind":"Field","name":{"kind":"Name","value":"username"}}]}}]}}]} as unknown as DocumentNode<ValidateOidcSessionQuery, ValidateOidcSessionQueryVariables>;
\ No newline at end of file
diff --git a/api/src/unraid-api/cli/queries/system-report.query.ts b/api/src/unraid-api/cli/queries/system-report.query.ts
index adc4140f8e..5f4313458d 100644
--- a/api/src/unraid-api/cli/queries/system-report.query.ts
+++ b/api/src/unraid-api/cli/queries/system-report.query.ts
@@ -14,9 +14,13 @@ export const SYSTEM_REPORT_QUERY = gql(`
                 uuid
             }
             versions {
-                unraid
-                kernel
-                openssl
+                core {
+                    unraid
+                    kernel
+                }
+                packages {
+                    openssl
+                }
             }
         }
         config {
diff --git a/api/src/unraid-api/graph/resolvers/info/versions/versions.model.ts b/api/src/unraid-api/graph/resolvers/info/versions/versions.model.ts
index c7983bec1e..e2971e51b9 100644
--- a/api/src/unraid-api/graph/resolvers/info/versions/versions.model.ts
+++ b/api/src/unraid-api/graph/resolvers/info/versions/versions.model.ts
@@ -19,84 +19,24 @@ export class PackageVersions {
     @Field(() => String, { nullable: true, description: 'OpenSSL version' })
     openssl?: string;
 
-    @Field(() => String, { nullable: true, description: 'System OpenSSL version' })
-    systemOpenssl?: string;
-
     @Field(() => String, { nullable: true, description: 'Node.js version' })
     node?: string;
 
-    @Field(() => String, { nullable: true, description: 'V8 engine version' })
-    v8?: string;
-
     @Field(() => String, { nullable: true, description: 'npm version' })
     npm?: string;
 
-    @Field(() => String, { nullable: true, description: 'Yarn version' })
-    yarn?: string;
-
     @Field(() => String, { nullable: true, description: 'pm2 version' })
     pm2?: string;
 
-    @Field(() => String, { nullable: true, description: 'Gulp version' })
-    gulp?: string;
-
-    @Field(() => String, { nullable: true, description: 'Grunt version' })
-    grunt?: string;
-
     @Field(() => String, { nullable: true, description: 'Git version' })
     git?: string;
 
-    @Field(() => String, { nullable: true, description: 'tsc version' })
-    tsc?: string;
-
-    @Field(() => String, { nullable: true, description: 'MySQL version' })
-    mysql?: string;
-
-    @Field(() => String, { nullable: true, description: 'Redis version' })
-    redis?: string;
-
-    @Field(() => String, { nullable: true, description: 'MongoDB version' })
-    mongodb?: string;
-
-    @Field(() => String, { nullable: true, description: 'Apache version' })
-    apache?: string;
-
     @Field(() => String, { nullable: true, description: 'nginx version' })
     nginx?: string;
 
     @Field(() => String, { nullable: true, description: 'PHP version' })
     php?: string;
 
-    @Field(() => String, { nullable: true, description: 'Postfix version' })
-    postfix?: string;
-
-    @Field(() => String, { nullable: true, description: 'PostgreSQL version' })
-    postgresql?: string;
-
-    @Field(() => String, { nullable: true, description: 'Perl version' })
-    perl?: string;
-
-    @Field(() => String, { nullable: true, description: 'Python version' })
-    python?: string;
-
-    @Field(() => String, { nullable: true, description: 'Python3 version' })
-    python3?: string;
-
-    @Field(() => String, { nullable: true, description: 'pip version' })
-    pip?: string;
-
-    @Field(() => String, { nullable: true, description: 'pip3 version' })
-    pip3?: string;
-
-    @Field(() => String, { nullable: true, description: 'Java version' })
-    java?: string;
-
-    @Field(() => String, { nullable: true, description: 'gcc version' })
-    gcc?: string;
-
-    @Field(() => String, { nullable: true, description: 'VirtualBox version' })
-    virtualbox?: string;
-
     @Field(() => String, { nullable: true, description: 'Docker version' })
     docker?: string;
 }
diff --git a/api/src/unraid-api/graph/resolvers/info/versions/versions.resolver.ts b/api/src/unraid-api/graph/resolvers/info/versions/versions.resolver.ts
index b50f8ad2e5..77d2f2d4fd 100644
--- a/api/src/unraid-api/graph/resolvers/info/versions/versions.resolver.ts
+++ b/api/src/unraid-api/graph/resolvers/info/versions/versions.resolver.ts
@@ -31,32 +31,12 @@ export class VersionsResolver {
 
         return {
             openssl: softwareVersions.openssl,
-            systemOpenssl: softwareVersions.systemOpenssl,
             node: softwareVersions.node,
-            v8: softwareVersions.v8,
             npm: softwareVersions.npm,
-            yarn: softwareVersions.yarn,
             pm2: softwareVersions.pm2,
-            gulp: softwareVersions.gulp,
-            grunt: softwareVersions.grunt,
             git: softwareVersions.git,
-            tsc: softwareVersions.tsc,
-            mysql: softwareVersions.mysql,
-            redis: softwareVersions.redis,
-            mongodb: softwareVersions.mongodb,
-            apache: (softwareVersions as any).apache,
             nginx: softwareVersions.nginx,
             php: softwareVersions.php,
-            postfix: softwareVersions.postfix,
-            postgresql: softwareVersions.postgresql,
-            perl: softwareVersions.perl,
-            python: softwareVersions.python,
-            python3: softwareVersions.python3,
-            pip: softwareVersions.pip,
-            pip3: softwareVersions.pip3,
-            java: softwareVersions.java,
-            gcc: softwareVersions.gcc,
-            virtualbox: softwareVersions.virtualbox,
             docker: softwareVersions.docker,
         };
     }
diff --git a/web/__test__/components/HeaderOsVersion.test.ts b/web/__test__/components/HeaderOsVersion.test.ts
index 65c9287ff6..6dea911eca 100644
--- a/web/__test__/components/HeaderOsVersion.test.ts
+++ b/web/__test__/components/HeaderOsVersion.test.ts
@@ -18,13 +18,42 @@ import HeaderOsVersion from '~/components/HeaderOsVersion.ce.vue';
 import { useErrorsStore } from '~/store/errors';
 import { useServerStore } from '~/store/server';
 
-const testMockReleaseNotesUrl = 'http://mock.release.notes/v';
-
 vi.mock('crypto-js/aes', () => ({ default: {} }));
 vi.mock('@unraid/shared-callbacks', () => ({
   useCallback: vi.fn(() => ({ send: vi.fn(), watcher: vi.fn() })),
 }));
 
+vi.mock('@unraid/ui', () => ({
+  Badge: {
+    name: 'Badge',
+    template: '<div><slot /></div>',
+  },
+  DropdownMenuRoot: {
+    name: 'DropdownMenuRoot',
+    template: '<div><slot /></div>',
+  },
+  DropdownMenuTrigger: {
+    name: 'DropdownMenuTrigger',
+    template: '<div><slot /></div>',
+  },
+  DropdownMenuContent: {
+    name: 'DropdownMenuContent',
+    template: '<div><slot /></div>',
+  },
+  DropdownMenuItem: {
+    name: 'DropdownMenuItem',
+    template: '<div><slot /></div>',
+  },
+  DropdownMenuLabel: {
+    name: 'DropdownMenuLabel',
+    template: '<div><slot /></div>',
+  },
+  DropdownMenuSeparator: {
+    name: 'DropdownMenuSeparator',
+    template: '<div />',
+  },
+}));
+
 vi.mock('@vue/apollo-composable', () => ({
   useQuery: () => ({
     result: { value: {} },
@@ -123,13 +152,11 @@ describe('HeaderOsVersion', () => {
     vi.restoreAllMocks();
   });
 
-  it('renders OS version link with correct URL and no update status initially', () => {
-    const versionLink = wrapper.find('a[title*="release notes"]');
-
-    expect(versionLink.exists()).toBe(true);
-    expect(versionLink.attributes('href')).toBe(`${testMockReleaseNotesUrl}6.12.0`);
+  it('renders OS version button with correct version and no update status initially', () => {
+    const versionButton = wrapper.find('button[title*="Version Information"]');
 
-    expect(versionLink.text()).toContain('6.12.0');
+    expect(versionButton.exists()).toBe(true);
+    expect(versionButton.text()).toContain('6.12.0');
     expect(findUpdateStatusComponent()).toBeNull();
   });
 

From 40b056d4063a794b3625d376eb99597906f8b1bc Mon Sep 17 00:00:00 2001
From: Eli Bosley <ekbosley@gmail.com>
Date: Wed, 20 Aug 2025 15:14:24 -0400
Subject: [PATCH 4/6] fix(api): update version retrieval in ApiReportService
 and enhance PackageVersions type

- Changed version retrieval in ApiReportService to use core.unraid instead of unraid.
- Added new fields for nginx, node, npm, and pm2 versions in PackageVersions type.
- Removed deprecated fields for perl, python, and python3 from PackageVersions type.
- Ensured consistent export formatting in generated index file.
---
 api/src/unraid-api/cli/api-report.service.ts |  2 +-
 api/src/unraid-api/cli/generated/graphql.ts  | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/api/src/unraid-api/cli/api-report.service.ts b/api/src/unraid-api/cli/api-report.service.ts
index 6264a1eb0c..6b2ecac41d 100644
--- a/api/src/unraid-api/cli/api-report.service.ts
+++ b/api/src/unraid-api/cli/api-report.service.ts
@@ -82,7 +82,7 @@ export class ApiReportService {
                 ? {
                       id: systemData.info.system.uuid,
                       name: systemData.server?.name || 'Unknown',
-                      version: systemData.info.versions.unraid || 'Unknown',
+                      version: systemData.info.versions.core.unraid || 'Unknown',
                       machineId: 'REDACTED',
                       manufacturer: systemData.info.system.manufacturer,
                       model: systemData.info.system.model,
diff --git a/api/src/unraid-api/cli/generated/graphql.ts b/api/src/unraid-api/cli/generated/graphql.ts
index bd8ab14a32..72e473bf6a 100644
--- a/api/src/unraid-api/cli/generated/graphql.ts
+++ b/api/src/unraid-api/cli/generated/graphql.ts
@@ -1486,16 +1486,18 @@ export type PackageVersions = {
   docker?: Maybe<Scalars['String']['output']>;
   /** Git version */
   git?: Maybe<Scalars['String']['output']>;
+  /** nginx version */
+  nginx?: Maybe<Scalars['String']['output']>;
+  /** Node.js version */
+  node?: Maybe<Scalars['String']['output']>;
+  /** npm version */
+  npm?: Maybe<Scalars['String']['output']>;
   /** OpenSSL version */
   openssl?: Maybe<Scalars['String']['output']>;
-  /** Perl version */
-  perl?: Maybe<Scalars['String']['output']>;
   /** PHP version */
   php?: Maybe<Scalars['String']['output']>;
-  /** Python version */
-  python?: Maybe<Scalars['String']['output']>;
-  /** Python3 version */
-  python3?: Maybe<Scalars['String']['output']>;
+  /** pm2 version */
+  pm2?: Maybe<Scalars['String']['output']>;
 };
 
 export type ParityCheck = {

From c5400fe9df5546e18a5f3fc3457b490260682909 Mon Sep 17 00:00:00 2001
From: Eli Bosley <ekbosley@gmail.com>
Date: Wed, 20 Aug 2025 15:39:58 -0400
Subject: [PATCH 5/6] refactor(api): enhance version structure in
 ApiReportService and update InfoResolver tests

- Restructured version information in ApiReportService to separate core and package versions.
- Updated InfoResolver integration tests to reflect changes in version retrieval, now returning a stub object for field resolvers.
---
 .../unraid-api/cli/__test__/api-report.service.test.ts | 10 +++++++---
 .../resolvers/info/info.resolver.integration.spec.ts   |  5 +++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/api/src/unraid-api/cli/__test__/api-report.service.test.ts b/api/src/unraid-api/cli/__test__/api-report.service.test.ts
index e518e2356f..36f1f14737 100644
--- a/api/src/unraid-api/cli/__test__/api-report.service.test.ts
+++ b/api/src/unraid-api/cli/__test__/api-report.service.test.ts
@@ -64,9 +64,13 @@ describe('ApiReportService', () => {
                     uuid: 'test-uuid',
                 },
                 versions: {
-                    unraid: '6.12.0',
-                    kernel: '5.19.17',
-                    openssl: '3.0.8',
+                    core: {
+                        unraid: '6.12.0',
+                        kernel: '5.19.17',
+                    },
+                    packages: {
+                        openssl: '3.0.8',
+                    },
                 },
             },
             config: {
diff --git a/api/src/unraid-api/graph/resolvers/info/info.resolver.integration.spec.ts b/api/src/unraid-api/graph/resolvers/info/info.resolver.integration.spec.ts
index eb21908e9b..e8ae31a704 100644
--- a/api/src/unraid-api/graph/resolvers/info/info.resolver.integration.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/info/info.resolver.integration.spec.ts
@@ -165,11 +165,12 @@ describe('InfoResolver Integration Tests', () => {
             expect(typeof result.platform).toBe('string');
         });
 
-        it.skipIf(process.env.CI)('should return versions data from service', async () => {
-            const result = await infoResolver.versions();
+        it('should return versions stub for field resolvers', () => {
+            const result = infoResolver.versions();
 
             expect(result).toHaveProperty('id', 'info/versions');
             // Versions now returns a stub object, with actual data resolved via field resolvers
+            expect(Object.keys(result)).toEqual(['id']);
         });
     });
 

From b6d9809a3587d14ccb5e0198ffd1774d7e66fcdc Mon Sep 17 00:00:00 2001
From: Eli Bosley <ekbosley@gmail.com>
Date: Wed, 20 Aug 2025 15:44:24 -0400
Subject: [PATCH 6/6] refactor(api): clean up PackageVersions type by removing
 deprecated fields

- Removed several deprecated fields from the PackageVersions type to streamline version management.
- Ensured consistent export formatting in the index file.
---
 web/composables/gql/graphql.ts | 40 ----------------------------------
 1 file changed, 40 deletions(-)

diff --git a/web/composables/gql/graphql.ts b/web/composables/gql/graphql.ts
index af0d03b4ff..9a054e4522 100644
--- a/web/composables/gql/graphql.ts
+++ b/web/composables/gql/graphql.ts
@@ -1482,24 +1482,10 @@ export type Owner = {
 
 export type PackageVersions = {
   __typename?: 'PackageVersions';
-  /** Apache version */
-  apache?: Maybe<Scalars['String']['output']>;
   /** Docker version */
   docker?: Maybe<Scalars['String']['output']>;
-  /** gcc version */
-  gcc?: Maybe<Scalars['String']['output']>;
   /** Git version */
   git?: Maybe<Scalars['String']['output']>;
-  /** Grunt version */
-  grunt?: Maybe<Scalars['String']['output']>;
-  /** Gulp version */
-  gulp?: Maybe<Scalars['String']['output']>;
-  /** Java version */
-  java?: Maybe<Scalars['String']['output']>;
-  /** MongoDB version */
-  mongodb?: Maybe<Scalars['String']['output']>;
-  /** MySQL version */
-  mysql?: Maybe<Scalars['String']['output']>;
   /** nginx version */
   nginx?: Maybe<Scalars['String']['output']>;
   /** Node.js version */
@@ -1508,36 +1494,10 @@ export type PackageVersions = {
   npm?: Maybe<Scalars['String']['output']>;
   /** OpenSSL version */
   openssl?: Maybe<Scalars['String']['output']>;
-  /** Perl version */
-  perl?: Maybe<Scalars['String']['output']>;
   /** PHP version */
   php?: Maybe<Scalars['String']['output']>;
-  /** pip version */
-  pip?: Maybe<Scalars['String']['output']>;
-  /** pip3 version */
-  pip3?: Maybe<Scalars['String']['output']>;
   /** pm2 version */
   pm2?: Maybe<Scalars['String']['output']>;
-  /** Postfix version */
-  postfix?: Maybe<Scalars['String']['output']>;
-  /** PostgreSQL version */
-  postgresql?: Maybe<Scalars['String']['output']>;
-  /** Python version */
-  python?: Maybe<Scalars['String']['output']>;
-  /** Python3 version */
-  python3?: Maybe<Scalars['String']['output']>;
-  /** Redis version */
-  redis?: Maybe<Scalars['String']['output']>;
-  /** System OpenSSL version */
-  systemOpenssl?: Maybe<Scalars['String']['output']>;
-  /** tsc version */
-  tsc?: Maybe<Scalars['String']['output']>;
-  /** V8 engine version */
-  v8?: Maybe<Scalars['String']['output']>;
-  /** VirtualBox version */
-  virtualbox?: Maybe<Scalars['String']['output']>;
-  /** Yarn version */
-  yarn?: Maybe<Scalars['String']['output']>;
 };
 
 export type ParityCheck = {