diff --git a/components/dashboard/src/admin/License.tsx b/components/dashboard/src/admin/License.tsx
index 92c7a3199af9e4..1586edeef36d05 100644
--- a/components/dashboard/src/admin/License.tsx
+++ b/components/dashboard/src/admin/License.tsx
@@ -17,7 +17,7 @@ import { ReactComponent as LinkSvg } from "../images/external-link.svg";
 import SolidCard from "../components/SolidCard";
 import Card from "../components/Card";
 import { isGitpodIo } from "../utils";
-import { AdminPageHeader } from "./AdminPageHeader";
+import { SettingsLayout } from "./Settings";
 
 export default function License() {
     const { license, setLicense } = useContext(LicenseContext);
@@ -42,54 +42,50 @@ export default function License() {
 
     return (
         <div>
-            <AdminPageHeader title="Admin" subtitle="Configure and manage instance settings.">
-                <div className="app-container mt-8">
-                    <div className="flex flex-row space-x-4">
-                        <Card className="w-72 h-64">
-                            <span>
-                                {licenseLevel}
-                                {paid}
-                                <div className="mt-4 font-semibold text-sm">Available features:</div>
-                                <div className="flex flex-col items-start text-sm">
-                                    {features &&
-                                        features.map((feat: string) => (
-                                            <span className="inline-flex space-x-1">
-                                                {featureList?.includes(feat) ? (
-                                                    <CheckSvg fill="currentColor" className="self-center mt-1" />
-                                                ) : (
-                                                    <XSvg fill="currentColor" className="self-center h-2 mt-1" />
-                                                )}
-                                                <span>{capitalizeInitials(feat)}</span>
-                                            </span>
-                                        ))}
+            <SettingsLayout>
+                <div className="flex flex-row space-x-4">
+                    <Card className="w-72 h-64">
+                        <span>
+                            {licenseLevel}
+                            {paid}
+                            <div className="mt-4 font-semibold text-sm">Available features:</div>
+                            <div className="flex flex-col items-start text-sm">
+                                {features &&
+                                    features.map((feat: string) => (
+                                        <span className="inline-flex space-x-1">
+                                            {featureList?.includes(feat) ? (
+                                                <CheckSvg fill="currentColor" className="self-center mt-1" />
+                                            ) : (
+                                                <XSvg fill="currentColor" className="self-center h-2 mt-1" />
+                                            )}
+                                            <span>{capitalizeInitials(feat)}</span>
+                                        </span>
+                                    ))}
+                            </div>
+                        </span>
+                    </Card>
+                    <SolidCard className="w-72 h-64">
+                        <span>
+                            <div className="my-2">{statusMessage}</div>
+                            <p className="dark:text-gray-500 font-semibold">Registered Users</p>
+                            <span className="dark:text-gray-300 text-lg">{license?.userCount || 0}</span>
+                            <span className="dark:text-gray-500 text-gray-400 pt-1 text-lg"> / {userLimit} </span>
+                            <p className="dark:text-gray-500 pt-2 font-semibold">License Type</p>
+                            <h4 className="dark:text-gray-300 text-lg">{capitalizeInitials(license?.type || "")}</h4>
+                            <a
+                                className="gp-link flex flex-row mr-2 justify-end font-semibold space-x-2 mt-6"
+                                href="https://www.gitpod.io/self-hosted"
+                                target="_blank"
+                            >
+                                <span className="text-sm">Compare Plans</span>
+                                <div className="self-end">
+                                    <LinkSvg />
                                 </div>
-                            </span>
-                        </Card>
-                        <SolidCard className="w-72 h-64">
-                            <span>
-                                <div className="my-2">{statusMessage}</div>
-                                <p className="dark:text-gray-500 font-semibold">Registered Users</p>
-                                <span className="dark:text-gray-300 text-lg">{license?.userCount || 0}</span>
-                                <span className="dark:text-gray-500 text-gray-400 pt-1 text-lg"> / {userLimit} </span>
-                                <p className="dark:text-gray-500 pt-2 font-semibold">License Type</p>
-                                <h4 className="dark:text-gray-300 text-lg">
-                                    {capitalizeInitials(license?.type || "")}
-                                </h4>
-                                <a
-                                    className="gp-link flex flex-row mr-2 justify-end font-semibold space-x-2 mt-6"
-                                    href="https://www.gitpod.io/self-hosted"
-                                    target="_blank"
-                                >
-                                    <span className="text-sm">Compare Plans</span>
-                                    <div className="self-end">
-                                        <LinkSvg />
-                                    </div>
-                                </a>
-                            </span>
-                        </SolidCard>
-                    </div>
+                            </a>
+                        </span>
+                    </SolidCard>
                 </div>
-            </AdminPageHeader>
+            </SettingsLayout>
         </div>
     );
 }
diff --git a/components/dashboard/src/admin/Settings.tsx b/components/dashboard/src/admin/Settings.tsx
index d9320c45631974..16c675693d6ac2 100644
--- a/components/dashboard/src/admin/Settings.tsx
+++ b/components/dashboard/src/admin/Settings.tsx
@@ -4,7 +4,7 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { useContext } from "react";
+import React, { useContext } from "react";
 import { TelemetryData, InstallationAdminSettings } from "@gitpod/gitpod-protocol";
 import { AdminContext } from "../admin-context";
 import CheckBox from "../components/CheckBox";
@@ -12,7 +12,21 @@ import { getGitpodService } from "../service/service";
 import { useEffect, useState } from "react";
 import InfoBox from "../components/InfoBox";
 import { isGitpodIo } from "../utils";
-import { AdminPageHeader } from "./AdminPageHeader";
+import { PageWithSubMenu } from "../components/PageWithSubMenu";
+import { getAdminTabs, getAdminSettingsMenu } from "./admin.routes";
+
+export function SettingsLayout(props: { children: React.ReactNode }) {
+    return (
+        <PageWithSubMenu
+            subMenu={getAdminSettingsMenu()}
+            title="Admin"
+            subtitle="Configure and manage instance settings."
+            tabs={getAdminTabs()}
+        >
+            {props.children}
+        </PageWithSubMenu>
+    );
+}
 
 export default function Settings() {
     const { adminSettings, setAdminSettings } = useContext(AdminContext);
@@ -38,55 +52,53 @@ export default function Settings() {
 
     return (
         <div>
-            <AdminPageHeader title="Admin" subtitle="Configure and manage instance settings.">
-                <div className="app-container mt-8">
-                    <h3>Usage Statistics</h3>
-                    <p className="text-base text-gray-500 pb-4 max-w-2xl">
-                        We collect usage telemetry to gain insights on how you use your Gitpod instance, so we can
-                        provide a better overall experience.
-                    </p>
-                    <p>
-                        <a className="gp-link" href="https://www.gitpod.io/privacy">
-                            Read our Privacy Policy
-                        </a>
-                    </p>
-                    <CheckBox
-                        title="Enable usage telemetry"
-                        desc={
-                            <span>
-                                Enable usage telemetry on your Gitpod instance. A preview of your telemetry is available
-                                below.
-                            </span>
-                        }
-                        checked={adminSettings?.sendTelemetry ?? false}
-                        onChange={(evt) =>
-                            actuallySetTelemetryPrefs({
-                                ...adminSettings,
-                                sendTelemetry: evt.target.checked,
-                            } as InstallationAdminSettings)
-                        }
-                    />
-                    <CheckBox
-                        title="Include customer ID in telemetry"
-                        desc={
-                            <span>
-                                Include an optional customer ID in usage telemetry to provide individualized support.
-                            </span>
-                        }
-                        checked={adminSettings?.sendCustomerID ?? false}
-                        onChange={(evt) =>
-                            actuallySetTelemetryPrefs({
-                                ...adminSettings,
-                                sendCustomerID: evt.target.checked,
-                            } as InstallationAdminSettings)
-                        }
-                    />
-                    <h3 className="mt-4">Telemetry preview</h3>
-                    <InfoBox>
-                        <pre>{JSON.stringify(telemetryData, null, 2)}</pre>
-                    </InfoBox>
-                </div>
-            </AdminPageHeader>
+            <SettingsLayout>
+                <h3>Usage Statistics</h3>
+                <p className="text-base text-gray-500 pb-4 max-w-2xl">
+                    We collect usage telemetry to gain insights on how you use your Gitpod instance, so we can provide a
+                    better overall experience.
+                </p>
+                <p>
+                    <a className="gp-link" href="https://www.gitpod.io/privacy">
+                        Read our Privacy Policy
+                    </a>
+                </p>
+                <CheckBox
+                    title="Enable usage telemetry"
+                    desc={
+                        <span>
+                            Enable usage telemetry on your Gitpod instance. A preview of your telemetry is available
+                            below.
+                        </span>
+                    }
+                    checked={adminSettings?.sendTelemetry ?? false}
+                    onChange={(evt) =>
+                        actuallySetTelemetryPrefs({
+                            ...adminSettings,
+                            sendTelemetry: evt.target.checked,
+                        } as InstallationAdminSettings)
+                    }
+                />
+                <CheckBox
+                    title="Include customer ID in telemetry"
+                    desc={
+                        <span>
+                            Include an optional customer ID in usage telemetry to provide individualized support.
+                        </span>
+                    }
+                    checked={adminSettings?.sendCustomerID ?? false}
+                    onChange={(evt) =>
+                        actuallySetTelemetryPrefs({
+                            ...adminSettings,
+                            sendCustomerID: evt.target.checked,
+                        } as InstallationAdminSettings)
+                    }
+                />
+                <h3 className="mt-4">Telemetry preview</h3>
+                <InfoBox>
+                    <pre>{JSON.stringify(telemetryData, null, 2)}</pre>
+                </InfoBox>
+            </SettingsLayout>
         </div>
     );
 }
diff --git a/components/dashboard/src/admin/admin.routes.ts b/components/dashboard/src/admin/admin.routes.ts
index d809ca032c0963..aeece38de7031d 100644
--- a/components/dashboard/src/admin/admin.routes.ts
+++ b/components/dashboard/src/admin/admin.routes.ts
@@ -28,13 +28,23 @@ export function getAdminTabs(): TabEntry[] {
             title: "Blocked Repositories",
             link: "/admin/blocked-repositories",
         },
-        {
-            title: "License",
-            link: "/admin/license",
-        },
         {
             title: "Settings",
             link: "/admin/settings",
+            alternatives: getAdminSettingsMenu().flatMap((e) => e.link),
+        },
+    ];
+}
+
+export function getAdminSettingsMenu() {
+    return [
+        {
+            title: "General",
+            link: ["/admin/settings"],
+        },
+        {
+            title: "License",
+            link: ["/admin/license"],
         },
     ];
 }
diff --git a/components/dashboard/src/menu/Menu.tsx b/components/dashboard/src/menu/Menu.tsx
index 9b0940542c7cbe..1a1755e1fa78ef 100644
--- a/components/dashboard/src/menu/Menu.tsx
+++ b/components/dashboard/src/menu/Menu.tsx
@@ -68,7 +68,15 @@ export default function Menu() {
     const adminMenu: Entry = {
         title: "Admin",
         link: "/admin",
-        alternatives: [...getAdminTabs().map((entry) => entry.link)],
+        alternatives: [
+            ...getAdminTabs().reduce(
+                (prevEntry, currEntry) =>
+                    currEntry.alternatives
+                        ? [...prevEntry, ...currEntry.alternatives, currEntry.link]
+                        : [...prevEntry, currEntry.link],
+                [] as string[],
+            ),
+        ],
     };
 
     const handleFeedbackFormClick = () => {