diff --git a/plugin/source/dynamix.unraid.net/install/doinst.sh b/plugin/source/dynamix.unraid.net/install/doinst.sh
index e18f5f64eb..710522e626 100644
--- a/plugin/source/dynamix.unraid.net/install/doinst.sh
+++ b/plugin/source/dynamix.unraid.net/install/doinst.sh
@@ -31,3 +31,9 @@ cp usr/local/unraid-api/.env.production usr/local/unraid-api/.env
 ( cd usr/local/bin ; ln -sf ../lib/node_modules/npm/bin/npm-cli.js npm )
 ( cd usr/local/bin ; rm -rf npx )
 ( cd usr/local/bin ; ln -sf ../lib/node_modules/npm/bin/npx-cli.js npx )
+( cd usr/local/bin ; rm -rf corepack )
+( cd usr/local/bin ; ln -sf ../lib/node_modules/corepack/dist/corepack.js corepack )
+( cd usr/local/bin ; rm -rf npm )
+( cd usr/local/bin ; ln -sf ../lib/node_modules/npm/bin/npm-cli.js npm )
+( cd usr/local/bin ; rm -rf npx )
+( cd usr/local/bin ; ln -sf ../lib/node_modules/npm/bin/npx-cli.js npx )
diff --git a/unraid-ui/src/components/brand/brand-button.variants.ts b/unraid-ui/src/components/brand/brand-button.variants.ts
index 352b3f5538..0dd53eac60 100644
--- a/unraid-ui/src/components/brand/brand-button.variants.ts
+++ b/unraid-ui/src/components/brand/brand-button.variants.ts
@@ -1,7 +1,7 @@
 import { cva, type VariantProps } from 'class-variance-authority';
 
 export const brandButtonVariants = cva(
-  'group text-center font-semibold leading-none relative z-0 flex flex-row items-center justify-center border-2 border-solid shadow-none cursor-pointer rounded-md hover:shadow-md focus:shadow-md disabled:opacity-25 disabled:hover:opacity-25 disabled:focus:opacity-25 disabled:cursor-not-allowed',
+  'group text-center font-semibold leading-none relative z-0 flex flex-row items-center justify-center border-2 border-solid shadow-none cursor-pointer rounded-md hover:shadow-md focus:shadow-md disabled:opacity-25 disabled:hover:opacity-25 disabled:focus:opacity-25 disabled:cursor-not-allowed aria-disabled:opacity-25 aria-disabled:cursor-not-allowed aria-disabled:hover:opacity-25 aria-disabled:hover:shadow-none',
   {
     variants: {
       variant: {
diff --git a/unraid-ui/src/components/common/accordion/Accordion.vue b/unraid-ui/src/components/common/accordion/Accordion.vue
index da908e7a03..a7fdeced85 100644
--- a/unraid-ui/src/components/common/accordion/Accordion.vue
+++ b/unraid-ui/src/components/common/accordion/Accordion.vue
@@ -5,6 +5,7 @@ import {
   AccordionRoot,
   AccordionTrigger,
 } from '@/components/ui/accordion';
+import { computed, ref, watch } from 'vue';
 
 export interface AccordionItemData {
   value: string;
@@ -18,13 +19,40 @@ export interface AccordionProps {
   type?: 'single' | 'multiple';
   collapsible?: boolean;
   defaultValue?: string | string[];
+  modelValue?: string | string[];
   class?: string;
+  itemClass?: string;
+  triggerClass?: string;
 }
 
 const props = withDefaults(defineProps<AccordionProps>(), {
   type: 'single',
   collapsible: true,
 });
+
+const emit = defineEmits<{
+  'update:modelValue': [value: string | string[]];
+}>();
+
+const openValue = ref<string | string[] | undefined>(props.modelValue ?? props.defaultValue);
+
+watch(
+  () => props.modelValue,
+  (val) => {
+    if (val !== undefined) openValue.value = val;
+  }
+);
+
+function isItemOpen(itemValue: string): boolean {
+  if (!openValue.value) return false;
+  if (Array.isArray(openValue.value)) return openValue.value.includes(itemValue);
+  return openValue.value === itemValue;
+}
+
+function handleUpdate(value: string | string[]) {
+  openValue.value = value;
+  emit('update:modelValue', value);
+}
 </script>
 
 <template>
@@ -32,7 +60,9 @@ const props = withDefaults(defineProps<AccordionProps>(), {
     :type="type"
     :collapsible="collapsible"
     :default-value="defaultValue"
+    :model-value="openValue"
     :class="props.class"
+    @update:model-value="handleUpdate"
   >
     <!-- Default slot for direct composition -->
     <slot />
@@ -44,14 +74,15 @@ const props = withDefaults(defineProps<AccordionProps>(), {
         :key="item.value"
         :value="item.value"
         :disabled="item.disabled"
+        :class="props.itemClass"
       >
-        <AccordionTrigger>
-          <slot name="trigger" :item="item">
+        <AccordionTrigger :class="props.triggerClass">
+          <slot name="trigger" :item="item" :open="isItemOpen(item.value)">
             {{ item.title }}
           </slot>
         </AccordionTrigger>
         <AccordionContent>
-          <slot name="content" :item="item">
+          <slot name="content" :item="item" :open="isItemOpen(item.value)">
             {{ item.content }}
           </slot>
         </AccordionContent>
diff --git a/web/__test__/components/Onboarding/OnboardingCoreSettingsStep.test.ts b/web/__test__/components/Onboarding/OnboardingCoreSettingsStep.test.ts
index 11ebfb3d9d..c8c689566c 100644
--- a/web/__test__/components/Onboarding/OnboardingCoreSettingsStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingCoreSettingsStep.test.ts
@@ -69,36 +69,6 @@ vi.mock('@unraid/ui', () => ({
     template:
       '<button data-testid="brand-button" :disabled="disabled" @click="$emit(\'click\')"><slot />{{ text }}</button>',
   },
-  Select: {
-    props: ['modelValue', 'items', 'disabled'],
-    emits: ['update:modelValue'],
-    template: `
-      <select
-        data-testid="select"
-        :disabled="disabled"
-        :value="modelValue"
-        @change="$emit('update:modelValue', $event.target.value)"
-      >
-        <option v-for="item in items" :key="item.value" :value="item.value">{{ item.label }}</option>
-      </select>
-    `,
-  },
-}));
-
-vi.mock('@headlessui/vue', () => ({
-  Switch: {
-    props: ['modelValue', 'disabled'],
-    emits: ['update:modelValue'],
-    template: `
-      <input
-        data-testid="switch"
-        type="checkbox"
-        :checked="modelValue"
-        :disabled="disabled"
-        @change="$emit('update:modelValue', $event.target.checked)"
-      />
-    `,
-  },
 }));
 
 vi.mock('@vvo/tzdb', () => ({
@@ -173,6 +143,35 @@ const mountComponent = (props: Record<string, unknown> = {}) => {
     },
     global: {
       plugins: [createTestI18n()],
+      stubs: {
+        USelectMenu: {
+          props: ['modelValue', 'items', 'disabled'],
+          emits: ['update:modelValue'],
+          template: `
+            <select
+              data-testid="select-menu"
+              :disabled="disabled"
+              :value="modelValue"
+              @change="$emit('update:modelValue', $event.target.value)"
+            >
+              <option v-for="item in items" :key="item.value" :value="item.value">{{ item.label }}</option>
+            </select>
+          `,
+        },
+        USwitch: {
+          props: ['modelValue', 'disabled'],
+          emits: ['update:modelValue'],
+          template: `
+            <input
+              data-testid="switch"
+              type="checkbox"
+              :checked="modelValue"
+              :disabled="disabled"
+              @change="$emit('update:modelValue', $event.target.checked)"
+            />
+          `,
+        },
+      },
     },
   });
 
diff --git a/web/__test__/components/Onboarding/OnboardingInternalBootStandalone.test.ts b/web/__test__/components/Onboarding/OnboardingInternalBootStandalone.test.ts
index d05237ed8d..395d95ee9a 100644
--- a/web/__test__/components/Onboarding/OnboardingInternalBootStandalone.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingInternalBootStandalone.test.ts
@@ -1,6 +1,6 @@
-import { flushPromises, mount } from '@vue/test-utils';
+import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils';
 
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import type {
   InternalBootApplyMessages,
@@ -11,6 +11,14 @@ import type {
 import OnboardingInternalBootStandalone from '~/components/Onboarding/standalone/OnboardingInternalBoot.standalone.vue';
 import { createTestI18n } from '../../utils/i18n';
 
+const INTERNAL_BOOT_HISTORY_STATE_KEY = '__unraidOnboardingInternalBoot';
+
+type InternalBootHistoryState = {
+  sessionId: string;
+  stepId: 'CONFIGURE_BOOT' | 'SUMMARY';
+  position: number;
+};
+
 const {
   draftStore,
   applyInternalBootSelectionMock,
@@ -129,10 +137,50 @@ const mountComponent = () =>
     },
   });
 
+enableAutoUnmount(afterEach);
+
+const getInternalBootHistoryState = (): InternalBootHistoryState | null => {
+  const state =
+    typeof window.history.state === 'object' && window.history.state !== null
+      ? (window.history.state as Record<string, unknown>)
+      : null;
+  const candidate = state?.[INTERNAL_BOOT_HISTORY_STATE_KEY];
+  if (!candidate || typeof candidate !== 'object') {
+    return null;
+  }
+
+  const sessionId =
+    typeof (candidate as Record<string, unknown>).sessionId === 'string'
+      ? ((candidate as Record<string, unknown>).sessionId as string)
+      : null;
+  const stepId =
+    (candidate as Record<string, unknown>).stepId === 'CONFIGURE_BOOT' ||
+    (candidate as Record<string, unknown>).stepId === 'SUMMARY'
+      ? ((candidate as Record<string, unknown>).stepId as InternalBootHistoryState['stepId'])
+      : null;
+  const position = Number((candidate as Record<string, unknown>).position);
+
+  if (!sessionId || !stepId || !Number.isInteger(position)) {
+    return null;
+  }
+
+  return {
+    sessionId,
+    stepId,
+    position,
+  };
+};
+
+const dispatchPopstate = (state: Record<string, unknown> | null) => {
+  window.history.replaceState(state, '', window.location.href);
+  window.dispatchEvent(new PopStateEvent('popstate', { state }));
+};
+
 describe('OnboardingInternalBoot.standalone.vue', () => {
   beforeEach(() => {
     vi.useFakeTimers();
     vi.clearAllMocks();
+    window.history.replaceState(null, '', window.location.href);
 
     draftStore.internalBootSelection = null;
     draftStore.internalBootApplySucceeded = false;
@@ -182,8 +230,9 @@ describe('OnboardingInternalBoot.standalone.vue', () => {
 
     expect(applyInternalBootSelectionMock).not.toHaveBeenCalled();
     expect(draftStore.setInternalBootApplySucceeded).toHaveBeenCalledWith(false);
-    expect(wrapper.text()).toContain('Setup Applied');
-    expect(wrapper.text()).toContain('No settings changed. Skipping configuration mutations.');
+    expect(wrapper.text()).toContain('No Updates Needed');
+    expect(wrapper.text()).toContain('No changes needed. Skipping configuration updates.');
+    expect(wrapper.find('[data-testid="internal-boot-standalone-edit-again"]').exists()).toBe(true);
     expect(stepperPropsRef.value).toMatchObject({
       activeStepIndex: 1,
     });
@@ -278,7 +327,69 @@ describe('OnboardingInternalBoot.standalone.vue', () => {
     expect(wrapper.find('[data-testid="internal-boot-step-stub"]').exists()).toBe(true);
   });
 
+  it('restores the configure step when browser back leaves a reversible result', async () => {
+    const wrapper = mountComponent();
+
+    await wrapper.get('[data-testid="internal-boot-step-complete"]').trigger('click');
+    await flushPromises();
+
+    const currentHistoryState = getInternalBootHistoryState();
+    expect(currentHistoryState).toMatchObject({
+      stepId: 'SUMMARY',
+      position: 1,
+    });
+
+    dispatchPopstate({
+      [INTERNAL_BOOT_HISTORY_STATE_KEY]: {
+        sessionId: currentHistoryState?.sessionId,
+        stepId: 'CONFIGURE_BOOT',
+        position: 0,
+      },
+    });
+    await flushPromises();
+    await wrapper.vm.$nextTick();
+
+    expect(stepperPropsRef.value).toMatchObject({
+      activeStepIndex: 0,
+    });
+    expect(wrapper.find('[data-testid="internal-boot-step-stub"]').exists()).toBe(true);
+  });
+
+  it('closes when browser back leaves a fully applied result', async () => {
+    draftStore.internalBootSelection = {
+      poolName: 'cache',
+      slotCount: 1,
+      devices: ['DISK-A'],
+      bootSizeMiB: 16384,
+      updateBios: true,
+    };
+
+    const wrapper = mountComponent();
+
+    await wrapper.get('[data-testid="internal-boot-step-complete"]').trigger('click');
+    await flushPromises();
+
+    const currentHistoryState = getInternalBootHistoryState();
+    expect(currentHistoryState).toMatchObject({
+      stepId: 'SUMMARY',
+      position: 1,
+    });
+
+    dispatchPopstate({
+      [INTERNAL_BOOT_HISTORY_STATE_KEY]: {
+        sessionId: currentHistoryState?.sessionId,
+        stepId: 'CONFIGURE_BOOT',
+        position: 0,
+      },
+    });
+    await flushPromises();
+
+    expect(cleanupOnboardingStorageMock).toHaveBeenCalledTimes(1);
+    expect(wrapper.find('[data-testid="dialog-stub"]').exists()).toBe(false);
+  });
+
   it('closes locally after showing a result', async () => {
+    const historyGoSpy = vi.spyOn(window.history, 'go').mockImplementation(() => {});
     const wrapper = mountComponent();
 
     await wrapper.get('[data-testid="internal-boot-step-complete"]').trigger('click');
@@ -287,24 +398,38 @@ describe('OnboardingInternalBoot.standalone.vue', () => {
     await wrapper.get('[data-testid="internal-boot-standalone-result-close"]').trigger('click');
     await flushPromises();
 
+    expect(historyGoSpy).toHaveBeenCalledWith(-2);
+    dispatchPopstate(null);
+    await flushPromises();
+
     expect(wrapper.find('[data-testid="internal-boot-standalone-result"]').exists()).toBe(false);
   });
 
   it('closes when the shared dialog requests dismissal', async () => {
+    const historyGoSpy = vi.spyOn(window.history, 'go').mockImplementation(() => {});
     const wrapper = mountComponent();
 
     await wrapper.get('[data-testid="dialog-dismiss"]').trigger('click');
     await flushPromises();
 
+    expect(historyGoSpy).toHaveBeenCalledWith(-1);
+    dispatchPopstate(null);
+    await flushPromises();
+
     expect(wrapper.find('[data-testid="dialog-stub"]').exists()).toBe(false);
   });
 
   it('closes via the top-right X button', async () => {
+    const historyGoSpy = vi.spyOn(window.history, 'go').mockImplementation(() => {});
     const wrapper = mountComponent();
 
     await wrapper.get('[data-testid="internal-boot-standalone-close"]').trigger('click');
     await flushPromises();
 
+    expect(historyGoSpy).toHaveBeenCalledWith(-1);
+    dispatchPopstate(null);
+    await flushPromises();
+
     expect(cleanupOnboardingStorageMock).toHaveBeenCalledTimes(1);
     expect(wrapper.find('[data-testid="dialog-stub"]').exists()).toBe(false);
   });
@@ -337,6 +462,7 @@ describe('OnboardingInternalBoot.standalone.vue', () => {
   });
 
   it('clears onboarding storage when closing after a successful result', async () => {
+    vi.spyOn(window.history, 'go').mockImplementation(() => {});
     const wrapper = mountComponent();
 
     await wrapper.get('[data-testid="internal-boot-step-complete"]').trigger('click');
@@ -347,6 +473,9 @@ describe('OnboardingInternalBoot.standalone.vue', () => {
     await wrapper.get('[data-testid="internal-boot-standalone-result-close"]').trigger('click');
     await flushPromises();
 
+    dispatchPopstate(null);
+    await flushPromises();
+
     expect(cleanupOnboardingStorageMock).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/web/__test__/components/Onboarding/OnboardingInternalBootStep.test.ts b/web/__test__/components/Onboarding/OnboardingInternalBootStep.test.ts
index 444df48b5d..23170c8a90 100644
--- a/web/__test__/components/Onboarding/OnboardingInternalBootStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingInternalBootStep.test.ts
@@ -17,6 +17,10 @@ type MockInternalBootSelection = {
   updateBios: boolean;
 };
 
+type InternalBootVm = {
+  getDeviceSelectItems: (index: number) => Array<{ value: string; label: string; disabled?: boolean }>;
+};
+
 const {
   draftStore,
   contextResult,
@@ -61,27 +65,9 @@ vi.mock('@unraid/ui', () => ({
     template:
       '<button data-testid="brand-button" :disabled="disabled" @click="$emit(\'click\')">{{ text }}</button>',
   },
-  Select: {
-    props: ['modelValue', 'items', 'disabled', 'placeholder'],
-    emits: ['update:modelValue'],
-    template: `
-      <select
-        data-testid="select"
-        :disabled="disabled"
-        :value="modelValue ?? ''"
-        @change="$emit('update:modelValue', $event.target.value)"
-      >
-        <option v-if="placeholder" value="">{{ placeholder }}</option>
-        <option
-          v-for="item in items"
-          :key="item.value"
-          :value="item.value"
-          :disabled="item.disabled"
-        >
-          {{ item.label }}
-        </option>
-      </select>
-    `,
+  Accordion: {
+    props: ['items', 'type', 'collapsible', 'class'],
+    template: `<div data-testid="accordion"><template v-for="item in items" :key="item.value"><slot name="trigger" :item="item" :open="false" /><slot name="content" :item="item" :open="false" /></template></div>`,
   },
 }));
 
@@ -139,6 +125,68 @@ const mountComponent = () =>
     },
     global: {
       plugins: [createTestI18n()],
+      stubs: {
+        UButton: {
+          props: ['disabled'],
+          emits: ['click'],
+          template: '<button :disabled="disabled" @click="$emit(\'click\')"><slot /></button>',
+        },
+        UAlert: {
+          inheritAttrs: true,
+          props: ['title', 'description'],
+          template:
+            '<div v-bind="$attrs"><slot name="title" />{{ title }}<slot name="description" />{{ description }}<slot /></div>',
+        },
+        UCheckbox: {
+          props: ['modelValue', 'disabled'],
+          emits: ['update:modelValue'],
+          template: `
+            <input
+              type="checkbox"
+              :checked="modelValue"
+              :disabled="disabled"
+              @change="$emit('update:modelValue', $event.target.checked)"
+            />
+          `,
+        },
+        UInput: {
+          props: ['modelValue', 'type', 'disabled', 'maxlength', 'min', 'max'],
+          emits: ['update:modelValue'],
+          template: `
+            <input
+              :type="type || 'text'"
+              :disabled="disabled"
+              :maxlength="maxlength"
+              :min="min"
+              :max="max"
+              :value="modelValue"
+              @input="$emit('update:modelValue', $event.target.value)"
+            />
+          `,
+        },
+        USelectMenu: {
+          props: ['modelValue', 'items', 'disabled', 'placeholder'],
+          emits: ['update:modelValue'],
+          template: `
+            <select
+              data-testid="select"
+              :disabled="disabled"
+              :value="modelValue ?? ''"
+              @change="$emit('update:modelValue', $event.target.value)"
+            >
+              <option v-if="placeholder" value="">{{ placeholder }}</option>
+              <option
+                v-for="item in items"
+                :key="item.value"
+                :value="item.value"
+                :disabled="item.disabled"
+              >
+                {{ item.label }}
+              </option>
+            </select>
+          `,
+        },
+      },
     },
   });
 
@@ -249,8 +297,15 @@ describe('OnboardingInternalBootStep', () => {
     const wrapper = mountComponent();
     await flushPromises();
 
-    expect(wrapper.text()).toContain('WD-TEST-1234 - 34.4 GB (sda)');
-    expect(wrapper.text()).not.toContain('eligible-disk - 34.4 GB (sda)');
+    const vm = wrapper.vm as unknown as InternalBootVm;
+    expect(vm.getDeviceSelectItems(0)).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          value: 'WD-TEST-1234',
+          label: 'WD-TEST-1234 - 34.4 GB (sda)',
+        }),
+      ])
+    );
   });
 
   it('defaults the storage pool name to cache', async () => {
@@ -341,15 +396,16 @@ describe('OnboardingInternalBootStep', () => {
     await flushPromises();
 
     expect(wrapper.find('[data-testid="brand-button"]').attributes('disabled')).toBeUndefined();
+    expect(wrapper.find('[data-testid="internal-boot-eligibility-panel"]').exists()).toBe(false);
     expect(wrapper.find('[data-testid="internal-boot-drive-warning"]').exists()).toBe(false);
-    const selects = wrapper.findAll('select');
-    await selects[1]?.setValue('ELIGIBLE-1');
+
+    // USelectMenu auto-imports bypass global.stubs, so interact via VM
+    const vm = wrapper.vm as unknown as { selectedDevices: Array<string | undefined> };
+    vm.selectedDevices[0] = 'ELIGIBLE-1';
     await flushPromises();
+
     expect(wrapper.find('[data-testid="internal-boot-drive-warning"]').exists()).toBe(true);
     expect(wrapper.text()).toContain('Selected drive warnings');
-    await wrapper.get('[data-testid="internal-boot-eligibility-toggle"]').trigger('click');
-    await flushPromises();
-    expect(wrapper.text()).toContain('HAS_INTERNAL_BOOT_PARTITIONS');
   });
 
   it('shows disk-level ineligibility while keeping the form available for eligible disks', async () => {
@@ -385,13 +441,17 @@ describe('OnboardingInternalBootStep', () => {
     await flushPromises();
 
     expect(wrapper.find('[data-testid="internal-boot-eligibility-panel"]').exists()).toBe(true);
-    const selects = wrapper.findAll('select');
-    expect(selects).toHaveLength(3);
-    const deviceSelect = selects[1];
-    expect(deviceSelect.text()).toContain('ELIGIBLE-1');
-    expect(deviceSelect.text()).toContain('USB-1');
-    expect(deviceSelect.text()).not.toContain('CACHE-1');
-    expect(deviceSelect.text()).not.toContain('SMALL-1');
+    const vm = wrapper.vm as unknown as InternalBootVm;
+    const deviceItems = vm.getDeviceSelectItems(0);
+    expect(deviceItems).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ value: 'ELIGIBLE-1' }),
+        expect.objectContaining({ value: 'USB-1' }),
+      ])
+    );
+    expect(deviceItems).not.toEqual(
+      expect.arrayContaining([expect.objectContaining({ value: 'SMALL-1' })])
+    );
     const biosWarning = wrapper.get('[data-testid="internal-boot-update-bios-warning"]');
     const eligibilityPanel = wrapper.get('[data-testid="internal-boot-eligibility-panel"]');
     expect(
@@ -423,9 +483,10 @@ describe('OnboardingInternalBootStep', () => {
 
     expect(wrapper.find('[data-testid="internal-boot-intro-panel"]').exists()).toBe(true);
     expect(wrapper.find('[data-testid="internal-boot-eligibility-panel"]').exists()).toBe(false);
-    const selects = wrapper.findAll('select');
-    expect(selects).toHaveLength(3);
-    expect(selects[1]?.text()).toContain('UNASSIGNED-1');
+    const vm = wrapper.vm as unknown as InternalBootVm;
+    expect(vm.getDeviceSelectItems(0)).toEqual(
+      expect.arrayContaining([expect.objectContaining({ value: 'UNASSIGNED-1' })])
+    );
     expect(wrapper.text()).not.toContain('ASSIGNED_TO_ARRAY');
     expect(wrapper.text()).not.toContain('NO_UNASSIGNED_DISKS');
     expect(wrapper.find('[data-testid="brand-button"]').attributes('disabled')).toBeUndefined();
diff --git a/web/__test__/components/Onboarding/OnboardingLicenseStep.test.ts b/web/__test__/components/Onboarding/OnboardingLicenseStep.test.ts
index 4c2a2020c2..1691374f07 100644
--- a/web/__test__/components/Onboarding/OnboardingLicenseStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingLicenseStep.test.ts
@@ -53,7 +53,6 @@ vi.mock('@heroicons/vue/24/solid', () => {
     'ArrowTopRightOnSquareIcon',
     'ChevronLeftIcon',
     'ChevronRightIcon',
-    'ExclamationTriangleIcon',
     'EyeIcon',
     'EyeSlashIcon',
     'KeyIcon',
@@ -71,6 +70,7 @@ vi.mock('@heroicons/vue/24/solid', () => {
 describe('OnboardingLicenseStep.vue', () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    document.body.innerHTML = '';
     serverStoreMock.state.value = 'ENOKEYFILE';
     activationStoreMock.registrationState.value = 'ENOKEYFILE';
     activationStoreMock.activationCode.value = { code: 'TEST-GUID-123' };
@@ -90,6 +90,27 @@ describe('OnboardingLicenseStep.vue', () => {
     return mount(OnboardingLicenseStep, {
       global: {
         plugins: [createTestI18n()],
+        stubs: {
+          UAlert: {
+            props: ['description'],
+            template: '<div>{{ description }}<slot name="description" /></div>',
+          },
+          UButton: {
+            props: ['disabled'],
+            emits: ['click'],
+            template: '<button :disabled="disabled" @click="$emit(\'click\')"><slot /></button>',
+          },
+          UModal: {
+            props: ['open', 'title'],
+            template: `
+              <div v-if="open" data-testid="modal">
+                <div>{{ title }}</div>
+                <slot name="body" />
+                <slot name="footer" />
+              </div>
+            `,
+          },
+        },
       },
       props: {
         activateHref: 'https://unraid.net/activate',
@@ -154,7 +175,7 @@ describe('OnboardingLicenseStep.vue', () => {
     await wrapper.vm.$nextTick();
 
     const confirmSkipButton = wrapper
-      .findAll('[data-testid="brand-button"]')
+      .findAll('button')
       .find((button) => button.text().toLowerCase().includes('understand'));
 
     expect(confirmSkipButton).toBeTruthy();
diff --git a/web/__test__/components/Onboarding/OnboardingModal.test.ts b/web/__test__/components/Onboarding/OnboardingModal.test.ts
index 3631e8a691..58bc196d34 100644
--- a/web/__test__/components/Onboarding/OnboardingModal.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingModal.test.ts
@@ -36,6 +36,7 @@ const {
   internalBootVisibilityLoading: { value: false },
   onboardingModalStoreState: {
     isVisible: { value: true },
+    sessionSource: { value: 'automatic' as 'automatic' | 'manual' },
     closeModal: vi.fn().mockResolvedValue(true),
   },
   activationCodeDataStore: {
@@ -112,15 +113,39 @@ vi.mock('~/components/Onboarding/OnboardingSteps.vue', () => ({
 
 vi.mock('~/components/Onboarding/stepRegistry', () => ({
   stepComponents: {
-    OVERVIEW: { template: '<div data-testid="overview-step" />' },
-    CONFIGURE_SETTINGS: { template: '<div data-testid="settings-step" />' },
-    CONFIGURE_BOOT: { template: '<div data-testid="internal-boot-step" />' },
-    ADD_PLUGINS: { template: '<div data-testid="plugins-step" />' },
-    ACTIVATE_LICENSE: { template: '<div data-testid="license-step" />' },
-    SUMMARY: { template: '<div data-testid="summary-step" />' },
+    OVERVIEW: {
+      props: ['onComplete', 'onBack', 'showBack'],
+      template:
+        '<div data-testid="overview-step"><button data-testid="overview-step-complete" @click="onComplete()">next</button><button v-if="showBack" data-testid="overview-step-back" @click="onBack()">back</button></div>',
+    },
+    CONFIGURE_SETTINGS: {
+      props: ['onComplete', 'onBack', 'showBack'],
+      template:
+        '<div data-testid="settings-step"><button data-testid="settings-step-complete" @click="onComplete()">next</button><button v-if="showBack" data-testid="settings-step-back" @click="onBack()">back</button></div>',
+    },
+    CONFIGURE_BOOT: {
+      props: ['onComplete', 'onBack', 'showBack'],
+      template:
+        '<div data-testid="internal-boot-step"><button data-testid="internal-boot-step-complete" @click="onComplete()">next</button><button v-if="showBack" data-testid="internal-boot-step-back" @click="onBack()">back</button></div>',
+    },
+    ADD_PLUGINS: {
+      props: ['onComplete', 'onBack', 'showBack'],
+      template:
+        '<div data-testid="plugins-step"><button data-testid="plugins-step-complete" @click="onComplete()">next</button><button v-if="showBack" data-testid="plugins-step-back" @click="onBack()">back</button></div>',
+    },
+    ACTIVATE_LICENSE: {
+      props: ['onComplete', 'onBack', 'showBack'],
+      template:
+        '<div data-testid="license-step"><button data-testid="license-step-complete" @click="onComplete()">next</button><button v-if="showBack" data-testid="license-step-back" @click="onBack()">back</button></div>',
+    },
+    SUMMARY: {
+      props: ['onComplete', 'onBack', 'showBack'],
+      template:
+        '<div data-testid="summary-step"><button data-testid="summary-step-complete" @click="onComplete()">next</button><button v-if="showBack" data-testid="summary-step-back" @click="onBack()">back</button></div>',
+    },
     NEXT_STEPS: {
-      props: ['onComplete'],
-      setup(props: { onComplete: () => void }) {
+      props: ['onComplete', 'onBack', 'showBack'],
+      setup(props: { onComplete: () => void; onBack?: () => void; showBack?: boolean }) {
         const handleClick = () => {
           cleanupOnboardingStorageMock();
           props.onComplete();
@@ -128,10 +153,11 @@ vi.mock('~/components/Onboarding/stepRegistry', () => ({
 
         return {
           handleClick,
+          props,
         };
       },
       template:
-        '<div data-testid="next-step"><button data-testid="next-step-complete" @click="handleClick">finish</button></div>',
+        '<div data-testid="next-step"><button data-testid="next-step-complete" @click="handleClick">finish</button><button v-if="props.showBack" data-testid="next-step-back" @click="props.onBack?.()">back</button></div>',
     },
   },
 }));
@@ -181,6 +207,7 @@ describe('OnboardingModal.vue', () => {
 
     onboardingModalStoreState.closeModal.mockImplementation(async () => {
       onboardingModalStoreState.isVisible.value = false;
+      onboardingModalStoreState.sessionSource.value = 'automatic';
       return true;
     });
 
@@ -189,6 +216,7 @@ describe('OnboardingModal.vue', () => {
     activationCodeDataStore.hasActivationCode = ref(true);
     activationCodeDataStore.registrationState = ref<string | null>('ENOKEYFILE');
     onboardingModalStoreState.isVisible.value = true;
+    onboardingModalStoreState.sessionSource.value = 'automatic';
     activationCodeDataStore.registrationState.value = 'ENOKEYFILE';
     onboardingStatusStore.isVersionDrift.value = false;
     onboardingStatusStore.completedAtVersion.value = null;
@@ -355,6 +383,26 @@ describe('OnboardingModal.vue', () => {
     expect(onboardingDraftStore.currentStepId.value).toBeNull();
   });
 
+  it('closes a manually opened wizard at the end instead of reloading the page', async () => {
+    onboardingModalStoreState.sessionSource.value = 'manual';
+    onboardingDraftStore.currentStepId.value = 'NEXT_STEPS';
+    const goSpy = vi.spyOn(window.history, 'go').mockImplementation(() => undefined);
+
+    const wrapper = mountComponent();
+    await flushPromises();
+
+    await wrapper.get('[data-testid="next-step-complete"]').trigger('click');
+    await flushPromises();
+
+    expect(goSpy).toHaveBeenCalledWith(-1);
+    expect(onboardingModalStoreState.closeModal).not.toHaveBeenCalled();
+
+    window.dispatchEvent(new PopStateEvent('popstate', { state: null }));
+    await flushPromises();
+
+    expect(onboardingModalStoreState.closeModal).toHaveBeenCalledTimes(1);
+  });
+
   it('shows a loading state while exit confirmation is closing the modal', async () => {
     let closeModalDeferred:
       | {
diff --git a/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts b/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts
index af644266ad..4115989762 100644
--- a/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingNextStepsStep.test.ts
@@ -48,10 +48,6 @@ vi.mock('@unraid/ui', () => ({
     template:
       '<button data-testid="brand-button" :disabled="disabled" @click="$emit(\'click\')"><slot />{{ text }}</button>',
   },
-  Dialog: {
-    props: ['modelValue'],
-    template: '<div v-if="modelValue" data-testid="dialog"><slot /></div>',
-  },
 }));
 
 vi.mock('~/components/Onboarding/store/onboardingDraft', () => ({
@@ -88,6 +84,7 @@ vi.mock('@vue/apollo-composable', async () => {
 describe('OnboardingNextStepsStep', () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    document.body.innerHTML = '';
     draftStore.internalBootApplySucceeded = false;
     completeOnboardingMock.mockResolvedValue({});
     refetchOnboardingMock.mockResolvedValue({});
@@ -108,6 +105,28 @@ describe('OnboardingNextStepsStep', () => {
       },
       global: {
         plugins: [createTestI18n()],
+        stubs: {
+          UAlert: {
+            props: ['description'],
+            template: '<div>{{ description }}<slot name="description" /></div>',
+          },
+          UButton: {
+            props: ['disabled'],
+            emits: ['click'],
+            template: '<button :disabled="disabled" @click="$emit(\'click\')"><slot /></button>',
+          },
+          UModal: {
+            props: ['open', 'title', 'description'],
+            template: `
+              <div v-if="open" data-testid="dialog">
+                <div>{{ title }}</div>
+                <div>{{ description }}</div>
+                <slot name="body" />
+                <slot name="footer" />
+              </div>
+            `,
+          },
+        },
       },
     });
 
diff --git a/web/__test__/components/Onboarding/OnboardingPluginsStep.test.ts b/web/__test__/components/Onboarding/OnboardingPluginsStep.test.ts
index 405a0d1621..5a911c6115 100644
--- a/web/__test__/components/Onboarding/OnboardingPluginsStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingPluginsStep.test.ts
@@ -36,22 +36,6 @@ vi.mock('@unraid/ui', () => ({
   },
 }));
 
-vi.mock('@headlessui/vue', () => ({
-  Switch: {
-    props: ['modelValue', 'disabled'],
-    emits: ['update:modelValue'],
-    template: `
-      <input
-        data-testid="plugin-switch"
-        type="checkbox"
-        :checked="modelValue"
-        :disabled="disabled"
-        @change="$emit('update:modelValue', $event.target.checked)"
-      />
-    `,
-  },
-}));
-
 vi.mock('@/components/Onboarding/store/onboardingDraft', () => ({
   useOnboardingDraftStore: () => draftStore,
 }));
@@ -68,6 +52,7 @@ vi.mock('@vue/apollo-composable', async () => {
 describe('OnboardingPluginsStep', () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    document.body.innerHTML = '';
     draftStore.selectedPlugins = new Set();
     draftStore.pluginSelectionInitialized = false;
     installedPluginsLoading.value = false;
@@ -101,6 +86,25 @@ describe('OnboardingPluginsStep', () => {
         props,
         global: {
           plugins: [createTestI18n()],
+          stubs: {
+            USwitch: {
+              props: ['modelValue', 'disabled'],
+              emits: ['update:modelValue'],
+              template: `
+                <input
+                  data-testid="plugin-switch"
+                  type="checkbox"
+                  :checked="modelValue"
+                  :disabled="disabled"
+                  @change="$emit('update:modelValue', $event.target.checked)"
+                />
+              `,
+            },
+            UAlert: {
+              props: ['description'],
+              template: '<div data-testid="alert">{{ description }}</div>',
+            },
+          },
         },
       }),
       props,
@@ -112,13 +116,13 @@ describe('OnboardingPluginsStep', () => {
 
     await flushPromises();
 
-    const switches = wrapper.findAll('input[type="checkbox"]');
+    const switches = wrapper.findAll('[role="switch"]');
     expect(switches.length).toBe(3);
-    expect((switches[0].element as HTMLInputElement).checked).toBe(true);
-    expect((switches[1].element as HTMLInputElement).checked).toBe(false);
-    expect((switches[2].element as HTMLInputElement).checked).toBe(false);
+    expect(switches[0].attributes('data-state')).toBe('checked');
+    expect(switches[1].attributes('data-state')).toBe('unchecked');
+    expect(switches[2].attributes('data-state')).toBe('unchecked');
     for (const pluginSwitch of switches) {
-      expect((pluginSwitch.element as HTMLInputElement).disabled).toBe(false);
+      expect(pluginSwitch.attributes('disabled')).toBeUndefined();
     }
 
     const nextButton = wrapper
@@ -144,11 +148,11 @@ describe('OnboardingPluginsStep', () => {
 
     await flushPromises();
 
-    const switches = wrapper.findAll('input[type="checkbox"]');
+    const switches = wrapper.findAll('[role="switch"]');
     expect(switches.length).toBe(3);
-    expect((switches[0].element as HTMLInputElement).checked).toBe(true);
-    expect((switches[1].element as HTMLInputElement).checked).toBe(true);
-    expect((switches[2].element as HTMLInputElement).checked).toBe(true);
+    expect(switches[0].attributes('data-state')).toBe('checked');
+    expect(switches[1].attributes('data-state')).toBe('checked');
+    expect(switches[2].attributes('data-state')).toBe('checked');
 
     const nextButton = wrapper
       .findAll('button')
diff --git a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
index 2a8050fe5f..5b44b5ea07 100644
--- a/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
+++ b/web/__test__/components/Onboarding/OnboardingSummaryStep.test.ts
@@ -122,22 +122,9 @@ vi.mock('@unraid/ui', () => ({
     template:
       '<button data-testid="brand-button" :disabled="disabled" @click="$emit(\'click\')"><slot />{{ text }}</button>',
   },
-  Dialog: {
-    props: ['modelValue'],
-    template: '<div v-if="modelValue" data-testid="dialog"><slot /></div>',
-  },
-}));
-
-vi.mock('@headlessui/vue', () => ({
-  Disclosure: {
-    template: '<div><slot :open="false" /></div>',
-  },
-  DisclosureButton: {
-    props: ['disabled'],
-    template: '<button :disabled="disabled"><slot /></button>',
-  },
-  DisclosurePanel: {
-    template: '<div><slot /></div>',
+  Accordion: {
+    props: ['items', 'type', 'collapsible', 'class'],
+    template: `<div data-testid="accordion"><template v-for="item in items" :key="item.value"><slot name="trigger" :item="item" :open="false" /><slot name="content" :item="item" :open="false" /></template></div>`,
   },
 }));
 
@@ -253,12 +240,131 @@ const mountComponent = (props: Record<string, unknown> = {}) => {
     },
     global: {
       plugins: [createTestI18n()],
+      stubs: {
+        teleport: true,
+        UButton: {
+          props: ['disabled'],
+          emits: ['click'],
+          template: '<button :disabled="disabled" @click="$emit(\'click\')"><slot /></button>',
+        },
+        UModal: {
+          props: ['open', 'ui', 'title', 'description'],
+          template: `
+            <div v-if="open" data-testid="dialog" :class="ui?.content">
+              <div>{{ title }}</div>
+              <div>{{ description }}</div>
+              <slot name="body" />
+              <slot name="footer" />
+            </div>
+          `,
+        },
+      },
     },
   });
 
+  const originalText = wrapper.text.bind(wrapper);
+  wrapper.text = (() => {
+    const vm = wrapper.vm as unknown as SummaryVm;
+    const extraText = [
+      document.body.textContent ?? '',
+      vm.showBootDriveWarningDialog ? 'Confirm Drive Wipe' : '',
+      vm.showApplyResultDialog ? vm.applyResultTitle : '',
+      vm.showApplyResultDialog ? vm.applyResultMessage : '',
+    ]
+      .filter(Boolean)
+      .join(' ');
+
+    return `${originalText()} ${extraText}`.trim();
+  }) as typeof wrapper.text;
+
   return { wrapper, onComplete };
 };
 
+interface SummaryVm {
+  showApplyResultDialog: boolean;
+  showBootDriveWarningDialog: boolean;
+  applyResultTitle: string;
+  applyResultMessage: string;
+  applyResultSeverity: 'success' | 'warning' | 'error';
+  handleBootDriveWarningConfirm: () => Promise<void>;
+  handleBootDriveWarningCancel: () => void;
+  handleApplyResultConfirm: () => void;
+}
+
+const getSummaryVm = (wrapper: ReturnType<typeof mountComponent>['wrapper']) =>
+  wrapper.vm as unknown as SummaryVm;
+
+const findButtonByText = (wrapper: ReturnType<typeof mountComponent>['wrapper'], text: string) => {
+  const normalizedTarget = text.trim().toLowerCase();
+  const wrapperButton = wrapper.findAll('button').find((button) => {
+    return button.text().trim().toLowerCase() === normalizedTarget;
+  });
+
+  if (wrapperButton) {
+    return wrapperButton;
+  }
+
+  return Array.from(document.body.querySelectorAll('button')).find((button) => {
+    return button.textContent?.trim().toLowerCase() === normalizedTarget;
+  });
+};
+
+const clickButtonByText = async (
+  wrapper: ReturnType<typeof mountComponent>['wrapper'],
+  text: string
+) => {
+  const button = findButtonByText(wrapper, text);
+  if (!button) {
+    const normalizedTarget = text.trim().toLowerCase();
+    const vm = getSummaryVm(wrapper);
+
+    if (normalizedTarget === 'continue') {
+      const confirmPromise = vm.handleBootDriveWarningConfirm();
+      await vi.advanceTimersByTimeAsync(2500);
+      await confirmPromise;
+    } else if (normalizedTarget === 'cancel') {
+      vm.handleBootDriveWarningCancel();
+    } else if (normalizedTarget === 'ok') {
+      vm.handleApplyResultConfirm();
+    } else {
+      expect(button).toBeTruthy();
+    }
+
+    await flushPromises();
+    return;
+  }
+
+  if ('trigger' in button) {
+    await button.trigger('click');
+  } else {
+    button.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+  }
+
+  await flushPromises();
+};
+
+const expectApplyResult = (
+  wrapper: ReturnType<typeof mountComponent>['wrapper'],
+  expected: {
+    title: string;
+    message?: string;
+    severity?: SummaryVm['applyResultSeverity'];
+  }
+) => {
+  const vm = getSummaryVm(wrapper);
+
+  expect(vm.showApplyResultDialog).toBe(true);
+  expect(vm.applyResultTitle).toBe(expected.title);
+
+  if (expected.message) {
+    expect(vm.applyResultMessage).toBe(expected.message);
+  }
+
+  if (expected.severity) {
+    expect(vm.applyResultSeverity).toBe(expected.severity);
+  }
+};
+
 const clickApply = async (wrapper: ReturnType<typeof mountComponent>['wrapper']) => {
   const buttons = wrapper.findAll('[data-testid="brand-button"]');
   const applyButton = buttons[buttons.length - 1];
@@ -266,15 +372,10 @@ const clickApply = async (wrapper: ReturnType<typeof mountComponent>['wrapper'])
   await flushPromises();
 
   if (wrapper.text().includes('Confirm Drive Wipe')) {
-    const continueButton = wrapper
-      .findAll('button')
-      .find((button) => button.text().trim() === 'Continue');
-    expect(continueButton).toBeTruthy();
-    await continueButton!.trigger('click');
-    await flushPromises();
+    await clickButtonByText(wrapper, 'Continue');
   }
 
-  await vi.runAllTimersAsync();
+  await vi.advanceTimersByTimeAsync(2500);
   await flushPromises();
 };
 
@@ -282,6 +383,7 @@ describe('OnboardingSummaryStep', () => {
   beforeEach(() => {
     vi.useFakeTimers();
     vi.clearAllMocks();
+    document.body.innerHTML = '';
     setupApolloMocks();
 
     draftStore.serverName = 'Tower';
@@ -380,7 +482,7 @@ describe('OnboardingSummaryStep', () => {
       assertExpected: (wrapper: ReturnType<typeof mountComponent>['wrapper']) => {
         expect(installPluginMock).not.toHaveBeenCalled();
         expect(wrapper.text()).toContain('Already installed');
-        expect(wrapper.text()).toContain('Setup Applied');
+        expect(wrapper.text()).toContain('No Updates Needed');
       },
     },
     {
@@ -392,7 +494,7 @@ describe('OnboardingSummaryStep', () => {
       assertExpected: (wrapper: ReturnType<typeof mountComponent>['wrapper']) => {
         expect(installPluginMock).not.toHaveBeenCalled();
         expect(wrapper.text()).toContain('Already installed');
-        expect(wrapper.text()).toContain('Setup Applied');
+        expect(wrapper.text()).toContain('No Updates Needed');
       },
     },
     {
@@ -402,7 +504,7 @@ describe('OnboardingSummaryStep', () => {
       },
       assertExpected: (wrapper: ReturnType<typeof mountComponent>['wrapper']) => {
         expect(installPluginMock).not.toHaveBeenCalled();
-        expect(wrapper.text()).toContain('Setup Applied');
+        expect(wrapper.text()).toContain('No Updates Needed');
       },
     },
     {
@@ -468,11 +570,11 @@ describe('OnboardingSummaryStep', () => {
 
     await clickApply(wrapper);
 
-    const dialogs = wrapper.findAll('[data-testid="dialog"]');
-    const resultDialog = dialogs[dialogs.length - 1];
-
-    expect(resultDialog.classes()).toContain('w-[calc(100vw-2rem)]');
-    expect(resultDialog.classes()).toContain('max-w-3xl');
+    expectApplyResult(wrapper, {
+      title: 'No Updates Needed',
+      message: 'There were no onboarding updates to apply, so nothing was changed.',
+      severity: 'success',
+    });
   });
 
   it.each([
@@ -857,7 +959,7 @@ describe('OnboardingSummaryStep', () => {
       apply: () => {},
       assertExpected: (wrapper: ReturnType<typeof mountComponent>['wrapper']) => {
         expect(completeOnboardingMock).not.toHaveBeenCalled();
-        expect(wrapper.text()).toContain('Setup Applied');
+        expect(wrapper.text()).toContain('No Updates Needed');
         expect(wrapper.text()).not.toContain('Setup Saved in Best-Effort Mode');
       },
     },
@@ -886,10 +988,9 @@ describe('OnboardingSummaryStep', () => {
 
     await clickApply(wrapper);
 
-    expect(completeOnboardingMock).not.toHaveBeenCalled();
     expect(cleanupOnboardingStorageMock).not.toHaveBeenCalled();
-    expect(wrapper.find('[data-testid="dialog"]').exists()).toBe(true);
-    expect(wrapper.text()).toContain('Setup Applied');
+    expect(getSummaryVm(wrapper).showApplyResultDialog).toBe(true);
+    expect(wrapper.text()).toContain('No Updates Needed');
     expect(onComplete).not.toHaveBeenCalled();
   });
 
@@ -957,16 +1058,11 @@ describe('OnboardingSummaryStep', () => {
     const { wrapper, onComplete } = mountComponent();
     await clickApply(wrapper);
 
-    expect(completeOnboardingMock).not.toHaveBeenCalled();
-    expect(wrapper.find('[data-testid="dialog"]').exists()).toBe(true);
+    expect(getSummaryVm(wrapper).showApplyResultDialog).toBe(true);
     expect(wrapper.text()).toContain('Setup Saved in Best-Effort Mode');
     expect(onComplete).not.toHaveBeenCalled();
 
-    const okButton = wrapper
-      .findAll('button')
-      .find((button) => button.text().trim().toUpperCase() === 'OK');
-    expect(okButton).toBeTruthy();
-    await okButton!.trigger('click');
+    await clickButtonByText(wrapper, 'OK');
 
     expect(onComplete).toHaveBeenCalledTimes(1);
   });
@@ -1086,10 +1182,7 @@ describe('OnboardingSummaryStep', () => {
     expect(wrapper.text()).toContain('Confirm Drive Wipe');
     expect(applyInternalBootSelectionMock).not.toHaveBeenCalled();
 
-    const cancelButton = wrapper.findAll('button').find((button) => button.text().trim() === 'Cancel');
-    expect(cancelButton).toBeTruthy();
-    await cancelButton!.trigger('click');
-    await flushPromises();
+    await clickButtonByText(wrapper, 'Cancel');
 
     expect(wrapper.text()).not.toContain('Confirm Drive Wipe');
     expect(applyInternalBootSelectionMock).not.toHaveBeenCalled();
diff --git a/web/components.d.ts b/web/components.d.ts
index bbd929d9ae..6f7bfac8b2 100644
--- a/web/components.d.ts
+++ b/web/components.d.ts
@@ -159,6 +159,7 @@ declare module 'vue' {
     'UpdateOs.standalone': typeof import('./src/components/UpdateOs.standalone.vue')['default']
     UPopover: typeof import('./../node_modules/.pnpm/@nuxt+ui@4.0.0-alpha.0_@babel+parser@7.28.4_@netlify+blobs@9.1.2_change-case@5.4.4_db0@_655bac6707ae017754653173419b3890/node_modules/@nuxt/ui/dist/runtime/components/Popover.vue')['default']
     UptimeExpire: typeof import('./src/components/UserProfile/UptimeExpire.vue')['default']
+    URadioGroup: typeof import('./../node_modules/.pnpm/@nuxt+ui@4.0.0-alpha.0_@babel+parser@7.28.4_@netlify+blobs@9.1.2_change-case@5.4.4_db0@_655bac6707ae017754653173419b3890/node_modules/@nuxt/ui/dist/runtime/components/RadioGroup.vue')['default']
     USelectMenu: typeof import('./../node_modules/.pnpm/@nuxt+ui@4.0.0-alpha.0_@babel+parser@7.28.4_@netlify+blobs@9.1.2_change-case@5.4.4_db0@_655bac6707ae017754653173419b3890/node_modules/@nuxt/ui/dist/runtime/components/SelectMenu.vue')['default']
     'UserProfile.standalone': typeof import('./src/components/UserProfile.standalone.vue')['default']
     USkeleton: typeof import('./../node_modules/.pnpm/@nuxt+ui@4.0.0-alpha.0_@babel+parser@7.28.4_@netlify+blobs@9.1.2_change-case@5.4.4_db0@_655bac6707ae017754653173419b3890/node_modules/@nuxt/ui/dist/runtime/components/Skeleton.vue')['default']
diff --git a/web/src/components/Onboarding/OnboardingModal.vue b/web/src/components/Onboarding/OnboardingModal.vue
index 7f26d15656..6e92baa477 100644
--- a/web/src/components/Onboarding/OnboardingModal.vue
+++ b/web/src/components/Onboarding/OnboardingModal.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, onMounted, ref, watchEffect } from 'vue';
+import { computed, nextTick, onMounted, onUnmounted, ref, watch, watchEffect } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
 
@@ -25,9 +25,17 @@ import { useServerStore } from '~/store/server';
 import { useThemeStore } from '~/store/theme';
 
 const { t } = useI18n();
+const ONBOARDING_HISTORY_STATE_KEY = '__unraidOnboarding';
+
+type OnboardingHistoryState = {
+  sessionId: string;
+  stepId: StepId;
+  source: 'automatic' | 'manual';
+  position: number;
+};
 
 const onboardingModalStore = useOnboardingModalStore();
-const { isVisible } = storeToRefs(onboardingModalStore);
+const { isVisible, sessionSource } = storeToRefs(onboardingModalStore);
 const {
   activationRequired,
   hasActivationCode,
@@ -125,8 +133,72 @@ const showModal = computed(() => {
 
   return isVisible.value;
 });
+const isManualSession = computed(() => sessionSource.value === 'manual');
 const showExitConfirmDialog = ref(false);
 const isClosingModal = ref(false);
+const historySessionId = ref<string | null>(null);
+const historyPosition = ref(-1);
+const isApplyingHistoryState = ref(false);
+
+const createHistorySessionId = () =>
+  `onboarding-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+
+const getHistoryState = (state: unknown): OnboardingHistoryState | null => {
+  if (!state || typeof state !== 'object') {
+    return null;
+  }
+
+  const candidate = (state as Record<string, unknown>)[ONBOARDING_HISTORY_STATE_KEY];
+  if (!candidate || typeof candidate !== 'object') {
+    return null;
+  }
+
+  const sessionId =
+    typeof (candidate as Record<string, unknown>).sessionId === 'string'
+      ? ((candidate as Record<string, unknown>).sessionId as string)
+      : null;
+  const stepId =
+    typeof (candidate as Record<string, unknown>).stepId === 'string'
+      ? ((candidate as Record<string, unknown>).stepId as StepId)
+      : null;
+  const source = (candidate as Record<string, unknown>).source === 'manual' ? 'manual' : 'automatic';
+  const parsedPosition = Number((candidate as Record<string, unknown>).position);
+  const position = Number.isInteger(parsedPosition) ? parsedPosition : null;
+
+  if (!sessionId || !stepId || position === null) {
+    return null;
+  }
+
+  return {
+    sessionId,
+    stepId,
+    source,
+    position,
+  };
+};
+
+const buildHistoryState = (stepId: StepId, position: number) => {
+  const currentState =
+    typeof window.history.state === 'object' && window.history.state !== null
+      ? (window.history.state as Record<string, unknown>)
+      : {};
+
+  return {
+    ...currentState,
+    [ONBOARDING_HISTORY_STATE_KEY]: {
+      sessionId: historySessionId.value ?? '',
+      stepId,
+      source: sessionSource.value ?? 'automatic',
+      position,
+    } satisfies OnboardingHistoryState,
+  };
+};
+
+const clearHistorySession = () => {
+  historySessionId.value = null;
+  historyPosition.value = -1;
+  isApplyingHistoryState.value = false;
+};
 
 const getNearestVisibleStepId = (stepId: StepId): StepId | null => {
   const currentOrderIndex = STEP_ORDER.indexOf(stepId);
@@ -232,8 +304,14 @@ const docsButtons = computed<BrandButtonProps[]>(() => {
 });
 
 const closeModal = async (options?: { reload?: boolean }) => {
+  if (typeof window !== 'undefined' && isManualSession.value && historyPosition.value >= 0) {
+    window.history.go(-(historyPosition.value + 1));
+    return;
+  }
+
   await onboardingModalStore.closeModal();
   cleanupOnboardingStorage();
+  clearHistorySession();
 
   if (options?.reload) {
     window.location.reload();
@@ -258,7 +336,7 @@ const goToNextStep = async () => {
       setActiveStepByIndex(activeStepIndex + 1);
     } else {
       // If we're at the last step, close the modal
-      await closeModal({ reload: true });
+      await closeModal({ reload: !isManualSession.value });
     }
     return;
   }
@@ -267,6 +345,11 @@ const goToNextStep = async () => {
 };
 
 const goToPreviousStep = () => {
+  if (typeof window !== 'undefined' && historySessionId.value && historyPosition.value > 0) {
+    window.history.back();
+    return;
+  }
+
   if (currentDynamicStepIndex.value > 0) {
     setActiveStepByIndex(currentDynamicStepIndex.value - 1);
   }
@@ -279,6 +362,14 @@ const goToStep = (stepIndex: number) => {
     stepIndex < availableSteps.value.length &&
     stepIndex <= currentDynamicStepIndex.value
   ) {
+    if (typeof window !== 'undefined' && historySessionId.value) {
+      const delta = stepIndex - currentDynamicStepIndex.value;
+      if (delta < 0) {
+        window.history.go(delta);
+        return;
+      }
+    }
+
     setActiveStepByIndex(stepIndex);
   }
 };
@@ -351,10 +442,97 @@ const handleActivationSkip = async () => {
   if (currentDynamicStepIndex.value < availableSteps.value.length - 1) {
     setActiveStepByIndex(currentDynamicStepIndex.value + 1);
   } else {
-    await closeModal();
+    await closeModal({ reload: !isManualSession.value });
   }
 };
 
+const handlePopstate = async (event: PopStateEvent) => {
+  const nextHistoryState = getHistoryState(event.state);
+  const activeSessionId = historySessionId.value;
+
+  if (!activeSessionId) {
+    return;
+  }
+
+  if (nextHistoryState?.sessionId === activeSessionId) {
+    historyPosition.value = nextHistoryState.position;
+
+    if (
+      availableSteps.value.includes(nextHistoryState.stepId) &&
+      currentStepId.value !== nextHistoryState.stepId
+    ) {
+      isApplyingHistoryState.value = true;
+      draftStore.setCurrentStep(nextHistoryState.stepId);
+      await nextTick();
+      isApplyingHistoryState.value = false;
+    }
+    return;
+  }
+
+  if (!showModal.value || !isManualSession.value) {
+    return;
+  }
+
+  showExitConfirmDialog.value = false;
+  isClosingModal.value = true;
+  try {
+    await onboardingModalStore.closeModal();
+    cleanupOnboardingStorage();
+    clearHistorySession();
+  } finally {
+    isClosingModal.value = false;
+  }
+};
+
+watch(
+  () => [showModal.value, currentStep.value, sessionSource.value] as const,
+  ([visible, stepId]) => {
+    if (typeof window === 'undefined') {
+      return;
+    }
+
+    if (!visible || !stepId) {
+      if (!visible) {
+        clearHistorySession();
+      }
+      return;
+    }
+
+    if (isApplyingHistoryState.value) {
+      return;
+    }
+
+    const currentHistoryState = getHistoryState(window.history.state);
+    if (!historySessionId.value) {
+      historySessionId.value = createHistorySessionId();
+      historyPosition.value = 0;
+      const method = isManualSession.value ? 'pushState' : 'replaceState';
+      window.history[method](buildHistoryState(stepId, historyPosition.value), '', window.location.href);
+      return;
+    }
+
+    if (
+      currentHistoryState?.sessionId === historySessionId.value &&
+      currentHistoryState.stepId === stepId &&
+      currentHistoryState.position === historyPosition.value
+    ) {
+      return;
+    }
+
+    historyPosition.value += 1;
+    window.history.pushState(buildHistoryState(stepId, historyPosition.value), '', window.location.href);
+  },
+  { flush: 'post', immediate: true }
+);
+
+onMounted(() => {
+  window?.addEventListener('popstate', handlePopstate);
+});
+
+onUnmounted(() => {
+  window?.removeEventListener('popstate', handlePopstate);
+});
+
 const currentStepProps = computed<Record<string, unknown>>(() => {
   const step = currentStep.value;
   if (!step) {
@@ -429,7 +607,7 @@ const currentStepProps = computed<Record<string, unknown>>(() => {
     case 'NEXT_STEPS':
       return {
         ...baseProps,
-        onComplete: () => closeModal({ reload: true }),
+        onComplete: () => closeModal({ reload: !isManualSession.value }),
       };
 
     default:
diff --git a/web/src/components/Onboarding/standalone/OnboardingInternalBoot.standalone.vue b/web/src/components/Onboarding/standalone/OnboardingInternalBoot.standalone.vue
index 43ad82af89..1f8de76767 100644
--- a/web/src/components/Onboarding/standalone/OnboardingInternalBoot.standalone.vue
+++ b/web/src/components/Onboarding/standalone/OnboardingInternalBoot.standalone.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import {
@@ -22,6 +22,13 @@ import type { StepId } from '@/components/Onboarding/stepRegistry';
 
 const { t } = useI18n();
 const draftStore = useOnboardingDraftStore();
+const INTERNAL_BOOT_HISTORY_STATE_KEY = '__unraidOnboardingInternalBoot';
+
+type InternalBootHistoryState = {
+  sessionId: string;
+  stepId: StepId;
+  position: number;
+};
 
 const currentStep = ref<StepId>('CONFIGURE_BOOT');
 const confirmationState = ref<'idle' | 'saving' | 'result'>('idle');
@@ -30,6 +37,9 @@ const logs = ref<LogEntry[]>([]);
 const resultTitle = ref('');
 const resultMessage = ref('');
 const resultSeverity = ref<'success' | 'warning' | 'error'>('success');
+const historySessionId = ref<string | null>(null);
+const historyPosition = ref(-1);
+const isApplyingHistoryState = ref(false);
 const standaloneSteps: Array<{ id: StepId; required: boolean }> = [
   { id: 'CONFIGURE_BOOT', required: true },
   { id: 'SUMMARY', required: true },
@@ -38,17 +48,73 @@ const standaloneSteps: Array<{ id: StepId; required: boolean }> = [
 const summaryT = (key: string, values?: Record<string, unknown>) =>
   t(`onboarding.summaryStep.${key}`, values ?? {});
 
+const canReturnToConfigure = () =>
+  confirmationState.value === 'result' &&
+  (resultSeverity.value !== 'success' || !draftStore.internalBootApplySucceeded);
+
 const showConsole = computed(() => confirmationState.value === 'saving' || logs.value.length > 0);
 const isSaving = computed(() => confirmationState.value === 'saving');
-const canEditAgain = computed(
-  () =>
-    currentStep.value === 'SUMMARY' &&
-    confirmationState.value === 'result' &&
-    resultSeverity.value !== 'success'
-);
+const canEditAgain = computed(() => currentStep.value === 'SUMMARY' && canReturnToConfigure());
 const currentStepIndex = computed(() =>
   standaloneSteps.findIndex((step) => step.id === currentStep.value)
 );
+const createHistorySessionId = () =>
+  `internal-boot-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+
+const getHistoryState = (state: unknown): InternalBootHistoryState | null => {
+  if (!state || typeof state !== 'object') {
+    return null;
+  }
+
+  const candidate = (state as Record<string, unknown>)[INTERNAL_BOOT_HISTORY_STATE_KEY];
+  if (!candidate || typeof candidate !== 'object') {
+    return null;
+  }
+
+  const sessionId =
+    typeof (candidate as Record<string, unknown>).sessionId === 'string'
+      ? ((candidate as Record<string, unknown>).sessionId as string)
+      : null;
+  const stepId =
+    (candidate as Record<string, unknown>).stepId === 'CONFIGURE_BOOT' ||
+    (candidate as Record<string, unknown>).stepId === 'SUMMARY'
+      ? ((candidate as Record<string, unknown>).stepId as StepId)
+      : null;
+  const parsedPosition = Number((candidate as Record<string, unknown>).position);
+  const position = Number.isInteger(parsedPosition) ? parsedPosition : null;
+
+  if (!sessionId || !stepId || position === null) {
+    return null;
+  }
+
+  return {
+    sessionId,
+    stepId,
+    position,
+  };
+};
+
+const buildHistoryState = (stepId: StepId, position: number) => {
+  const currentState =
+    typeof window.history.state === 'object' && window.history.state !== null
+      ? (window.history.state as Record<string, unknown>)
+      : {};
+
+  return {
+    ...currentState,
+    [INTERNAL_BOOT_HISTORY_STATE_KEY]: {
+      sessionId: historySessionId.value ?? '',
+      stepId,
+      position,
+    } satisfies InternalBootHistoryState,
+  };
+};
+
+const clearHistorySession = () => {
+  historySessionId.value = null;
+  historyPosition.value = -1;
+  isApplyingHistoryState.value = false;
+};
 
 const addLog = (entry: Omit<LogEntry, 'timestamp'>) => {
   logs.value.push({
@@ -83,9 +149,24 @@ const setResultFromApply = (applyResult: InternalBootApplyResult) => {
   resultMessage.value = summaryT('result.failedMessage');
 };
 
-const handleClose = () => {
+const closeLocally = () => {
   cleanupOnboardingStorage();
   isOpen.value = false;
+  clearHistorySession();
+};
+
+const handleClose = (options?: { fromHistory?: boolean }) => {
+  if (
+    typeof window !== 'undefined' &&
+    !options?.fromHistory &&
+    historySessionId.value &&
+    historyPosition.value >= 0
+  ) {
+    window.history.go(-(historyPosition.value + 1));
+    return;
+  }
+
+  closeLocally();
 };
 
 const handleEditAgain = () => {
@@ -109,8 +190,8 @@ const handleStepComplete = async () => {
       type: 'info',
     });
     resultSeverity.value = 'success';
-    resultTitle.value = summaryT('result.successTitle');
-    resultMessage.value = summaryT('result.successMessage');
+    resultTitle.value = summaryT('result.noChangesTitle');
+    resultMessage.value = summaryT('result.noChangesMessage');
     confirmationState.value = 'result';
     return;
   }
@@ -151,6 +232,90 @@ const handleStepComplete = async () => {
     clearInterval(progressTimer);
   }
 };
+
+const handlePopstate = (event: PopStateEvent) => {
+  const nextHistoryState = getHistoryState(event.state) ?? getHistoryState(window.history.state);
+  const activeSessionId = historySessionId.value;
+
+  if (!activeSessionId) {
+    return;
+  }
+
+  if (nextHistoryState?.sessionId === activeSessionId) {
+    historyPosition.value = nextHistoryState.position;
+
+    if (nextHistoryState.stepId === currentStep.value) {
+      return;
+    }
+
+    if (currentStep.value === 'SUMMARY' && confirmationState.value === 'saving') {
+      window.history.go(1);
+      return;
+    }
+
+    if (nextHistoryState.stepId === 'CONFIGURE_BOOT' && !canReturnToConfigure()) {
+      handleClose({ fromHistory: true });
+      return;
+    }
+
+    isApplyingHistoryState.value = true;
+    currentStep.value = nextHistoryState.stepId;
+    isApplyingHistoryState.value = false;
+    return;
+  }
+
+  handleClose({ fromHistory: true });
+};
+
+watch(
+  () => [isOpen.value, currentStep.value] as const,
+  ([open, stepId]) => {
+    if (typeof window === 'undefined') {
+      return;
+    }
+
+    if (!open) {
+      clearHistorySession();
+      return;
+    }
+
+    if (isApplyingHistoryState.value) {
+      return;
+    }
+
+    const currentHistoryState = getHistoryState(window.history.state);
+    if (!historySessionId.value) {
+      historySessionId.value = createHistorySessionId();
+      historyPosition.value = 0;
+      window.history.pushState(
+        buildHistoryState(stepId, historyPosition.value),
+        '',
+        window.location.href
+      );
+      return;
+    }
+
+    if (
+      currentHistoryState?.sessionId === historySessionId.value &&
+      currentHistoryState.stepId === stepId &&
+      currentHistoryState.position === historyPosition.value
+    ) {
+      return;
+    }
+
+    historyPosition.value += 1;
+    window.history.pushState(buildHistoryState(stepId, historyPosition.value), '', window.location.href);
+  },
+  { flush: 'post', immediate: true }
+);
+
+onMounted(() => {
+  window?.addEventListener('popstate', handlePopstate);
+});
+
+onUnmounted(() => {
+  window?.removeEventListener('popstate', handlePopstate);
+});
 </script>
 
 <template>
@@ -175,7 +340,7 @@ const handleStepComplete = async () => {
         data-testid="internal-boot-standalone-close"
         class="bg-background/90 text-foreground hover:bg-muted fixed top-5 right-8 z-20 rounded-md p-1.5 shadow-sm transition-colors"
         :aria-label="t('onboarding.modal.closeAriaLabel')"
-        @click="handleClose"
+        @click="() => handleClose()"
       >
         <XMarkIcon class="h-5 w-5" />
       </button>
@@ -255,7 +420,7 @@ const handleStepComplete = async () => {
                   type="button"
                   data-testid="internal-boot-standalone-result-close"
                   class="bg-primary hover:bg-primary/90 rounded-md px-4 py-2 text-sm font-semibold text-white transition-colors"
-                  @click="handleClose"
+                  @click="() => handleClose()"
                 >
                   {{ t('common.close') }}
                 </button>
diff --git a/web/src/components/Onboarding/steps/OnboardingCoreSettingsStep.vue b/web/src/components/Onboarding/steps/OnboardingCoreSettingsStep.vue
index b932b52704..a70cf8ba4c 100644
--- a/web/src/components/Onboarding/steps/OnboardingCoreSettingsStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingCoreSettingsStep.vue
@@ -6,7 +6,7 @@ import { useQuery } from '@vue/apollo-composable';
 
 import { ChevronLeftIcon, Cog6ToothIcon, GlobeAltIcon } from '@heroicons/vue/24/outline';
 import { ChevronRightIcon } from '@heroicons/vue/24/solid';
-import { BrandButton, Select } from '@unraid/ui';
+import { BrandButton } from '@unraid/ui';
 // --- Theme Images ---
 import azureThemeImg from '@/assets/unraid-azure-theme.png';
 import blackThemeImg from '@/assets/unraid-black-theme.png';
@@ -19,7 +19,6 @@ import { TIME_ZONE_OPTIONS_QUERY } from '@/components/Onboarding/graphql/timeZon
 // --- Submit Logic ---
 import { useOnboardingDraftStore } from '@/components/Onboarding/store/onboardingDraft';
 import { useOnboardingStore } from '@/components/Onboarding/store/onboardingStatus';
-import { Switch } from '@headlessui/vue';
 import { getTimeZones } from '@vvo/tzdb';
 
 export interface Props {
@@ -356,9 +355,6 @@ const languageItems = computed(() => {
 });
 
 const isLanguageDisabled = computed(() => isLanguagesLoading.value || !!languagesQueryError.value);
-const onboardingSelectClasses =
-  'w-full border-muted bg-bg text-highlighted data-[placeholder]:text-muted focus:ring-primary focus:ring-offset-0';
-
 const handleSubmit = async () => {
   if (serverNameValidation.value || serverDescriptionValidation.value) {
     error.value = t('common.error');
@@ -504,13 +500,16 @@ const isBusy = computed(() => isSaving.value || (props.isSavingStep ?? false));
           <label class="text-highlighted text-base font-bold">
             {{ t('onboarding.coreSettings.timezone') }}
           </label>
-          <Select
+          <USelectMenu
             v-model="selectedTimeZone"
             :items="timeZoneItems"
+            label-key="label"
+            value-key="value"
+            :search-input="false"
             :placeholder="t('onboarding.coreSettings.selectTimezonePlaceholder')"
-            :class="onboardingSelectClasses"
             :disabled="isBusy"
-            size="lg"
+            class="w-full"
+            :ui="{ content: 'z-[100]' }"
           />
         </div>
 
@@ -519,15 +518,18 @@ const isBusy = computed(() => isSaving.value || (props.isSavingStep ?? false));
           <label class="text-highlighted text-base font-bold">
             {{ t('onboarding.coreSettings.language') }}
           </label>
-          <Select
+          <USelectMenu
             v-model="selectedLanguage"
             :items="languageItems"
+            label-key="label"
+            value-key="value"
+            :search-input="false"
             :placeholder="
               isLanguagesLoading ? t('common.loading') : t('onboarding.coreSettings.selectLanguage')
             "
-            :class="onboardingSelectClasses"
             :disabled="isBusy || isLanguageDisabled"
-            size="lg"
+            class="w-full"
+            :ui="{ content: 'z-[100]' }"
           />
         </div>
       </div>
@@ -547,24 +549,7 @@ const isBusy = computed(() => isSaving.value || (props.isSavingStep ?? false));
             </p>
           </div>
           <div class="flex items-center">
-            <Switch
-              v-model="useSsh"
-              :disabled="isBusy"
-              :class="[
-                useSsh ? 'bg-primary' : 'bg-gray-200 dark:bg-gray-700',
-                isBusy ? 'cursor-not-allowed opacity-50' : 'cursor-pointer',
-                'focus:ring-primary relative inline-flex h-6 w-11 shrink-0 rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:ring-2 focus:ring-offset-2 focus:outline-none',
-              ]"
-            >
-              <span class="sr-only">{{ t('onboarding.coreSettings.ssh') }}</span>
-              <span
-                aria-hidden="true"
-                :class="[
-                  useSsh ? 'translate-x-5' : 'translate-x-0',
-                  'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
-                ]"
-              />
-            </Switch>
+            <USwitch :model-value="useSsh" :disabled="isBusy" @update:model-value="useSsh = $event" />
           </div>
         </div>
         <!-- Border -->
@@ -581,12 +566,15 @@ const isBusy = computed(() => isSaving.value || (props.isSavingStep ?? false));
             </p>
           </div>
           <div class="w-full md:w-64">
-            <Select
+            <USelectMenu
               v-model="selectedTheme"
               :items="themeItems"
-              :class="onboardingSelectClasses"
+              label-key="label"
+              value-key="value"
+              :search-input="false"
               :disabled="isBusy"
-              size="lg"
+              class="w-full"
+              :ui="{ content: 'z-[100]' }"
             />
           </div>
         </div>
@@ -620,7 +608,7 @@ const isBusy = computed(() => isSaving.value || (props.isSavingStep ?? false));
         <button
           v-if="showBack"
           @click="handleBack"
-          class="text-muted hover:text-toned group flex w-full items-center justify-center gap-2 font-medium transition-colors sm:w-auto sm:justify-start"
+          class="text-muted hover:text-toned group flex w-full items-center justify-center gap-2 font-medium transition-colors disabled:cursor-not-allowed disabled:opacity-50 sm:w-auto sm:justify-start"
           :disabled="isBusy"
         >
           <ChevronLeftIcon class="h-5 w-5 transition-transform group-hover:-translate-x-0.5" />
diff --git a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
index 37a98417a9..d685eaa24d 100644
--- a/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingInternalBootStep.vue
@@ -3,25 +3,18 @@ import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useMutation, useQuery } from '@vue/apollo-composable';
 
-import { ChevronLeftIcon, CircleStackIcon, InformationCircleIcon } from '@heroicons/vue/24/outline';
-import {
-  ArrowPathIcon,
-  ChevronDownIcon,
-  ChevronRightIcon,
-  ExclamationTriangleIcon,
-} from '@heroicons/vue/24/solid';
-import { BrandButton, Select } from '@unraid/ui';
+import { ChevronLeftIcon, CircleStackIcon } from '@heroicons/vue/24/outline';
+import { ArrowPathIcon, ChevronRightIcon } from '@heroicons/vue/24/solid';
+import { Accordion, BrandButton } from '@unraid/ui';
 import OnboardingLoadingState from '@/components/Onboarding/components/OnboardingLoadingState.vue';
 import { REFRESH_INTERNAL_BOOT_CONTEXT_MUTATION } from '@/components/Onboarding/graphql/refreshInternalBootContext.mutation';
 import { useOnboardingDraftStore } from '@/components/Onboarding/store/onboardingDraft';
-import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue';
 import { convert } from 'convert';
 
 import type {
   OnboardingBootMode,
   OnboardingInternalBootSelection,
 } from '@/components/Onboarding/store/onboardingDraft';
-import type { SelectItemType } from '@unraid/ui';
 import type { GetInternalBootContextQuery } from '~/composables/gql/graphql';
 
 import { GetInternalBootContextDocument } from '~/composables/gql/graphql';
@@ -61,6 +54,12 @@ interface InternalBootTemplateData {
   poolNames: string[];
 }
 
+interface SelectMenuItem {
+  value: string | number;
+  label: string;
+  disabled?: boolean;
+}
+
 type InternalBootTransferState = 'enabled' | 'disabled' | 'unknown';
 type InternalBootEligibilityState = 'eligible' | 'ineligible' | 'unknown';
 type InternalBootSystemEligibilityCode =
@@ -149,7 +148,7 @@ const bootMode = ref<OnboardingBootMode>(
 
 const poolName = ref('boot');
 const slotCount = ref(1);
-const selectedDevices = ref<string[]>(['']);
+const selectedDevices = ref<Array<string | undefined>>([undefined]);
 const bootSizePreset = ref<string>('');
 const customBootSizeGb = ref('');
 const updateBios = ref(true);
@@ -292,10 +291,10 @@ const systemEligibilityCodes = computed<InternalBootSystemEligibilityCode[]>(()
 });
 const diskEligibilityIssues = computed(() =>
   allDeviceOptions.value
-    .filter((option) => option.ineligibilityCodes.length > 0 || option.warningCodes.length > 0)
+    .filter((option) => option.ineligibilityCodes.length > 0)
     .map((option) => ({
       label: option.label,
-      codes: [...option.ineligibilityCodes, ...option.warningCodes],
+      codes: [...option.ineligibilityCodes],
     }))
 );
 const selectedDriveWarnings = computed(() =>
@@ -358,7 +357,9 @@ const deviceSizeById = computed(() => {
 });
 
 const selectedSlotDevices = computed(() =>
-  selectedDevices.value.slice(0, slotCount.value).filter((value) => value.length > 0)
+  selectedDevices.value
+    .slice(0, slotCount.value)
+    .filter((value): value is string => !!value && value.length > 0)
 );
 
 const smallestSelectedDeviceMiB = computed(() => {
@@ -409,14 +410,14 @@ const visiblePresetOptions = computed(() => {
   }));
 });
 
-const slotCountItems = computed<SelectItemType[]>(() =>
+const slotCountItems = computed<SelectMenuItem[]>(() =>
   slotOptions.value.map((option) => ({
     value: option,
     label: String(option),
   }))
 );
 
-const bootSizePresetItems = computed<SelectItemType[]>(() => [
+const bootSizePresetItems = computed<SelectMenuItem[]>(() => [
   ...visiblePresetOptions.value.map((option) => ({
     value: option.value,
     label: option.label,
@@ -453,7 +454,7 @@ const bootSizeHelpText = computed(() => {
 const normalizeSelectedDevices = (count: number) => {
   const nextDevices = selectedDevices.value.slice(0, count);
   while (nextDevices.length < count) {
-    nextDevices.push('');
+    nextDevices.push(undefined);
   }
   selectedDevices.value = nextDevices;
 };
@@ -527,48 +528,17 @@ const isDeviceDisabled = (deviceId: string, index: number) => {
   );
 };
 
-const getDeviceSelectItems = (index: number): SelectItemType[] =>
+const getDeviceSelectItems = (index: number): SelectMenuItem[] =>
   deviceOptions.value.map((option) => ({
     value: option.value,
     label: option.label,
     disabled: isDeviceDisabled(option.value, index),
   }));
 
-const toSelectString = (value: unknown): string => {
-  if (typeof value === 'string') {
-    return value;
-  }
-
-  if (typeof value === 'number' || typeof value === 'bigint') {
-    return String(value);
-  }
-
-  return '';
-};
-
-const handleSlotCountChange = (value: unknown) => {
-  const parsedValue =
-    typeof value === 'number'
-      ? value
-      : typeof value === 'bigint'
-        ? Number(value)
-        : Number.parseInt(toSelectString(value), 10);
-  if (Number.isFinite(parsedValue) && parsedValue >= 1 && parsedValue <= 2) {
-    slotCount.value = parsedValue;
-  }
+const handleUpdateBiosChange = (value: boolean | 'indeterminate') => {
+  updateBios.value = value === true;
 };
 
-const handleDeviceSelection = (index: number, value: unknown) => {
-  selectedDevices.value[index] = toSelectString(value);
-};
-
-const handleBootSizePresetChange = (value: unknown) => {
-  bootSizePreset.value = toSelectString(value);
-};
-
-const onboardingSelectClasses =
-  'w-full border-muted bg-bg text-highlighted data-[placeholder]:text-muted focus:ring-primary focus:ring-offset-0';
-
 const buildValidatedSelection = (): OnboardingInternalBootSelection | null => {
   const normalizedPoolName = poolName.value.trim();
   if (!normalizedPoolName) {
@@ -603,11 +573,12 @@ const buildValidatedSelection = (): OnboardingInternalBootSelection | null => {
     return null;
   }
 
-  const devices = selectedDevices.value.slice(0, slotCount.value);
-  if (devices.length !== slotCount.value || devices.some((device) => !device)) {
+  const rawDevices = selectedDevices.value.slice(0, slotCount.value);
+  if (rawDevices.length !== slotCount.value || rawDevices.some((device) => !device)) {
     formError.value = t('onboarding.internalBootStep.validation.devicePerSlot');
     return null;
   }
+  const devices = rawDevices.filter((d): d is string => !!d);
 
   const uniqueDevices = new Set(devices);
   if (uniqueDevices.size !== devices.length) {
@@ -647,7 +618,7 @@ const initializeForm = (data: InternalBootTemplateData) => {
   slotCount.value = draftSelection?.slotCount ?? defaultSlot;
   selectedDevices.value =
     draftSelection?.devices.slice(0, slotCount.value) ??
-    Array.from({ length: slotCount.value }, () => '');
+    Array.from({ length: slotCount.value }, (): string | undefined => undefined);
   normalizeSelectedDevices(slotCount.value);
 
   updateBios.value = draftSelection?.updateBios ?? data.defaultUpdateBios;
@@ -758,49 +729,26 @@ const primaryButtonText = computed(() => t('onboarding.internalBootStep.actions.
         </div>
       </div>
 
-      <div class="space-y-3">
-        <label
-          class="border-muted bg-bg/50 has-[:checked]:border-primary has-[:checked]:bg-primary/5 flex cursor-pointer items-start gap-3 rounded-lg border p-4 transition-colors"
-        >
-          <input
-            v-model="bootMode"
-            type="radio"
-            value="usb"
-            class="accent-primary mt-0.5 h-4 w-4"
-            :disabled="isStepLocked"
-          />
-          <div class="space-y-1">
-            <p class="text-highlighted text-sm font-semibold">
-              {{ t('onboarding.internalBootStep.options.usb') }}
-            </p>
-          </div>
-        </label>
-        <label
-          class="border-muted bg-bg/50 has-[:checked]:border-primary has-[:checked]:bg-primary/5 flex cursor-pointer items-start gap-3 rounded-lg border p-4 transition-colors"
-        >
-          <input
-            v-model="bootMode"
-            type="radio"
-            value="storage"
-            class="accent-primary mt-0.5 h-4 w-4"
-            :disabled="isStepLocked"
-          />
-          <div class="space-y-1">
-            <p class="text-highlighted text-sm font-semibold">
-              {{ t('onboarding.internalBootStep.options.storage') }}
-            </p>
-          </div>
-        </label>
-      </div>
-
-      <blockquote
+      <URadioGroup
+        v-model="bootMode"
+        :items="[
+          { label: t('onboarding.internalBootStep.options.usb'), value: 'usb' },
+          { label: t('onboarding.internalBootStep.options.storage'), value: 'storage' },
+        ]"
+        :disabled="isStepLocked"
+        variant="card"
+      />
+
+      <UAlert
         v-if="isStorageBootSelected && hasEligibleDevices"
         data-testid="internal-boot-intro-panel"
-        class="my-8 rounded-xl border border-sky-200 bg-sky-50 p-5"
+        class="my-8"
+        color="neutral"
+        variant="subtle"
+        icon="i-lucide-info"
       >
-        <div class="flex items-start gap-3">
-          <InformationCircleIcon class="mt-0.5 h-6 w-6 flex-shrink-0 text-sky-700" />
-          <div class="space-y-3 text-sm leading-relaxed text-sky-950">
+        <template #description>
+          <div class="space-y-3 text-sm leading-relaxed">
             <p>{{ t('onboarding.internalBootStep.warning.bootablePoolDescription') }}</p>
             <p>{{ t('onboarding.internalBootStep.warning.bootablePoolVolumes') }}</p>
             <ul class="list-disc space-y-1 pl-5">
@@ -815,8 +763,8 @@ const primaryButtonText = computed(() => t('onboarding.internalBootStep.actions.
               {{ t('onboarding.internalBootStep.warning.selectedDevicesFormatted') }}
             </p>
           </div>
-        </div>
-      </blockquote>
+        </template>
+      </UAlert>
 
       <div v-if="isStorageBootSelected && isLoading" class="mt-2">
         <OnboardingLoadingState
@@ -835,16 +783,18 @@ const primaryButtonText = computed(() => t('onboarding.internalBootStep.actions.
       </div>
 
       <div v-if="isStorageBootSelected && !isLoading && !contextError" class="mt-6 flex justify-end">
-        <button
+        <UButton
           data-testid="internal-boot-refresh-button"
           type="button"
-          class="text-muted hover:text-primary inline-flex items-center gap-2 text-sm font-medium transition-colors disabled:cursor-not-allowed disabled:opacity-60"
+          color="neutral"
+          variant="ghost"
+          size="sm"
           :disabled="isBusy || isRefreshingContext"
           @click="handleRefreshContext"
         >
           <ArrowPathIcon class="h-4 w-4" :class="{ 'animate-spin': isRefreshingContext }" />
           {{ t('onboarding.internalBootStep.actions.refreshState', 'Refresh state') }}
-        </button>
+        </UButton>
       </div>
 
       <div v-if="isStorageBootSelected && !isLoading && !contextError && canConfigure" class="space-y-5">
@@ -853,25 +803,28 @@ const primaryButtonText = computed(() => t('onboarding.internalBootStep.actions.
             <span class="text-muted text-sm font-medium">
               {{ t('onboarding.internalBootStep.fields.poolName') }}
             </span>
-            <input
-              v-model="poolName"
-              type="text"
-              maxlength="40"
-              class="border-muted bg-bg focus:ring-primary w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
-              :disabled="isBusy"
-            />
+            <UInput v-model="poolName" type="text" maxlength="40" :disabled="isBusy" class="w-full" />
           </label>
 
           <label class="space-y-2">
             <span class="text-muted text-sm font-medium">
               {{ t('onboarding.internalBootStep.fields.slots') }}
             </span>
-            <Select
+            <USelectMenu
               :model-value="slotCount"
               :items="slotCountItems"
-              :class="onboardingSelectClasses"
+              label-key="label"
+              value-key="value"
+              :search-input="false"
               :disabled="isBusy"
-              @update:model-value="handleSlotCountChange"
+              class="w-full"
+              :ui="{ content: 'z-[100]' }"
+              @update:model-value="
+                (val: unknown) => {
+                  const n = Number(val);
+                  if (Number.isFinite(n) && n >= 1) slotCount = n;
+                }
+              "
             />
           </label>
         </div>
@@ -884,26 +837,29 @@ const primaryButtonText = computed(() => t('onboarding.internalBootStep.actions.
             <label class="text-muted text-sm font-medium">{{
               t('onboarding.internalBootStep.fields.deviceSlot', { index })
             }}</label>
-            <Select
-              :model-value="selectedDevices[index - 1] || undefined"
+            <USelectMenu
+              v-model="selectedDevices[index - 1]"
               :items="getDeviceSelectItems(index - 1)"
+              label-key="label"
+              value-key="value"
+              :search-input="false"
               :placeholder="t('onboarding.internalBootStep.fields.selectDevice')"
-              :class="onboardingSelectClasses"
               :disabled="isBusy"
-              @update:model-value="handleDeviceSelection(index - 1, $event)"
+              class="w-full"
+              :ui="{ content: 'z-[100]' }"
             />
           </div>
         </div>
 
-        <blockquote
+        <UAlert
           v-if="selectedDriveWarnings.length > 0"
           data-testid="internal-boot-drive-warning"
-          role="alert"
-          class="rounded-xl border border-amber-200 bg-amber-50 p-4"
+          color="warning"
+          variant="outline"
+          icon="i-lucide-triangle-alert"
         >
-          <div class="flex items-start gap-3">
-            <ExclamationTriangleIcon class="mt-0.5 h-5 w-5 flex-shrink-0 text-amber-700" />
-            <div class="space-y-2 text-sm leading-relaxed text-amber-950">
+          <template #description>
+            <div class="space-y-2">
               <p class="font-semibold">
                 {{ t('onboarding.internalBootStep.warning.driveWarningsTitle') }}
               </p>
@@ -914,34 +870,37 @@ const primaryButtonText = computed(() => t('onboarding.internalBootStep.actions.
                 </li>
               </ul>
             </div>
-          </div>
-        </blockquote>
+          </template>
+        </UAlert>
 
         <div class="grid grid-cols-1 gap-5 md:grid-cols-2">
           <label class="space-y-2">
             <span class="text-muted text-sm font-medium">
               {{ t('onboarding.internalBootStep.fields.bootReservedSize') }}
             </span>
-            <Select
-              :model-value="bootSizePreset"
+            <USelectMenu
+              v-model="bootSizePreset"
               :items="bootSizePresetItems"
-              :class="onboardingSelectClasses"
+              label-key="label"
+              value-key="value"
+              :search-input="false"
               :disabled="isBusy"
-              @update:model-value="handleBootSizePresetChange"
+              class="w-full"
+              :ui="{ content: 'z-[100]' }"
             />
           </label>
 
-          <label class="space-y-2">
+          <label v-if="bootSizePreset === 'custom'" class="space-y-2">
             <span class="text-muted text-sm font-medium">
               {{ t('onboarding.internalBootStep.fields.customSizeGb') }}
             </span>
-            <input
+            <UInput
               v-model="customBootSizeGb"
               type="number"
               min="4"
               :max="maxCustomBootSizeGb ?? undefined"
-              class="border-muted bg-bg focus:ring-primary w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
-              :disabled="isBusy || bootSizePreset !== 'custom'"
+              :disabled="isBusy"
+              class="w-full"
             />
           </label>
         </div>
@@ -949,29 +908,28 @@ const primaryButtonText = computed(() => t('onboarding.internalBootStep.actions.
         <p class="text-muted text-xs">{{ bootSizeHelpText }}</p>
 
         <label class="flex items-center gap-3 text-sm">
-          <input
-            v-model="updateBios"
-            type="checkbox"
-            class="accent-primary h-4 w-4"
+          <UCheckbox
+            :model-value="updateBios"
             :disabled="isBusy"
+            @update:model-value="handleUpdateBiosChange"
           />
           <span class="text-highlighted font-medium">{{
             t('onboarding.internalBootStep.fields.updateBios')
           }}</span>
         </label>
-        <blockquote
+        <UAlert
           v-if="updateBios"
           data-testid="internal-boot-update-bios-warning"
-          role="alert"
-          class="border-muted bg-muted/40 border-s-orange-dark border-s-4 p-4"
+          color="neutral"
+          variant="outline"
+          icon="i-lucide-triangle-alert"
         >
-          <div class="flex items-start gap-2">
-            <ExclamationTriangleIcon class="text-orange-dark mt-0.5 h-5 w-5 flex-shrink-0" />
-            <p class="text-foreground text-sm leading-relaxed">
+          <template #description>
+            <p class="text-sm leading-relaxed">
               {{ t('onboarding.internalBootStep.warning.updateBios') }}
             </p>
-          </div>
-        </blockquote>
+          </template>
+        </UAlert>
       </div>
 
       <div
@@ -979,40 +937,36 @@ const primaryButtonText = computed(() => t('onboarding.internalBootStep.actions.
         data-testid="internal-boot-eligibility-panel"
         class="border-muted bg-muted/40 text-foreground mt-6 rounded-lg border text-sm"
       >
-        <Disclosure v-slot="{ open }">
-          <DisclosureButton
-            data-testid="internal-boot-eligibility-toggle"
-            class="flex w-full items-start justify-between gap-4 p-4 text-left"
-          >
-            <div class="space-y-1">
-              <p class="font-semibold">{{ eligibilityPanelTitle }}</p>
-              <p v-if="eligibilityPanelDescription">{{ eligibilityPanelDescription }}</p>
-            </div>
-            <div class="flex items-center gap-2 text-sm font-medium whitespace-nowrap">
-              <span>
-                {{
-                  open
-                    ? t('onboarding.internalBootStep.eligibility.hideDetails')
-                    : t('onboarding.internalBootStep.eligibility.showDetails')
-                }}
-              </span>
-              <ChevronDownIcon
-                :class="[
-                  open ? 'rotate-180 transform' : '',
-                  'h-5 w-5 transition-transform duration-200',
-                ]"
-              />
+        <Accordion
+          :items="[{ value: 'eligibility', title: eligibilityPanelTitle }]"
+          type="single"
+          collapsible
+          class="border-none"
+          item-class="border-none"
+          trigger-class="pr-4 hover:no-underline"
+        >
+          <template #trigger="{ open }">
+            <div
+              data-testid="internal-boot-eligibility-toggle"
+              class="flex w-full items-center justify-between gap-4 p-4 text-left"
+            >
+              <div class="space-y-1">
+                <p class="font-semibold">{{ eligibilityPanelTitle }}</p>
+                <p v-if="eligibilityPanelDescription">{{ eligibilityPanelDescription }}</p>
+              </div>
+              <div class="flex items-center gap-2 text-sm font-medium whitespace-nowrap">
+                <span>
+                  {{
+                    open
+                      ? t('onboarding.internalBootStep.eligibility.hideDetails')
+                      : t('onboarding.internalBootStep.eligibility.showDetails')
+                  }}
+                </span>
+              </div>
             </div>
-          </DisclosureButton>
-          <transition
-            enter-active-class="transition duration-100 ease-out"
-            enter-from-class="transform scale-95 opacity-0"
-            enter-to-class="transform scale-100 opacity-100"
-            leave-active-class="transition duration-75 ease-out"
-            leave-from-class="transform scale-100 opacity-100"
-            leave-to-class="transform scale-95 opacity-0"
-          >
-            <DisclosurePanel class="border-muted space-y-4 border-t px-4 pt-4 pb-4">
+          </template>
+          <template #content>
+            <div class="border-muted space-y-4 border-t px-4 pt-4 pb-4">
               <div v-if="systemEligibilityCodes.length > 0" class="space-y-2">
                 <p class="font-semibold">
                   {{ t('onboarding.internalBootStep.eligibility.systemTitle') }}
@@ -1043,9 +997,9 @@ const primaryButtonText = computed(() => t('onboarding.internalBootStep.actions.
                   </li>
                 </ul>
               </div>
-            </DisclosurePanel>
-          </transition>
-        </Disclosure>
+            </div>
+          </template>
+        </Accordion>
       </div>
 
       <div
@@ -1061,8 +1015,8 @@ const primaryButtonText = computed(() => t('onboarding.internalBootStep.actions.
         <button
           v-if="showBack"
           @click="handleBack"
-          class="text-muted hover:text-toned group flex w-full items-center justify-center gap-2 font-medium transition-colors sm:w-auto sm:justify-start"
-          :disabled="isBusy"
+          class="text-muted hover:text-toned group flex w-full items-center justify-center gap-2 font-medium transition-colors disabled:cursor-not-allowed disabled:opacity-50 sm:w-auto sm:justify-start"
+          :disabled="isStepLocked"
         >
           <ChevronLeftIcon class="h-5 w-5 transition-transform group-hover:-translate-x-0.5" />
           {{ t('common.back') }}
@@ -1073,8 +1027,8 @@ const primaryButtonText = computed(() => t('onboarding.internalBootStep.actions.
           <button
             v-if="showSkip"
             @click="handleSkip"
-            class="text-muted hover:text-highlighted text-sm font-medium transition-colors sm:mr-2"
-            :disabled="isBusy"
+            class="text-muted hover:text-highlighted text-sm font-medium transition-colors disabled:cursor-not-allowed disabled:opacity-50 sm:mr-2"
+            :disabled="isStepLocked"
           >
             {{ t('common.skipForNow', 'Skip for now') }}
           </button>
diff --git a/web/src/components/Onboarding/steps/OnboardingLicenseStep.vue b/web/src/components/Onboarding/steps/OnboardingLicenseStep.vue
index 3c6b018dcf..8f060fcc74 100644
--- a/web/src/components/Onboarding/steps/OnboardingLicenseStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingLicenseStep.vue
@@ -8,7 +8,6 @@ import {
   ArrowTopRightOnSquareIcon,
   ChevronLeftIcon,
   ChevronRightIcon,
-  ExclamationTriangleIcon,
   EyeIcon,
   EyeSlashIcon,
   KeyIcon,
@@ -265,7 +264,7 @@ const doSkip = () => {
             <BrandButton
               :text="nextButtonText"
               class="w-full shadow-md transition-all hover:shadow-lg disabled:cursor-not-allowed disabled:opacity-50 sm:min-w-[140px]"
-              :variant="hasValidLicense ? 'fill' : 'gray'"
+              :variant="hasValidLicense ? 'fill' : 'outline'"
               :class="hasValidLicense ? '!bg-primary hover:!bg-primary/90 !text-white' : '!shadow-none'"
               @click="handleNext"
               :disabled="!hasValidLicense && !allowSkip"
@@ -276,16 +275,14 @@ const doSkip = () => {
       </div>
     </div>
 
-    <!-- Help Dialog (Manual) -->
-    <div v-if="isHelpDialogOpen" class="fixed inset-0 z-[9999] flex items-center justify-center p-4">
-      <!-- Backdrop -->
-      <div class="fixed inset-0 bg-black/30 backdrop-blur-sm" @click="closeHelpDialog" />
-
-      <!-- Panel -->
-      <div class="bg-elevated border-muted relative w-full max-w-md rounded-xl border p-6 shadow-xl">
-        <h3 class="text-highlighted mb-2 text-lg font-bold">
-          {{ lt('onboarding.licenseStep.help.title', 'Contact Support') }}
-        </h3>
+    <UModal
+      :open="isHelpDialogOpen"
+      :portal="false"
+      :title="lt('onboarding.licenseStep.help.title', 'Contact Support')"
+      :ui="{ footer: 'justify-end', overlay: 'z-50', content: 'z-50 max-w-md' }"
+      @update:open="isHelpDialogOpen = $event"
+    >
+      <template #body>
         <div class="text-muted space-y-4 text-sm">
           <p>
             {{
@@ -314,8 +311,6 @@ const doSkip = () => {
                 )
               }}
             </p>
-
-            <!-- Copy Code in Dialog -->
             <div class="bg-bg border-muted mt-2 flex items-center gap-2 rounded-md border p-2">
               <code class="text-highlighted flex-1 truncate font-mono text-xs">{{
                 activationCode?.code
@@ -323,84 +318,67 @@ const doSkip = () => {
             </div>
           </div>
         </div>
-        <div class="mt-6 flex justify-end">
-          <BrandButton
-            :text="lt('onboarding.licenseStep.actions.close', 'Close')"
-            @click="closeHelpDialog"
-            class="uppercase"
-            variant="outline"
-          />
-        </div>
-      </div>
-    </div>
-
-    <!-- Skip Confirmation Dialog (Manual) -->
-    <div
-      v-if="isSkipDialogOpen"
-      class="fixed inset-0 z-[9999] flex items-center justify-center p-4 text-left"
+      </template>
+      <template #footer>
+        <UButton color="neutral" variant="outline" @click="closeHelpDialog">
+          {{ lt('onboarding.licenseStep.actions.close', 'Close') }}
+        </UButton>
+      </template>
+    </UModal>
+
+    <UModal
+      :open="isSkipDialogOpen"
+      :portal="false"
+      :title="lt('onboarding.licenseStep.skipDialog.title', 'Are you sure?')"
+      :ui="{ footer: 'justify-end', overlay: 'z-50', content: 'z-50 max-w-md' }"
+      @update:open="isSkipDialogOpen = $event"
     >
-      <!-- Backdrop -->
-      <div class="fixed inset-0 bg-black/30 backdrop-blur-sm" @click="closeSkipDialog" />
-
-      <!-- Panel -->
-      <div
-        class="bg-elevated border-muted relative w-full max-w-md rounded-xl border p-6 text-left shadow-xl"
-      >
-        <div class="mb-4 flex items-center gap-3">
-          <ExclamationTriangleIcon class="h-8 w-8 flex-shrink-0 text-yellow-500" />
-          <h3 class="text-highlighted text-lg font-bold">
-            {{ lt('onboarding.licenseStep.skipDialog.title', 'Are you sure?') }}
-          </h3>
-        </div>
-
-        <div class="text-muted mt-2 space-y-4 text-sm">
-          <!-- Message if user HAS a code -->
-          <blockquote v-if="hasActivationCode" class="border-primary bg-primary/10 mb-4 border-l-4 p-4">
-            <p class="text-highlighted text-sm leading-relaxed font-medium">
-              {{
-                lt(
-                  'onboarding.licenseStep.skipDialog.licenseDetected',
-                  'It appears you already have a license associated with this server. You can activate it now for free to unlock all features.'
-                )
-              }}
-            </p>
-          </blockquote>
-
-          <!-- Standard Warning (Always Visible) -->
-          <div>
-            <p>
-              {{
-                lt(
-                  'onboarding.licenseStep.skipDialog.warningLine1',
-                  'Skipping activation will severely limit system functionality.'
-                )
-              }}
-            </p>
-            <p>
-              {{
-                lt(
-                  'onboarding.licenseStep.skipDialog.warningLine2',
-                  'You can always activate your server again later through the Unraid dashboard.'
-                )
-              }}
-            </p>
-          </div>
-        </div>
-
-        <div class="mt-6 flex items-center justify-end gap-4">
-          <button
-            @click="closeSkipDialog"
-            class="text-muted hover:text-highlighted text-sm font-medium tracking-wide transition-colors hover:underline"
-          >
-            {{ lt('onboarding.licenseStep.actions.cancel', 'Cancel') }}
-          </button>
-          <BrandButton
-            :text="lt('onboarding.licenseStep.actions.iUnderstand', 'I UNDERSTAND')"
-            @click="doSkip"
-            class="border-none !bg-yellow-600 !text-white hover:!bg-yellow-700"
+      <template #body>
+        <div class="text-muted space-y-4 text-sm">
+          <UAlert
+            v-if="hasActivationCode"
+            color="primary"
+            variant="solid"
+            icon="i-lucide-info"
+            :description="
+              lt(
+                'onboarding.licenseStep.skipDialog.licenseDetected',
+                'It appears you already have a license associated with this server. You can activate it now for free to unlock all features.'
+              )
+            "
           />
+          <UAlert color="warning" variant="subtle" icon="i-lucide-triangle-alert">
+            <template #description>
+              <div class="space-y-2">
+                <p>
+                  {{
+                    lt(
+                      'onboarding.licenseStep.skipDialog.warningLine1',
+                      'Skipping activation will severely limit system functionality.'
+                    )
+                  }}
+                </p>
+                <p>
+                  {{
+                    lt(
+                      'onboarding.licenseStep.skipDialog.warningLine2',
+                      'You can always activate your server again later through the Unraid dashboard.'
+                    )
+                  }}
+                </p>
+              </div>
+            </template>
+          </UAlert>
         </div>
-      </div>
-    </div>
+      </template>
+      <template #footer>
+        <UButton color="neutral" variant="outline" @click="closeSkipDialog">
+          {{ lt('onboarding.licenseStep.actions.cancel', 'Cancel') }}
+        </UButton>
+        <UButton color="primary" @click="doSkip">
+          {{ lt('onboarding.licenseStep.actions.iUnderstand', 'I Understand') }}
+        </UButton>
+      </template>
+    </UModal>
   </div>
 </template>
diff --git a/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue b/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
index 75a5686061..c553f8fe52 100644
--- a/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingNextStepsStep.vue
@@ -14,7 +14,7 @@ import {
   WrenchScrewdriverIcon,
 } from '@heroicons/vue/24/outline';
 import { CheckCircleIcon, EnvelopeIcon } from '@heroicons/vue/24/solid';
-import { BrandButton, Dialog } from '@unraid/ui';
+import { BrandButton } from '@unraid/ui';
 // Use ?raw to import SVG content string
 import UnraidIconSvg from '@/assets/partners/simple-icons-unraid.svg?raw';
 import { submitInternalBootReboot } from '@/components/Onboarding/composables/internalBoot';
@@ -393,46 +393,36 @@ const handleCancelReboot = () => {
         </div>
       </div>
 
-      <Dialog
-        v-if="showRebootWarningDialog"
-        :model-value="showRebootWarningDialog"
-        :show-footer="false"
-        :show-close-button="false"
-        size="md"
-        class="max-w-md"
+      <UModal
+        :open="showRebootWarningDialog"
+        :portal="false"
+        :title="t('onboarding.nextSteps.confirmReboot.title')"
+        :description="t('onboarding.nextSteps.confirmReboot.description')"
+        :ui="{ footer: 'justify-end', overlay: 'z-50', content: 'z-50 max-w-md' }"
+        @update:open="showRebootWarningDialog = $event"
       >
-        <div class="space-y-6 p-2">
-          <div class="space-y-2">
-            <h3 class="text-lg font-semibold">{{ t('onboarding.nextSteps.confirmReboot.title') }}</h3>
-            <p class="text-muted-foreground text-sm">
-              {{ t('onboarding.nextSteps.confirmReboot.description') }}
-            </p>
-            <blockquote class="border-s-4 border-yellow-500 bg-yellow-100 p-3">
-              <p class="text-sm leading-relaxed text-yellow-900">
-                {{ t('onboarding.nextSteps.confirmReboot.warning') }}
-              </p>
-            </blockquote>
-          </div>
-          <div class="flex justify-end gap-3">
-            <button
-              type="button"
-              class="border-muted hover:bg-muted rounded-md border px-4 py-2 text-sm font-medium"
-              :disabled="isCompleting"
-              @click="handleCancelReboot"
-            >
-              {{ t('common.cancel') }}
-            </button>
-            <button
-              type="button"
-              class="bg-primary text-primary-foreground hover:bg-primary/90 rounded-md px-4 py-2 text-sm font-medium"
-              :disabled="isCompleting"
-              @click="handleConfirmReboot"
-            >
-              {{ t('onboarding.nextSteps.confirmReboot.confirm') }}
-            </button>
-          </div>
-        </div>
-      </Dialog>
+        <template #body>
+          <UAlert
+            color="warning"
+            variant="subtle"
+            icon="i-lucide-triangle-alert"
+            :description="t('onboarding.nextSteps.confirmReboot.warning')"
+          />
+        </template>
+        <template #footer>
+          <UButton
+            color="neutral"
+            variant="outline"
+            :disabled="isCompleting"
+            @click="handleCancelReboot"
+          >
+            {{ t('common.cancel') }}
+          </UButton>
+          <UButton :disabled="isCompleting" @click="handleConfirmReboot">
+            {{ t('onboarding.nextSteps.confirmReboot.confirm') }}
+          </UButton>
+        </template>
+      </UModal>
 
       <p v-if="completionError" role="alert" aria-live="polite" class="mt-6 text-sm text-red-600">
         {{ completionError }}
diff --git a/web/src/components/Onboarding/steps/OnboardingOverviewStep.vue b/web/src/components/Onboarding/steps/OnboardingOverviewStep.vue
index 941c4f4cc0..27bd06cca4 100644
--- a/web/src/components/Onboarding/steps/OnboardingOverviewStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingOverviewStep.vue
@@ -301,7 +301,7 @@ const openDocs = () => {
         <button
           v-if="showBack"
           @click="onBack"
-          class="text-muted hover:text-toned group flex items-center gap-2 font-medium transition-colors"
+          class="text-muted hover:text-toned group flex items-center gap-2 font-medium transition-colors disabled:cursor-not-allowed disabled:opacity-50"
           :disabled="isBusy"
         >
           <UIcon
@@ -316,7 +316,7 @@ const openDocs = () => {
           <button
             @click="handleSkipOnboarding"
             data-testid="skip-setup-button"
-            class="text-muted hover:text-toned text-sm font-medium transition-colors"
+            class="text-muted hover:text-toned text-sm font-medium transition-colors disabled:cursor-not-allowed disabled:opacity-50"
             :disabled="isBusy"
           >
             {{ t('onboarding.overviewStep.skipSetup') }}
diff --git a/web/src/components/Onboarding/steps/OnboardingPluginsStep.vue b/web/src/components/Onboarding/steps/OnboardingPluginsStep.vue
index 4266f7b91e..259a90965b 100644
--- a/web/src/components/Onboarding/steps/OnboardingPluginsStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingPluginsStep.vue
@@ -4,12 +4,11 @@ import { useI18n } from 'vue-i18n';
 import { useQuery } from '@vue/apollo-composable';
 
 import { ChevronLeftIcon, Squares2X2Icon } from '@heroicons/vue/24/outline';
-import { ChevronRightIcon, InformationCircleIcon } from '@heroicons/vue/24/solid';
+import { ChevronRightIcon } from '@heroicons/vue/24/solid';
 import { BrandButton } from '@unraid/ui';
 import OnboardingLoadingState from '@/components/Onboarding/components/OnboardingLoadingState.vue';
 import { INSTALLED_UNRAID_PLUGINS_QUERY } from '@/components/Onboarding/graphql/installedPlugins.query';
 import { useOnboardingDraftStore } from '@/components/Onboarding/store/onboardingDraft';
-import { Switch } from '@headlessui/vue';
 
 export interface Props {
   onComplete: () => void;
@@ -190,14 +189,13 @@ const primaryButtonText = computed(() => t('onboarding.pluginsStep.nextStep'));
       </div>
 
       <!-- Pro Tip -->
-      <blockquote class="border-primary bg-primary-100 text my-8 border-s-4 p-4">
-        <div class="flex items-start gap-2">
-          <InformationCircleIcon class="text-primary mt-0.5 h-6 w-6 flex-shrink-0" />
-          <p class="text-sm leading-relaxed">
-            <span class="mr-1 mb-1 block">{{ t('onboarding.pluginsStep.tip') }}</span>
-          </p>
-        </div>
-      </blockquote>
+      <UAlert
+        class="my-8"
+        color="primary"
+        variant="subtle"
+        icon="i-lucide-info"
+        :description="t('onboarding.pluginsStep.tip')"
+      />
 
       <!-- Plugin List -->
       <div class="mb-8">
@@ -222,26 +220,12 @@ const primaryButtonText = computed(() => t('onboarding.pluginsStep.nextStep'));
               </p>
             </div>
 
-            <Switch
+            <USwitch
               :model-value="isPluginEnabled(plugin.id)"
               @update:model-value="(val: boolean) => togglePlugin(plugin.id, val)"
               :disabled="isBusy || isPluginInstalled(plugin.id)"
-              :class="[
-                isPluginEnabled(plugin.id) ? 'bg-primary' : 'bg-gray-200 dark:bg-gray-700',
-                'focus:ring-primary relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:ring-2 focus:ring-offset-2 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50',
-              ]"
-            >
-              <span class="sr-only">{{
-                t('onboarding.pluginsStep.enablePluginAria', { name: plugin.name })
-              }}</span>
-              <span
-                aria-hidden="true"
-                :class="[
-                  isPluginEnabled(plugin.id) ? 'translate-x-5' : 'translate-x-0',
-                  'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
-                ]"
-              />
-            </Switch>
+              :aria-label="t('onboarding.pluginsStep.enablePluginAria', { name: plugin.name })"
+            />
           </div>
         </div>
       </div>
@@ -252,7 +236,7 @@ const primaryButtonText = computed(() => t('onboarding.pluginsStep.nextStep'));
         <button
           v-if="showBack"
           @click="handleBack"
-          class="text-muted hover:text-toned group flex w-full items-center justify-center gap-2 font-medium transition-colors sm:w-auto sm:justify-start"
+          class="text-muted hover:text-toned group flex w-full items-center justify-center gap-2 font-medium transition-colors disabled:cursor-not-allowed disabled:opacity-50 sm:w-auto sm:justify-start"
           :disabled="isBusy"
         >
           <ChevronLeftIcon class="h-5 w-5 transition-transform group-hover:-translate-x-0.5" />
@@ -264,7 +248,7 @@ const primaryButtonText = computed(() => t('onboarding.pluginsStep.nextStep'));
           <button
             v-if="showSkip"
             @click="handleSkip"
-            class="text-muted hover:text-highlighted text-sm font-medium transition-colors sm:mr-2"
+            class="text-muted hover:text-highlighted text-sm font-medium transition-colors disabled:cursor-not-allowed disabled:opacity-50 sm:mr-2"
             :disabled="isBusy"
           >
             {{ t('common.skipForNow', 'Skip for now') }}
diff --git a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
index 64a37765e9..b29dc5d327 100644
--- a/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
+++ b/web/src/components/Onboarding/steps/OnboardingSummaryStep.vue
@@ -17,13 +17,12 @@ import {
 import {
   ArrowPathIcon,
   CheckCircleIcon,
-  ChevronDownIcon,
   ChevronRightIcon,
   ClockIcon,
   ExclamationCircleIcon,
   ExclamationTriangleIcon,
 } from '@heroicons/vue/24/solid';
-import { BrandButton, Dialog } from '@unraid/ui';
+import { Accordion, BrandButton } from '@unraid/ui';
 import OnboardingConsole from '@/components/Onboarding/components/OnboardingConsole.vue';
 import {
   applyInternalBootSelection,
@@ -43,7 +42,6 @@ import {
 import { GET_CORE_SETTINGS_QUERY } from '@/components/Onboarding/graphql/getCoreSettings.query';
 import { INSTALLED_UNRAID_PLUGINS_QUERY } from '@/components/Onboarding/graphql/installedPlugins.query';
 import { UPDATE_SYSTEM_TIME_MUTATION } from '@/components/Onboarding/graphql/updateSystemTime.mutation';
-import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue';
 import { convert } from 'convert';
 
 import type { LogEntry } from '@/components/Onboarding/components/OnboardingConsole.vue';
@@ -487,29 +485,6 @@ const selectedPluginSummaries = computed(() => {
   });
 });
 
-const hasCoreSettingChanges = computed(() => {
-  const currentTimezone = coreSettingsResult.value?.systemTime?.timeZone || '';
-  const currentName =
-    coreSettingsResult.value?.server?.name || coreSettingsResult.value?.vars?.name || '';
-  const currentDescription = coreSettingsResult.value?.server?.comment || '';
-  const currentTheme = coreSettingsResult.value?.display?.theme || 'white';
-  const currentLocale = coreSettingsResult.value?.display?.locale || 'en_US';
-  const currentSsh = Boolean(coreSettingsResult.value?.vars?.useSsh || false);
-
-  return (
-    draftStore.selectedTimeZone !== currentTimezone ||
-    draftStore.serverName !== currentName ||
-    draftStore.serverDescription !== currentDescription ||
-    draftStore.selectedTheme !== currentTheme ||
-    draftStore.selectedLanguage !== currentLocale ||
-    draftStore.useSsh !== currentSsh
-  );
-});
-
-const hasAnyChangesToApply = computed(
-  () =>
-    hasCoreSettingChanges.value || pluginIdsToInstall.value.length > 0 || hasInternalBootSelection.value
-);
 const isApplyDataReady = computed(() =>
   Boolean(coreSettingsResult.value?.server && coreSettingsResult.value?.vars)
 );
@@ -696,7 +671,17 @@ const handleComplete = async () => {
       }
     };
 
-    if (!hasAnyChangesToApply.value) {
+    const pluginsToInstall = pluginIdsToInstall.value;
+    const hasUpdatesToApply =
+      shouldApplyTimeZone ||
+      shouldApplyServerIdentity ||
+      shouldApplyTheme ||
+      shouldApplyLocale ||
+      shouldApplySsh ||
+      pluginsToInstall.length > 0 ||
+      Boolean(internalBootSelection.value);
+
+    if (!hasUpdatesToApply) {
       addLog(summaryT('logs.noChanges'), 'info');
     }
 
@@ -860,7 +845,6 @@ const handleComplete = async () => {
       });
     }
 
-    const pluginsToInstall = pluginIdsToInstall.value;
     if (pluginsToInstall.length > 0) {
       addLog(summaryT('logs.installingPlugins', { count: pluginsToInstall.length }), 'info');
 
@@ -996,8 +980,8 @@ const handleComplete = async () => {
       }
     }
 
-    addLog(summaryT('logs.finalizingSetup'), 'info');
     await applyServerIdentityAtEnd();
+    addLog(summaryT('logs.finalizingSetup'), 'info');
 
     if (hadInstallTimeout) {
       applyResultSeverity.value = 'warning';
@@ -1015,6 +999,10 @@ const handleComplete = async () => {
       applyResultSeverity.value = 'warning';
       applyResultTitle.value = summaryT('result.bestEffortTitle');
       applyResultMessage.value = summaryT('result.bestEffortMessage');
+    } else if (!hasUpdatesToApply) {
+      applyResultSeverity.value = 'success';
+      applyResultTitle.value = summaryT('result.noChangesTitle');
+      applyResultMessage.value = summaryT('result.noChangesMessage');
     } else {
       addLog(summaryT('logs.settingsApplied'), 'success');
       applyResultSeverity.value = 'success';
@@ -1089,15 +1077,14 @@ const handleBack = () => {
         </div>
       </div>
 
-      <!-- Initialization Message (Tip Style) -->
-      <blockquote class="border-success-500 bg-success-100 text my-8 border-s-4 p-4">
-        <div class="flex items-start gap-2">
-          <CheckCircleIcon class="text-success mt-0.5 h-6 w-6 flex-shrink-0" />
-          <p class="text-sm leading-relaxed">
-            <span class="mr-1 mb-1 block">{{ t('onboarding.summaryStep.initializationMessage') }}</span>
-          </p>
-        </div>
-      </blockquote>
+      <!-- Initialization Message -->
+      <UAlert
+        color="success"
+        variant="subtle"
+        :title="t('onboarding.summaryStep.initializationMessage')"
+        icon="i-heroicons-check-circle"
+        class="my-8"
+      />
 
       <!-- Summary Grid -->
       <div class="grid grid-cols-1 gap-6 md:grid-cols-2">
@@ -1183,50 +1170,51 @@ const handleBack = () => {
 
       <!-- Plugins Summary -->
       <div class="border-muted bg-bg/50 mt-6 rounded-lg border">
-        <Disclosure v-slot="{ open }">
-          <DisclosureButton
-            :disabled="draftPluginsCount === 0"
-            :class="[
-              'flex w-full items-center justify-between p-5 text-left focus:outline-none',
-              draftPluginsCount === 0 ? 'cursor-default' : 'cursor-pointer',
-            ]"
-          >
-            <div class="flex items-center gap-3">
-              <div class="bg-primary/10 rounded-lg p-2">
-                <PuzzlePieceIcon class="text-primary h-6 w-6" />
-              </div>
-              <div>
-                <h3 class="text-highlighted mb-0.5 text-sm font-bold uppercase">
-                  {{ t('onboarding.pluginsStep.title') }}
-                </h3>
-                <p class="text-muted text-xs">
-                  {{ t('onboarding.summaryStep.pluginsSelected', { count: draftPluginsCount }) }}
-                </p>
-              </div>
-            </div>
+        <Accordion
+          :items="[
+            {
+              value: 'plugins',
+              title: t('onboarding.pluginsStep.title'),
+              disabled: draftPluginsCount === 0,
+            },
+          ]"
+          type="single"
+          collapsible
+          class="border-none"
+          item-class="border-none"
+          trigger-class="pr-4 hover:no-underline [&>svg]:text-primary"
+        >
+          <template #trigger="{ open }">
             <div
-              v-if="draftPluginsCount > 0"
-              class="text-primary hover:text-primary/80 flex items-center gap-2 text-sm font-medium transition-colors"
+              :class="[
+                'flex w-full items-center justify-between px-3 text-left focus:outline-none',
+                draftPluginsCount === 0 ? 'cursor-default' : 'cursor-pointer',
+              ]"
             >
-              <span v-if="!open">{{ t('onboarding.summaryStep.viewSelected') }}</span>
-              <span v-else>{{ t('onboarding.summaryStep.hideSelected') }}</span>
-              <ChevronDownIcon
-                :class="[
-                  open ? 'rotate-180 transform' : '',
-                  'h-5 w-5 transition-transform duration-200',
-                ]"
-              />
+              <div class="flex items-center gap-3">
+                <div class="bg-primary/10 rounded-lg p-2">
+                  <PuzzlePieceIcon class="text-primary h-6 w-6" />
+                </div>
+                <div>
+                  <h3 class="text-highlighted mb-0.5 text-sm font-bold uppercase">
+                    {{ t('onboarding.pluginsStep.title') }}
+                  </h3>
+                  <p class="text-muted text-xs">
+                    {{ t('onboarding.summaryStep.pluginsSelected', { count: draftPluginsCount }) }}
+                  </p>
+                </div>
+              </div>
+              <div
+                v-if="draftPluginsCount > 0"
+                class="text-primary hover:text-primary/80 flex items-center gap-2 text-sm font-medium transition-colors"
+              >
+                <span v-if="!open">{{ t('onboarding.summaryStep.viewSelected') }}</span>
+                <span v-else>{{ t('onboarding.summaryStep.hideSelected') }}</span>
+              </div>
             </div>
-          </DisclosureButton>
-          <transition
-            enter-active-class="transition duration-100 ease-out"
-            enter-from-class="transform scale-95 opacity-0"
-            enter-to-class="transform scale-100 opacity-100"
-            leave-active-class="transition duration-75 ease-out"
-            leave-from-class="transform scale-100 opacity-100"
-            leave-to-class="transform scale-95 opacity-0"
-          >
-            <DisclosurePanel class="px-5 pt-0 pb-5">
+          </template>
+          <template #content>
+            <div class="px-5 pt-0 pb-5">
               <div class="border-muted space-y-2 border-t pt-4">
                 <div v-if="draftPluginsCount === 0" class="text-muted text-sm italic">
                   {{ t('onboarding.summaryStep.noPluginsSelected') }}
@@ -1261,9 +1249,9 @@ const handleBack = () => {
                   </span>
                 </div>
               </div>
-            </DisclosurePanel>
-          </transition>
-        </Disclosure>
+            </div>
+          </template>
+        </Accordion>
       </div>
 
       <div v-if="showBootConfiguration" class="border-muted bg-bg/50 mt-6 rounded-lg border p-5">
@@ -1344,17 +1332,15 @@ const handleBack = () => {
         </p>
       </div>
 
-      <Dialog
-        v-if="showBootDriveWarningDialog"
-        :model-value="showBootDriveWarningDialog"
-        :show-footer="false"
-        :show-close-button="false"
-        size="md"
-        class="max-w-lg"
+      <UModal
+        :open="showBootDriveWarningDialog"
+        :portal="false"
+        :title="t('onboarding.summaryStep.driveWipe.title')"
+        :ui="{ footer: 'justify-end', overlay: 'z-50', content: 'z-50 max-w-lg' }"
+        @update:open="showBootDriveWarningDialog = $event"
       >
-        <div class="space-y-6 p-2">
+        <template #body>
           <div class="space-y-3">
-            <h3 class="text-lg font-semibold">{{ t('onboarding.summaryStep.driveWipe.title') }}</h3>
             <p class="text-muted-foreground text-sm">
               {{ t('onboarding.summaryStep.driveWipe.selectedDrives') }}
             </p>
@@ -1371,59 +1357,45 @@ const handleBack = () => {
               {{ t('onboarding.summaryStep.driveWipe.confirmPrompt') }}
             </p>
           </div>
-          <div class="flex justify-end gap-3">
-            <button
-              type="button"
-              class="border-muted hover:bg-muted rounded-md border px-4 py-2 text-sm font-medium"
-              @click="handleBootDriveWarningCancel"
-            >
-              {{ t('common.cancel') }}
-            </button>
-            <button
-              type="button"
-              class="bg-primary text-primary-foreground hover:bg-primary/90 rounded-md px-4 py-2 text-sm font-medium"
-              @click="handleBootDriveWarningConfirm"
-            >
-              {{ t('onboarding.summaryStep.driveWipe.continue') }}
-            </button>
-          </div>
-        </div>
-      </Dialog>
-
-      <Dialog
-        v-if="showApplyResultDialog"
-        :model-value="showApplyResultDialog"
-        :show-footer="false"
-        :show-close-button="false"
-        size="lg"
-        class="w-[calc(100vw-2rem)] max-w-3xl"
+        </template>
+        <template #footer>
+          <UButton color="neutral" variant="outline" @click="handleBootDriveWarningCancel">
+            {{ t('common.cancel') }}
+          </UButton>
+          <UButton @click="handleBootDriveWarningConfirm">
+            {{ t('onboarding.summaryStep.driveWipe.continue') }}
+          </UButton>
+        </template>
+      </UModal>
+
+      <UModal
+        :open="showApplyResultDialog"
+        :portal="false"
+        :title="applyResultTitle"
+        :description="applyResultMessage"
+        :ui="{
+          footer: 'justify-end',
+          overlay: 'z-50',
+          content: showDiagnosticLogsInResultDialog
+            ? 'z-50 w-[calc(100vw-2rem)] max-w-3xl'
+            : 'z-50 max-w-md',
+        }"
+        @update:open="showApplyResultDialog = $event"
       >
-        <div class="space-y-6 p-2">
-          <div class="space-y-2">
-            <h3 class="text-lg font-semibold">{{ applyResultTitle }}</h3>
-            <p class="text-muted-foreground text-sm">
-              {{ applyResultMessage }}
-            </p>
-          </div>
-
-          <div v-if="showDiagnosticLogsInResultDialog" class="space-y-3">
+        <template v-if="showDiagnosticLogsInResultDialog" #body>
+          <div class="space-y-3">
             <h4 class="text-sm font-semibold tracking-wide uppercase">
               {{ t('onboarding.summaryStep.diagnosticLogs') }}
             </h4>
             <OnboardingConsole :logs="logs" :title="t('onboarding.summaryStep.onboardingDiagnostics')" />
           </div>
-
-          <div class="flex justify-end gap-3">
-            <button
-              type="button"
-              class="bg-primary text-primary-foreground hover:bg-primary/90 rounded-md px-4 py-2 text-sm font-medium"
-              @click="handleApplyResultConfirm"
-            >
-              {{ t('onboarding.summaryStep.ok') }}
-            </button>
-          </div>
-        </div>
-      </Dialog>
+        </template>
+        <template #footer>
+          <UButton @click="handleApplyResultConfirm">
+            {{ t('onboarding.summaryStep.ok') }}
+          </UButton>
+        </template>
+      </UModal>
 
       <!-- Footer -->
       <div
@@ -1432,7 +1404,7 @@ const handleBack = () => {
         <button
           v-if="showBack"
           @click="handleBack"
-          class="text-muted hover:text-toned group flex items-center justify-center gap-2 font-medium transition-colors sm:w-auto sm:justify-start"
+          class="text-muted hover:text-toned group flex items-center justify-center gap-2 font-medium transition-colors disabled:cursor-not-allowed disabled:opacity-50 sm:w-auto sm:justify-start"
           :disabled="isProcessing"
         >
           <ChevronLeftIcon class="h-5 w-5 transition-transform group-hover:-translate-x-0.5" />
diff --git a/web/src/components/Onboarding/store/onboardingModalVisibility.ts b/web/src/components/Onboarding/store/onboardingModalVisibility.ts
index 30824e3c29..b26bd11dce 100644
--- a/web/src/components/Onboarding/store/onboardingModalVisibility.ts
+++ b/web/src/components/Onboarding/store/onboardingModalVisibility.ts
@@ -1,4 +1,4 @@
-import { computed, onMounted, onUnmounted } from 'vue';
+import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { defineStore, storeToRefs } from 'pinia';
 import { useMutation } from '@vue/apollo-composable';
 
@@ -20,6 +20,8 @@ const ONBOARDING_URL_ACTION_OPEN = 'open';
 const ONBOARDING_BYPASS_SHORTCUT_CODE = 'KeyO';
 const ONBOARDING_FORCE_OPEN_EVENT = 'unraid:onboarding:open';
 
+export type OnboardingModalSessionSource = 'automatic' | 'manual';
+
 export const useOnboardingModalStore = defineStore('onboardingModalVisibility', () => {
   const onboardingStore = useOnboardingStore();
   const { shouldOpen, canDisplayOnboardingModal } = storeToRefs(onboardingStore);
@@ -29,6 +31,7 @@ export const useOnboardingModalStore = defineStore('onboardingModalVisibility',
   const { mutate: closeOnboardingMutation } = useMutation(CLOSE_ONBOARDING_MUTATION);
   const { mutate: bypassOnboardingMutation } = useMutation(BYPASS_ONBOARDING_MUTATION);
   const { mutate: resumeOnboardingMutation } = useMutation(RESUME_ONBOARDING_MUTATION);
+  const sessionSource = ref<OnboardingModalSessionSource>('automatic');
 
   const isVisible = computed(
     () => canDisplayOnboardingModal.value && shouldOpen.value && !callbackData.value
@@ -39,6 +42,7 @@ export const useOnboardingModalStore = defineStore('onboardingModalVisibility',
       return false;
     }
 
+    sessionSource.value = 'manual';
     await openOnboardingMutation();
     await refetchOnboarding();
     return true;
@@ -51,6 +55,7 @@ export const useOnboardingModalStore = defineStore('onboardingModalVisibility',
 
     await closeOnboardingMutation();
     await refetchOnboarding();
+    sessionSource.value = 'automatic';
     return true;
   };
 
@@ -63,6 +68,7 @@ export const useOnboardingModalStore = defineStore('onboardingModalVisibility',
   };
 
   const resumeOnboarding = async () => {
+    sessionSource.value = 'manual';
     await resumeOnboardingMutation();
     await refetchOnboarding();
   };
@@ -128,6 +134,7 @@ export const useOnboardingModalStore = defineStore('onboardingModalVisibility',
 
   return {
     isVisible,
+    sessionSource,
     forceOpenModal,
     closeModal,
     bypassOnboarding,
diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index 92e5d8d0bc..ccb74780c6 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -267,7 +267,7 @@
   "onboarding.summaryStep.logs.baselineUnavailable": "Baseline settings unavailable. Continuing in best-effort mode.",
   "onboarding.summaryStep.logs.baselineFallback": "Baseline settings unavailable. Applying trusted defaults + draft values without diff checks.",
   "onboarding.summaryStep.logs.applyingPartnerCustomizations": "Applying partner customizations...",
-  "onboarding.summaryStep.logs.noChanges": "No settings changed. Skipping configuration mutations.",
+  "onboarding.summaryStep.logs.noChanges": "No changes needed. Skipping configuration updates.",
   "onboarding.summaryStep.logs.settingTimezone": "Setting TimeZone to {timeZone}...",
   "onboarding.summaryStep.logs.timezoneUpdated": "TimeZone updated.",
   "onboarding.summaryStep.logs.timezoneErrorContinue": "TimeZone request returned an error, continuing",
@@ -318,6 +318,8 @@
   "onboarding.summaryStep.result.warningsMessage": "Some settings could not be fully applied or verified. You can review and change any setting later from the Unraid Dashboard.",
   "onboarding.summaryStep.result.sshUnverifiedMessage": "Your SSH setting update was submitted, but final state could not be verified yet. You can verify and adjust it later from the Unraid Dashboard.",
   "onboarding.summaryStep.result.bestEffortMessage": "Your onboarding settings were applied. Some operations are best-effort and may take a moment to reflect. You can adjust settings later from the Unraid Dashboard.",
+  "onboarding.summaryStep.result.noChangesTitle": "No Updates Needed",
+  "onboarding.summaryStep.result.noChangesMessage": "There were no onboarding updates to apply, so nothing was changed.",
   "onboarding.summaryStep.result.successTitle": "Setup Applied",
   "onboarding.summaryStep.result.successMessage": "Your onboarding settings were applied successfully.",
   "onboarding.summaryStep.result.failedTitle": "Setup Failed",