diff --git a/apps/nextjs/src/app/[locale]/init/_steps/integrations/docker-discovery-panel.tsx b/apps/nextjs/src/app/[locale]/init/_steps/integrations/docker-discovery-panel.tsx
index 90ac7a68b..dac79c1d0 100644
--- a/apps/nextjs/src/app/[locale]/init/_steps/integrations/docker-discovery-panel.tsx
+++ b/apps/nextjs/src/app/[locale]/init/_steps/integrations/docker-discovery-panel.tsx
@@ -142,7 +142,7 @@ export const DockerDiscoveryIndicator = ({
         </Group>
       </UnstyledButton>
 
-      <Collapse in={expanded}>
+      <Collapse expanded={expanded}>
         <Stack gap="xs" mt="sm">
           {integrations.length > 0 && (
             <Stack gap={4}>
diff --git a/apps/nextjs/src/app/[locale]/init/_steps/integrations/init-integrations.tsx b/apps/nextjs/src/app/[locale]/init/_steps/integrations/init-integrations.tsx
index 3f10fcb43..9657dfe81 100644
--- a/apps/nextjs/src/app/[locale]/init/_steps/integrations/init-integrations.tsx
+++ b/apps/nextjs/src/app/[locale]/init/_steps/integrations/init-integrations.tsx
@@ -4,8 +4,8 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { useRouter } from "next/navigation";
 import {
   ActionIcon,
+  Alert,
   Button,
-  Card,
   Center,
   Collapse,
   Group,
@@ -18,7 +18,7 @@ import {
   Tooltip,
 } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
-import { IconArrowRight, IconSettings } from "@tabler/icons-react";
+import { IconArrowRight, IconInfoCircle, IconSettings } from "@tabler/icons-react";
 
 import { clientApi } from "@homarr/api/client";
 import type { IntegrationKind, UrlTemplateMode } from "@homarr/definitions";
@@ -29,6 +29,7 @@ import { IntegrationAvatar } from "@homarr/ui";
 
 import { NewIntegrationForm } from "~/app/[locale]/manage/integrations/new/_integration-new-form";
 import { IntegrationMultiSelectGrid } from "~/components/integration/integration-multi-select-grid";
+import { InitStepCard } from "../../_components/init-step-card";
 import { DockerDiscoveryIndicator } from "./docker-discovery-panel";
 
 type Phase = "select" | "configure" | "done";
@@ -41,8 +42,6 @@ interface IntegrationDraft {
   source: "manual" | "docker";
 }
 
-const CARD_WIDTH = 64 * 16;
-
 export const InitIntegrations = () => {
   const [phase, setPhase] = useState<Phase>("select");
   const [drafts, setDrafts] = useState<Map<IntegrationKind, IntegrationDraft>>(new Map());
@@ -171,14 +170,14 @@ export const InitIntegrations = () => {
 
   if (phase === "done") {
     return (
-      <Card w={CARD_WIDTH} maw="90vw" withBorder>
+      <InitStepCard>
         <Center py="xl">
           <Stack align="center" gap="md">
             <Loader size="lg" />
             <Text>{t("configure.finishing")}</Text>
           </Stack>
         </Center>
-      </Card>
+      </InitStepCard>
     );
   }
 
@@ -200,7 +199,7 @@ export const InitIntegrations = () => {
   }
 
   return (
-    <Card w={CARD_WIDTH} maw="90vw" withBorder>
+    <InitStepCard>
       <Stack>
         <Text>{t("description")}</Text>
 
@@ -212,32 +211,32 @@ export const InitIntegrations = () => {
           isLoading={isDockerLoading}
         />
 
-        <Stack gap="xs">
-          <Text size="sm" fw={500}>
-            {t("urlTemplate.label")}
-          </Text>
-          <Group gap="sm" grow>
-            <TextInput
-              placeholder={t("urlTemplate.placeholder")}
-              value={baseHost}
-              onChange={(e) => setBaseHost(e.currentTarget.value)}
-            />
-            <SegmentedControl
-              value={urlMode}
-              onChange={(value) => setUrlMode(value as UrlTemplateMode)}
-              data={[
-                { label: t("urlTemplate.mode.subdomain"), value: "subdomain" },
-                { label: t("urlTemplate.mode.hostPort"), value: "hostPort" },
-              ]}
-              style={{ flex: "0 0 auto" }}
-            />
-          </Group>
-          <Text size="xs" c="dimmed">
-            {baseHost
-              ? t("urlTemplate.preview", { example: buildIntegrationUrl("sonarr", baseHost, urlMode) })
-              : t("urlTemplate.hint")}
-          </Text>
-        </Stack>
+        <Alert variant="light" color="blue" icon={<IconInfoCircle />} title={t("urlTemplate.label")}>
+          <Stack gap="xs">
+            <Text size="sm">{t("urlTemplate.hint")}</Text>
+            <Group gap="sm" grow>
+              <TextInput
+                placeholder={t("urlTemplate.placeholder")}
+                value={baseHost}
+                onChange={(e) => setBaseHost(e.currentTarget.value)}
+              />
+              <SegmentedControl
+                value={urlMode}
+                onChange={(value) => setUrlMode(value as UrlTemplateMode)}
+                data={[
+                  { label: t("urlTemplate.mode.subdomain"), value: "subdomain" },
+                  { label: t("urlTemplate.mode.hostPort"), value: "hostPort" },
+                ]}
+                style={{ flex: "0 0 auto" }}
+              />
+            </Group>
+            {baseHost && (
+              <Text size="xs" c="dimmed">
+                {t("urlTemplate.preview", { example: buildIntegrationUrl("sonarr", baseHost, urlMode) })}
+              </Text>
+            )}
+          </Stack>
+        </Alert>
 
         <IntegrationMultiSelectGrid
           selectedKinds={selectedKinds}
@@ -259,7 +258,7 @@ export const InitIntegrations = () => {
           </Button>
         </Group>
       </Stack>
-    </Card>
+    </InitStepCard>
   );
 };
 
@@ -300,7 +299,7 @@ const ConfigurePhase = ({
     : draft?.initialUrl;
 
   return (
-    <Card w={CARD_WIDTH} maw="90vw" withBorder>
+    <InitStepCard>
       <Stack>
         <Group justify="space-between" align="center">
           <Group gap="xs">
@@ -321,7 +320,7 @@ const ConfigurePhase = ({
           </Text>
         </Stack>
 
-        <Collapse in={helpersOpen}>
+        <Collapse expanded={helpersOpen}>
           <Stack
             gap="xs"
             p="xs"
@@ -369,6 +368,6 @@ const ConfigurePhase = ({
           isOnboarding
         />
       </Stack>
-    </Card>
+    </InitStepCard>
   );
 };
diff --git a/apps/nextjs/src/components/integration/integration-multi-select-grid.tsx b/apps/nextjs/src/components/integration/integration-multi-select-grid.tsx
index 97fe9e98d..0c5313ad7 100644
--- a/apps/nextjs/src/components/integration/integration-multi-select-grid.tsx
+++ b/apps/nextjs/src/components/integration/integration-multi-select-grid.tsx
@@ -51,6 +51,7 @@ export const IntegrationMultiSelectGrid = ({
       search={search}
       onSearchChange={setSearch}
       placeholder={`${t("integration.page.list.search")}...`}
+      disableScroll={onboarding}
     >
       {filtered.map((integration) => {
         const isSelected = selectedKinds.has(integration.kind);
diff --git a/packages/ui/src/select-grid-layout.tsx b/packages/ui/src/select-grid-layout.tsx
index 0625873b3..fd7f076fc 100644
--- a/packages/ui/src/select-grid-layout.tsx
+++ b/packages/ui/src/select-grid-layout.tsx
@@ -13,6 +13,7 @@ interface SelectGridLayoutProps {
   onSearchChange: (value: string) => void;
   placeholder: string;
   onSearchKeyDown?: (event: KeyboardEvent<HTMLInputElement>) => void;
+  disableScroll?: boolean;
   children: ReactNode;
 }
 
@@ -21,22 +22,27 @@ export const SelectGridLayout = ({
   onSearchChange,
   placeholder,
   onSearchKeyDown,
+  disableScroll = false,
   children,
-}: SelectGridLayoutProps) => (
-  <Stack>
-    <Input
-      value={search}
-      onChange={(event) => onSearchChange(event.currentTarget.value)}
-      leftSection={<IconSearch />}
-      placeholder={placeholder}
-      data-autofocus
-      onKeyDown={onSearchKeyDown}
-    />
+}: SelectGridLayoutProps) => {
+  const grid = (
+    <SimpleGrid cols={selectGridCols} spacing="sm">
+      {children}
+    </SimpleGrid>
+  );
 
-    <ScrollArea.Autosize mah={selectGridScrollMaxHeight}>
-      <SimpleGrid cols={selectGridCols} spacing="sm">
-        {children}
-      </SimpleGrid>
-    </ScrollArea.Autosize>
-  </Stack>
-);
+  return (
+    <Stack>
+      <Input
+        value={search}
+        onChange={(event) => onSearchChange(event.currentTarget.value)}
+        leftSection={<IconSearch />}
+        placeholder={placeholder}
+        data-autofocus
+        onKeyDown={onSearchKeyDown}
+      />
+
+      {disableScroll ? grid : <ScrollArea.Autosize mah={selectGridScrollMaxHeight}>{grid}</ScrollArea.Autosize>}
+    </Stack>
+  );
+};