diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eab44266804..57a52f14260 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - run: pnpm install --frozen-lockfile
       - run: pnpm run --filter ${{ matrix.package }} lint
@@ -49,7 +49,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - run: pnpm install --frozen-lockfile
       - run: pnpm run --filter @linode/validation build
@@ -69,7 +69,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - run: pnpm install --frozen-lockfile
       - uses: actions/download-artifact@v4
@@ -89,7 +89,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - uses: actions/download-artifact@v4
         with:
@@ -113,7 +113,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - run: pnpm install --frozen-lockfile
 
@@ -154,7 +154,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - uses: actions/download-artifact@v4
         with:
@@ -177,7 +177,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - run: pnpm install --frozen-lockfile
       - run: pnpm run --filter @linode/search test
@@ -192,7 +192,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - run: pnpm install --frozen-lockfile
       - run: pnpm run --filter @linode/ui test
@@ -208,7 +208,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - uses: actions/download-artifact@v4
         with:
@@ -228,7 +228,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - uses: actions/download-artifact@v4
         with:
@@ -248,7 +248,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - uses: actions/download-artifact@v4
         with:
@@ -272,7 +272,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - run: pnpm install --frozen-lockfile
       - run: pnpm run --filter @linode/ui typecheck
@@ -288,7 +288,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - uses: actions/download-artifact@v4
         with:
@@ -308,7 +308,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - uses: actions/download-artifact@v4
         with:
@@ -328,7 +328,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - uses: actions/download-artifact@v4
         with:
@@ -352,7 +352,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - uses: actions/download-artifact@v4
         with:
@@ -381,7 +381,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - uses: actions/download-artifact@v4
         with:
@@ -419,7 +419,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - uses: actions/download-artifact@v4
         with:
diff --git a/.github/workflows/coverage_badge.yml b/.github/workflows/coverage_badge.yml
index 639f21e3e0d..44d5902256d 100644
--- a/.github/workflows/coverage_badge.yml
+++ b/.github/workflows/coverage_badge.yml
@@ -21,10 +21,9 @@ jobs:
           run_install: false
           version: 10
 
-      - name: Use Node.js v20.17 LTS
-        uses: actions/setup-node@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
 
       - name: Install Dependencies
diff --git a/.github/workflows/e2e_schedule_and_push.yml b/.github/workflows/e2e_schedule_and_push.yml
index ba726631bbb..bf66d7cd3eb 100644
--- a/.github/workflows/e2e_schedule_and_push.yml
+++ b/.github/workflows/e2e_schedule_and_push.yml
@@ -43,7 +43,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
       - run: |
           echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
       - run: |
diff --git a/.github/workflows/eslint_review.yml b/.github/workflows/eslint_review.yml
index 44430dfec58..cb1424cd786 100644
--- a/.github/workflows/eslint_review.yml
+++ b/.github/workflows/eslint_review.yml
@@ -18,7 +18,7 @@ jobs:
           version: 10
       - uses: actions/setup-node@v4
         with:
-          node-version: "20.17"
+          node-version-file: "package.json"
           cache: "pnpm"
       - run: pnpm install
       - uses: abailly-akamai/action-eslint@8ad68ba04fa60924ef7607b07deb5989f38f5ed6 # v1.0.2
diff --git a/.nvmrc b/.nvmrc
index 65da8ce3917..6e77d0a7496 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.17
+22.19
diff --git a/CODEOWNERS b/CODEOWNERS
index 8b6b2774004..b5eef9f001a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,5 +1,50 @@
-# Default code owners
-* @linode/frontend
+# Default Team
+# This is a catch all: any change that is not captured by a codeowner rule
+# below will result in`@linode/cloud-manager-code-reviewers` being assigned
+# for PR review.
+* @linode/cloud-manager-code-reviewers
 
-# Frontend SDET code owners for Cypress tests
+# Cypress E2E Tests
+# This is also a catch all: any change to E2E tests outside of the team-owned
+# files and directories will result in `@linode/frontend-sdet` being assigned
+# for PR review.
 /packages/manager/cypress/ @linode/frontend-sdet
+
+# UI Package
+/packages/ui @linode/ui-platform-design-systems
+
+# Metrics & Alerts
+/packages/api-v4/src/cloudpulse @linode/metrics-alerts
+/packages/validation/src/cloudpulse.schema.ts @linode/metrics-alerts
+/packages/manager/cypress/e2e/core/cloudpulse @linode/metrics-alerts
+/packages/manager/cypress/support/util/cloudpulse.ts @linode/metrics-alerts
+/packages/manager/cypress/support/constants/cloudpulse.ts @linode/metrics-alerts
+/packages/manager/cypress/support/intercepts/cloudpulse.ts @linode/metrics-alerts
+/packages/manager/src/routes/alerts @linode/metrics-alerts
+/packages/manager/src/routes/metrics @linode/metrics-alerts
+/packages/manager/src/factories/cloudpulse @linode/metrics-alerts
+/packages/manager/src/features/CloudPulse @linode/metrics-alerts
+/packages/manager/src/queries/cloudpulse @linode/metrics-alerts
+
+# IAM
+/packages/api-v4/src/iam @linode/iam
+/packages/manager/src/routes/IAM @linode/iam
+/packages/manager/cypress/component/features/IAM @linode/iam
+/packages/queries/src/iam @linode/iam
+/packages/manager/src/features/IAM @linode/iam
+/packages/manager/src/mocks/presets/crud/seeds/delegation.ts @linode/iam
+/packages/manager/src/mocks/presets/crud/handlers/delegation.ts @linode/iam
+/packages/manager/src/mocks/presets/crud/delegation.ts @linode/iam
+/packages/utilities/src/factories/delegation.ts @linode/iam
+
+# DBaaS
+/packages/manager/src/features/Databases @linode/dbaas-ui
+/packages/manager/src/routes/databases @linode/dbaas-ui
+/packages/manager/src/queries/databases @linode/dbaas-ui
+/packages/manager/src/factories/databases.ts @linode/dbaas-ui
+/packages/queries/src/databases @linode/dbaas-ui
+/packages/api-v4/src/databases @linode/dbaas-ui
+/packages/validation/src/databases.schema.ts @linode/dbaas-ui
+/packages/manager/cypress/e2e/core/databases @linode/dbaas-ui
+/packages/manager/cypress/support/constants/databases.ts @linode/dbaas-ui
+/packages/manager/cypress/support/intercepts/databases.ts @linode/dbaas-ui
diff --git a/docs/GETTING_STARTED.md b/docs/GETTING_STARTED.md
index 3e36f22e05f..b4b99f6102a 100644
--- a/docs/GETTING_STARTED.md
+++ b/docs/GETTING_STARTED.md
@@ -7,17 +7,17 @@
 5. After your OAuth App has been created, copy the ID (not the secret).
 6. In `packages/manager`, copy the contents of `.env.example` and paste them into a new file called `.env`.
 7. In `.env` set `REACT_APP_CLIENT_ID` to the ID from step 5.
-8. Install Node.js 20.17 LTS. We recommend using [Volta](https://volta.sh/):
+8. Install Node.js 22.19 LTS. We recommend using [Volta](https://volta.sh/):
 
    ```bash
    curl https://get.volta.sh | bash
 
    ## Add volta to your .*rc file, or open a new terminal window.
 
-   volta install node@20.17
+   volta install node@22.19
 
    node --version
-   ## v20.17.0
+   ## v22.19.0
    ```
 
 9. Install pnpm v10 using Volta or view the [pnpm docs](https://pnpm.io/installation) for more installation methods
diff --git a/package.json b/package.json
index 31a477cbe00..c2fa7452a5f 100644
--- a/package.json
+++ b/package.json
@@ -72,11 +72,13 @@
   "resolutions": {
     "semver": "^7.5.2",
     "yaml": "^2.3.0",
-    "form-data": "^4.0.4"
+    "form-data": "^4.0.4",
+    "brace-expansion@>=1.0.0 <=1.1.11": ">=1.1.12",
+    "brace-expansion@>=2.0.0 <=2.0.1": ">=2.0.2"
   },
   "version": "0.0.0",
   "volta": {
-    "node": "20.17.0"
+    "node": "22.19.0"
   },
   "workspaces": {
     "packages": [
diff --git a/packages/api-v4/CHANGELOG.md b/packages/api-v4/CHANGELOG.md
index 7ce5c1d5d85..d31de352b07 100644
--- a/packages/api-v4/CHANGELOG.md
+++ b/packages/api-v4/CHANGELOG.md
@@ -1,3 +1,24 @@
+## [2025-10-07] - v0.150.0
+
+
+### Added:
+
+- IAM Parent/Child - Implement new delegation types and endpoints definitions ([#12895](https://github.com/linode/manager/pull/12895))
+- CloudPulse-Metrics: Update `CloudPulseServiceType` and constant `capabilityServiceTypeMapping` at `types.ts` ([#12905](https://github.com/linode/manager/pull/12905))
+- Region VPC availability types and endpoints ([#12919](https://github.com/linode/manager/pull/12919))
+
+### Changed:
+
+- All kubernetes endpoints from `/v4` to `/v4beta`; clean up duplicate endpoints ([#12867](https://github.com/linode/manager/pull/12867))
+- CloudPulse-Alerts: Update `CloudPulseAlertsPayload` in types.ts ([#12870](https://github.com/linode/manager/pull/12870))
+- ACLP: update `group_by` property to optional for `Widgets` and `CloudPulseMetricRequest` interface ([#12887](https://github.com/linode/manager/pull/12887))
+- CloudPulse-Metrics: Update `CloudPulseMetricsRequest` and `JWETokenPayLoad` type at `types.ts` ([#12912](https://github.com/linode/manager/pull/12912))
+
+### Upcoming Features:
+
+- Update Destination's details interface ([#12851](https://github.com/linode/manager/pull/12851))
+- Logs Delivery Stream details type update and UpdateDestinationPayload update according to API docs ([#12898](https://github.com/linode/manager/pull/12898))
+
 ## [2025-09-23] - v0.149.0
 
 ### Added:
diff --git a/packages/api-v4/package.json b/packages/api-v4/package.json
index 2f80884cfe8..559860d778f 100644
--- a/packages/api-v4/package.json
+++ b/packages/api-v4/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@linode/api-v4",
-  "version": "0.149.0",
+  "version": "0.150.0",
   "homepage": "https://github.com/linode/manager/tree/develop/packages/api-v4",
   "bugs": {
     "url": "https://github.com/linode/manager/issues"
diff --git a/packages/api-v4/src/cloudpulse/alerts.ts b/packages/api-v4/src/cloudpulse/alerts.ts
index ea31bdfdff1..4518b92c486 100644
--- a/packages/api-v4/src/cloudpulse/alerts.ts
+++ b/packages/api-v4/src/cloudpulse/alerts.ts
@@ -132,9 +132,9 @@ export const updateServiceAlerts = (
   entityId: string,
   payload: CloudPulseAlertsPayload,
 ) =>
-  Request<{}>(
+  Request<Alert>(
     setURL(
-      `${API_ROOT}/${serviceType}/instances/${encodeURIComponent(entityId)}`,
+      `${API_ROOT}/monitor/services/${encodeURIComponent(serviceType)}/alert-definitions/${encodeURIComponent(entityId)}`,
     ),
     setMethod('PUT'),
     setData(payload),
diff --git a/packages/api-v4/src/cloudpulse/types.ts b/packages/api-v4/src/cloudpulse/types.ts
index 8e2974fb5a2..110fea9476a 100644
--- a/packages/api-v4/src/cloudpulse/types.ts
+++ b/packages/api-v4/src/cloudpulse/types.ts
@@ -7,8 +7,8 @@ export type CloudPulseServiceType =
   | 'dbaas'
   | 'firewall'
   | 'linode'
-  | 'nodebalancer';
-
+  | 'nodebalancer'
+  | 'objectstorage';
 export type AlertClass = 'dedicated' | 'shared';
 export type DimensionFilterOperatorType =
   | 'endswith'
@@ -72,7 +72,7 @@ export interface Widgets {
   color: string;
   entity_ids: string[];
   filters: Filters[];
-  group_by: string[];
+  group_by?: string[];
   label: string;
   metric: string;
   namespace_id: number;
@@ -133,7 +133,7 @@ export interface Dimension {
 }
 
 export interface JWETokenPayLoad {
-  entity_ids: number[];
+  entity_ids?: number[];
 }
 
 export interface JWEToken {
@@ -148,9 +148,10 @@ export interface Metric {
 export interface CloudPulseMetricsRequest {
   absolute_time_duration: DateTimeWithPreset | undefined;
   associated_entity_region?: string;
-  entity_ids: number[];
+  entity_ids: number[] | string[];
+  entity_region?: string;
   filters?: Filters[];
-  group_by: string[];
+  group_by?: string[];
   metrics: Metric[];
   relative_time_duration: TimeDuration | undefined;
   time_granularity: TimeGranularity | undefined;
@@ -375,6 +376,7 @@ export const capabilityServiceTypeMapping: Record<
   dbaas: 'Managed Databases',
   nodebalancer: 'NodeBalancers',
   firewall: 'Cloud Firewall',
+  objectstorage: 'Object Storage',
 };
 
 /**
@@ -389,10 +391,10 @@ export interface CloudPulseAlertsPayload {
    * Array of enabled system alert IDs in ACLP (Beta) mode.
    * Only included in Beta mode.
    */
-  system?: number[];
+  system_alerts?: number[];
   /**
    * Array of enabled user alert IDs in ACLP (Beta) mode.
    * Only included in Beta mode.
    */
-  user?: number[];
+  user_alerts?: number[];
 }
diff --git a/packages/api-v4/src/delivery/destinations.ts b/packages/api-v4/src/delivery/destinations.ts
index 7069a23288b..1dcd4d6442c 100644
--- a/packages/api-v4/src/delivery/destinations.ts
+++ b/packages/api-v4/src/delivery/destinations.ts
@@ -1,4 +1,7 @@
-import { destinationSchema } from '@linode/validation';
+import {
+  createDestinationSchema,
+  updateDestinationSchema,
+} from '@linode/validation';
 
 import { BETA_API_ROOT } from '../constants';
 import Request, {
@@ -49,7 +52,7 @@ export const getDestinations = (params?: Params, filter?: Filter) =>
  */
 export const createDestination = (data: CreateDestinationPayload) =>
   Request<Destination>(
-    setData(data, destinationSchema),
+    setData(data, createDestinationSchema),
     setURL(`${BETA_API_ROOT}/monitor/streams/destinations`),
     setMethod('POST'),
   );
@@ -65,7 +68,7 @@ export const updateDestination = (
   data: UpdateDestinationPayload,
 ) =>
   Request<Destination>(
-    setData(data, destinationSchema),
+    setData(data, updateDestinationSchema),
     setURL(
       `${BETA_API_ROOT}/monitor/streams/destinations/${encodeURIComponent(destinationId)}`,
     ),
@@ -92,7 +95,7 @@ export const deleteDestination = (destinationId: number) =>
  */
 export const verifyDestination = (data: CreateDestinationPayload) =>
   Request<Destination>(
-    setData(data, destinationSchema),
+    setData(data, createDestinationSchema),
     setURL(`${BETA_API_ROOT}/monitor/streams/destinations/verify`),
     setMethod('POST'),
   );
diff --git a/packages/api-v4/src/delivery/types.ts b/packages/api-v4/src/delivery/types.ts
index 15b3129fdd3..b9e6fbc48f4 100644
--- a/packages/api-v4/src/delivery/types.ts
+++ b/packages/api-v4/src/delivery/types.ts
@@ -21,7 +21,7 @@ export interface AuditData {
 
 export interface Stream extends AuditData {
   destinations: Destination[];
-  details: StreamDetails;
+  details: StreamDetailsType;
   id: number;
   label: string;
   primary_destination_id: number;
@@ -36,6 +36,8 @@ export interface StreamDetails {
   is_auto_add_all_clusters_enabled?: boolean;
 }
 
+export type StreamDetailsType = null | StreamDetails;
+
 export const destinationType = {
   CustomHttps: 'custom_https',
   LinodeObjectStorage: 'linode_object_storage',
@@ -103,7 +105,7 @@ interface CustomHeader {
 
 export interface CreateStreamPayload {
   destinations: number[];
-  details: StreamDetails;
+  details?: StreamDetailsType;
   label: string;
   status?: StreamStatus;
   type: StreamType;
@@ -111,23 +113,31 @@ export interface CreateStreamPayload {
 
 export interface UpdateStreamPayload {
   destinations: number[];
-  details: StreamDetails;
+  details?: StreamDetailsType;
   label: string;
   status: StreamStatus;
-  type: StreamType;
 }
 
 export interface UpdateStreamPayloadWithId extends UpdateStreamPayload {
   id: number;
 }
 
+export interface LinodeObjectStorageDetailsPayload
+  extends Omit<LinodeObjectStorageDetails, 'path'> {
+  path?: string;
+}
+
+export type DestinationDetailsPayload =
+  | CustomHTTPsDetails
+  | LinodeObjectStorageDetailsPayload;
+
 export interface CreateDestinationPayload {
-  details: CustomHTTPsDetails | LinodeObjectStorageDetails;
+  details: DestinationDetailsPayload;
   label: string;
   type: DestinationType;
 }
 
-export type UpdateDestinationPayload = CreateDestinationPayload;
+export type UpdateDestinationPayload = Omit<CreateDestinationPayload, 'type'>;
 
 export interface UpdateDestinationPayloadWithId
   extends UpdateDestinationPayload {
diff --git a/packages/api-v4/src/iam/delegation.ts b/packages/api-v4/src/iam/delegation.ts
new file mode 100644
index 00000000000..dba6dcc0016
--- /dev/null
+++ b/packages/api-v4/src/iam/delegation.ts
@@ -0,0 +1,107 @@
+import { BETA_API_ROOT } from '../constants';
+import Request, { setData, setMethod, setParams, setURL } from '../request';
+
+import type { Account } from '../account';
+import type { Token } from '../profile';
+import type { ResourcePage as Page } from '../types';
+import type {
+  ChildAccount,
+  ChildAccountWithDelegates,
+  GetChildAccountDelegatesParams,
+  GetChildAccountsIamParams,
+  GetDelegatedChildAccountsForUserParams,
+  GetMyDelegatedChildAccountsParams,
+  UpdateChildAccountDelegatesParams,
+} from './delegation.types';
+import type { IamUserRoles } from './types';
+
+export const getChildAccountsIam = ({
+  params,
+  users,
+}: GetChildAccountsIamParams) =>
+  users
+    ? Request<Page<ChildAccountWithDelegates>>(
+        setURL(`${BETA_API_ROOT}/iam/delegation/child-accounts?users=true`),
+        setMethod('GET'),
+        setParams({ ...params }),
+      )
+    : Request<Page<ChildAccount>>(
+        setURL(`${BETA_API_ROOT}/iam/delegation/child-accounts`),
+        setMethod('GET'),
+        setParams({ ...params }),
+      );
+
+export const getDelegatedChildAccountsForUser = ({
+  username,
+  params,
+}: GetDelegatedChildAccountsForUserParams) =>
+  Request<Page<ChildAccount>>(
+    setURL(
+      `${BETA_API_ROOT}/iam/delegation/users/${encodeURIComponent(username)}/child-accounts`,
+    ),
+    setMethod('GET'),
+    setParams(params),
+  );
+
+export const getChildAccountDelegates = ({
+  euuid,
+  params,
+}: GetChildAccountDelegatesParams) =>
+  Request<Page<string>>(
+    setURL(
+      `${BETA_API_ROOT}/iam/delegation/child-accounts/${encodeURIComponent(euuid)}/users`,
+    ),
+    setMethod('GET'),
+    setParams(params),
+  );
+
+export const updateChildAccountDelegates = ({
+  euuid,
+  data,
+}: UpdateChildAccountDelegatesParams) =>
+  Request<Page<string>>(
+    setURL(
+      `${BETA_API_ROOT}/iam/delegation/child-accounts/${encodeURIComponent(euuid)}/users`,
+    ),
+    setMethod('PUT'),
+    setData(data),
+  );
+
+export const getMyDelegatedChildAccounts = ({
+  params,
+}: GetMyDelegatedChildAccountsParams) =>
+  Request<Page<Account>>(
+    setURL(`${BETA_API_ROOT}/iam/delegation/profile/child-accounts`),
+    setMethod('GET'),
+    setParams(params),
+  );
+
+export const getDelegatedChildAccount = ({ euuid }: { euuid: string }) =>
+  Request<Account>(
+    setURL(
+      `${BETA_API_ROOT}/iam/delegation/profile/child-accounts/${encodeURIComponent(euuid)}`,
+    ),
+    setMethod('GET'),
+  );
+
+export const generateChildAccountToken = ({ euuid }: { euuid: string }) =>
+  Request<Token>(
+    setURL(
+      `${BETA_API_ROOT}/iam/delegation/profile/child-accounts/${encodeURIComponent(euuid)}/token`,
+    ),
+    setMethod('POST'),
+    setData(euuid),
+  );
+
+export const getDefaultDelegationAccess = () =>
+  Request<IamUserRoles>(
+    setURL(`${BETA_API_ROOT}/iam/delegation/default-role-permissions`),
+    setMethod('GET'),
+  );
+
+export const updateDefaultDelegationAccess = (data: IamUserRoles) =>
+  Request<IamUserRoles>(
+    setURL(`${BETA_API_ROOT}/iam/delegation/default-role-permissions`),
+    setMethod('PUT'),
+    setData(data),
+  );
diff --git a/packages/api-v4/src/iam/delegation.types.ts b/packages/api-v4/src/iam/delegation.types.ts
new file mode 100644
index 00000000000..2eafc480b7a
--- /dev/null
+++ b/packages/api-v4/src/iam/delegation.types.ts
@@ -0,0 +1,34 @@
+import type { Params } from 'src/types';
+
+export interface ChildAccount {
+  company: string;
+  euuid: string;
+}
+
+export interface GetChildAccountsIamParams {
+  params?: Params;
+  users?: boolean;
+}
+
+export interface ChildAccountWithDelegates extends ChildAccount {
+  users: string[];
+}
+
+export interface GetMyDelegatedChildAccountsParams {
+  params?: Params;
+}
+
+export interface GetDelegatedChildAccountsForUserParams {
+  params?: Params;
+  username: string;
+}
+
+export interface GetChildAccountDelegatesParams {
+  euuid: string;
+  params?: Params;
+}
+
+export interface UpdateChildAccountDelegatesParams {
+  data: string[];
+  euuid: string;
+}
diff --git a/packages/api-v4/src/iam/index.ts b/packages/api-v4/src/iam/index.ts
index 8442040a86a..9bc43a8eb93 100644
--- a/packages/api-v4/src/iam/index.ts
+++ b/packages/api-v4/src/iam/index.ts
@@ -1,3 +1,5 @@
-export * from './iam';
+export * from './delegation';
+export * from './delegation.types';
 
+export * from './iam';
 export * from './types';
diff --git a/packages/api-v4/src/kubernetes/kubernetes.ts b/packages/api-v4/src/kubernetes/kubernetes.ts
index 8b61b41caa3..18b49bd7fbc 100644
--- a/packages/api-v4/src/kubernetes/kubernetes.ts
+++ b/packages/api-v4/src/kubernetes/kubernetes.ts
@@ -1,6 +1,6 @@
 import { createKubeClusterSchema } from '@linode/validation/lib/kubernetes.schema';
 
-import { API_ROOT, BETA_API_ROOT } from '../constants';
+import { BETA_API_ROOT } from '../constants';
 import Request, {
   setData,
   setMethod,
@@ -24,22 +24,9 @@ import type {
 /**
  * getKubernetesClusters
  *
- * Gets a list of a user's Kubernetes clusters
- */
-export const getKubernetesClusters = (params?: Params, filters?: Filter) =>
-  Request<Page<KubernetesCluster>>(
-    setMethod('GET'),
-    setParams(params),
-    setXFilter(filters),
-    setURL(`${API_ROOT}/lke/clusters`),
-  );
-
-/**
- * getKubernetesClustersBeta
- *
  * Gets a list of a user's Kubernetes clusters from beta API
  */
-export const getKubernetesClustersBeta = (params?: Params, filters?: Filter) =>
+export const getKubernetesClusters = (params?: Params, filters?: Filter) =>
   Request<Page<KubernetesCluster>>(
     setMethod('GET'),
     setParams(params),
@@ -50,49 +37,23 @@ export const getKubernetesClustersBeta = (params?: Params, filters?: Filter) =>
 /**
  * getKubernetesCluster
  *
- * Return details about a single Kubernetes cluster
- */
-export const getKubernetesCluster = (clusterID: number) =>
-  Request<KubernetesCluster>(
-    setMethod('GET'),
-    setURL(`${API_ROOT}/lke/clusters/${encodeURIComponent(clusterID)}`),
-  );
-
-/**
- * getKubernetesClusterBeta
- *
  * Return details about a single Kubernetes cluster from beta API
  */
-export const getKubernetesClusterBeta = (clusterID: number) =>
+export const getKubernetesCluster = (clusterID: number) =>
   Request<KubernetesCluster>(
     setMethod('GET'),
     setURL(`${BETA_API_ROOT}/lke/clusters/${encodeURIComponent(clusterID)}`),
   );
 
 /**
- * createKubernetesClusters
- *
- * Create a new cluster.
- */
-export const createKubernetesCluster = (data: CreateKubeClusterPayload) => {
-  return Request<KubernetesCluster>(
-    setMethod('POST'),
-    setURL(`${API_ROOT}/lke/clusters`),
-    setData(data, createKubeClusterSchema),
-  );
-};
-
-/**
- * createKubernetesClustersBeta
+ * createKubernetesCluster
  *
  * Create a new cluster with the beta API:
  * 1. When the feature flag for APL is enabled and APL is set to enabled in the UI
  * 2. When the LKE-E feature is enabled
  *
- * duplicated function of createKubernetesCluster
- * necessary to call BETA_API_ROOT in a separate function based on feature flag
  */
-export const createKubernetesClusterBeta = (data: CreateKubeClusterPayload) => {
+export const createKubernetesCluster = (data: CreateKubeClusterPayload) => {
   return Request<KubernetesCluster>(
     setMethod('POST'),
     setURL(`${BETA_API_ROOT}/lke/clusters`),
@@ -111,7 +72,7 @@ export const updateKubernetesCluster = (
 ) =>
   Request<KubernetesCluster>(
     setMethod('PUT'),
-    setURL(`${API_ROOT}/lke/clusters/${encodeURIComponent(clusterID)}`),
+    setURL(`${BETA_API_ROOT}/lke/clusters/${encodeURIComponent(clusterID)}`),
     setData(data),
   );
 
@@ -123,7 +84,7 @@ export const updateKubernetesCluster = (
 export const deleteKubernetesCluster = (clusterID: number) =>
   Request<{}>(
     setMethod('DELETE'),
-    setURL(`${API_ROOT}/lke/clusters/${encodeURIComponent(clusterID)}`),
+    setURL(`${BETA_API_ROOT}/lke/clusters/${encodeURIComponent(clusterID)}`),
   );
 
 /**
@@ -138,7 +99,7 @@ export const getKubeConfig = (clusterId: number) =>
   Request<KubeConfigResponse>(
     setMethod('GET'),
     setURL(
-      `${API_ROOT}/lke/clusters/${encodeURIComponent(clusterId)}/kubeconfig`,
+      `${BETA_API_ROOT}/lke/clusters/${encodeURIComponent(clusterId)}/kubeconfig`,
     ),
   );
 
@@ -153,7 +114,7 @@ export const resetKubeConfig = (clusterId: number) =>
   Request<{}>(
     setMethod('DELETE'),
     setURL(
-      `${API_ROOT}/lke/clusters/${encodeURIComponent(clusterId)}/kubeconfig`,
+      `${BETA_API_ROOT}/lke/clusters/${encodeURIComponent(clusterId)}/kubeconfig`,
     ),
   );
 
@@ -168,16 +129,16 @@ export const getKubernetesVersions = (params?: Params, filters?: Filter) =>
     setMethod('GET'),
     setXFilter(filters),
     setParams(params),
-    setURL(`${API_ROOT}/lke/versions`),
+    setURL(`${BETA_API_ROOT}/lke/versions`),
   );
 
-/** getKubernetesTieredVersionsBeta
+/** getKubernetesTieredVersions
  *
  * Returns a paginated list of available Kubernetes tiered versions from the beta API.
  *
  */
 
-export const getKubernetesTieredVersionsBeta = (
+export const getKubernetesTieredVersions = (
   tier: string,
   params?: Params,
   filters?: Filter,
@@ -198,19 +159,16 @@ export const getKubernetesTieredVersionsBeta = (
 export const getKubernetesVersion = (versionID: string) =>
   Request<KubernetesVersion>(
     setMethod('GET'),
-    setURL(`${API_ROOT}/lke/versions/${encodeURIComponent(versionID)}`),
+    setURL(`${BETA_API_ROOT}/lke/versions/${encodeURIComponent(versionID)}`),
   );
 
-/** getKubernetesTieredVersionBeta
+/** getKubernetesTieredVersion
  *
  * Returns a single tiered Kubernetes version by ID from the beta API.
  *
  */
 
-export const getKubernetesTieredVersionBeta = (
-  tier: string,
-  versionID: string,
-) =>
+export const getKubernetesTieredVersion = (tier: string, versionID: string) =>
   Request<KubernetesTieredVersion>(
     setMethod('GET'),
     setURL(
@@ -236,7 +194,7 @@ export const getKubernetesClusterEndpoints = (
     setXFilter(filters),
     setParams(params),
     setURL(
-      `${API_ROOT}/lke/clusters/${encodeURIComponent(clusterID)}/api-endpoints`,
+      `${BETA_API_ROOT}/lke/clusters/${encodeURIComponent(clusterID)}/api-endpoints`,
     ),
   );
 
@@ -249,7 +207,7 @@ export const getKubernetesClusterDashboard = (clusterID: number) =>
   Request<KubernetesDashboardResponse>(
     setMethod('GET'),
     setURL(
-      `${API_ROOT}/lke/clusters/${encodeURIComponent(clusterID)}/dashboard`,
+      `${BETA_API_ROOT}/lke/clusters/${encodeURIComponent(clusterID)}/dashboard`,
     ),
   );
 
@@ -262,19 +220,9 @@ export const getKubernetesClusterDashboard = (clusterID: number) =>
 export const recycleClusterNodes = (clusterID: number) =>
   Request<{}>(
     setMethod('POST'),
-    setURL(`${API_ROOT}/lke/clusters/${encodeURIComponent(clusterID)}/recycle`),
-  );
-
-/**
- * getKubernetesTypes
- *
- * Returns a paginated list of available Kubernetes types; used for dynamic pricing.
- */
-export const getKubernetesTypes = (params?: Params) =>
-  Request<Page<PriceType>>(
-    setURL(`${API_ROOT}/lke/types`),
-    setMethod('GET'),
-    setParams(params),
+    setURL(
+      `${BETA_API_ROOT}/lke/clusters/${encodeURIComponent(clusterID)}/recycle`,
+    ),
   );
 
 /**
@@ -282,7 +230,7 @@ export const getKubernetesTypes = (params?: Params) =>
  *
  * Returns a paginated list of available Kubernetes types from beta API; used for dynamic pricing.
  */
-export const getKubernetesTypesBeta = (params?: Params) =>
+export const getKubernetesTypes = (params?: Params) =>
   Request<Page<PriceType>>(
     setURL(`${BETA_API_ROOT}/lke/types`),
     setMethod('GET'),
@@ -298,7 +246,7 @@ export const getKubernetesClusterControlPlaneACL = (clusterId: number) =>
   Request<KubernetesControlPlaneACLPayload>(
     setMethod('GET'),
     setURL(
-      `${API_ROOT}/lke/clusters/${encodeURIComponent(
+      `${BETA_API_ROOT}/lke/clusters/${encodeURIComponent(
         clusterId,
       )}/control_plane_acl`,
     ),
@@ -316,7 +264,7 @@ export const updateKubernetesClusterControlPlaneACL = (
   Request<KubernetesControlPlaneACLPayload>(
     setMethod('PUT'),
     setURL(
-      `${API_ROOT}/lke/clusters/${encodeURIComponent(
+      `${BETA_API_ROOT}/lke/clusters/${encodeURIComponent(
         clusterID,
       )}/control_plane_acl`,
     ),
diff --git a/packages/api-v4/src/regions/regions.ts b/packages/api-v4/src/regions/regions.ts
index 19ac6b8ca49..f217d0555b8 100644
--- a/packages/api-v4/src/regions/regions.ts
+++ b/packages/api-v4/src/regions/regions.ts
@@ -3,7 +3,7 @@ import Request, { setMethod, setParams, setURL, setXFilter } from '../request';
 import { Region } from './types';
 
 import type { Filter, ResourcePage as Page, Params } from '../types';
-import type { RegionAvailability } from './types';
+import type { RegionAvailability, RegionVPCAvailability } from './types';
 
 /**
  * getRegions
@@ -67,3 +67,29 @@ export const getRegionAvailability = (regionId: string) =>
     ),
     setMethod('GET'),
   );
+
+/**
+ * getRegionsVPCAvailabilities
+ *
+ * Returns the availability of VPC IPv6 prefix lengths for all regions.
+ */
+export const getRegionsVPCAvailabilities = (params?: Params, filter?: Filter) =>
+  Request<Page<RegionVPCAvailability>>(
+    setURL(`${BETA_API_ROOT}/regions/vpc-availability`),
+    setMethod('GET'),
+    setParams(params),
+    setXFilter(filter),
+  );
+
+/**
+ * getRegionVPCAvailability
+ *
+ * Returns the availability of VPC IPv6 prefix lengths for a specified region.
+ */
+export const getRegionVPCAvailability = (regionId: string) =>
+  Request<RegionVPCAvailability>(
+    setURL(
+      `${BETA_API_ROOT}/regions/${encodeURIComponent(regionId)}/vpc-availability`,
+    ),
+    setMethod('GET'),
+  );
diff --git a/packages/api-v4/src/regions/types.ts b/packages/api-v4/src/regions/types.ts
index 63f1fe5b4f6..4da65b28c95 100644
--- a/packages/api-v4/src/regions/types.ts
+++ b/packages/api-v4/src/regions/types.ts
@@ -69,6 +69,12 @@ export interface RegionAvailability {
   region: string;
 }
 
+export interface RegionVPCAvailability {
+  available: boolean; // True if Region has VPC capabilities
+  available_ipv6_prefix_lengths: number[];
+  region: string;
+}
+
 type CountryCode = keyof typeof COUNTRY_CODE_TO_CONTINENT_CODE;
 
 export type Country = Lowercase<CountryCode>;
diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md
index 209e79f1e83..30cbb0f1c62 100644
--- a/packages/manager/CHANGELOG.md
+++ b/packages/manager/CHANGELOG.md
@@ -4,6 +4,74 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2025-10-07] - v1.152.0
+
+
+### Added:
+
+- IAM RBAC: disable fields in the drawer ([#12892](https://github.com/linode/manager/pull/12892))
+- IAM delegation feature flag ([#12906](https://github.com/linode/manager/pull/12906))
+- Split WireGuard into separate server and client apps; add Jaeger and Cribl Marketplace apps ([#12907](https://github.com/linode/manager/pull/12907))
+- IAM RBAC: disable fields in the drawer for deleting and managing images ([#12909](https://github.com/linode/manager/pull/12909))
+- IAM Delegation: replace query with the new delegation ones ([#12913](https://github.com/linode/manager/pull/12913))
+- IAM delegation mock data ([#12914](https://github.com/linode/manager/pull/12914))
+- ConnectionDetailsRow and ConnectionDetailsHostRows components to manage connection details table content ([#12939](https://github.com/linode/manager/pull/12939))
+
+### Changed:
+
+- UIE/RBAC LA gating for useQueryWithPermissions ([#12880](https://github.com/linode/manager/pull/12880))
+- Improve role selection UX in change role drawer ([#12901](https://github.com/linode/manager/pull/12901))
+- IAM RBAC: replace grants with usePermission hook for Firewalls ([#12902](https://github.com/linode/manager/pull/12902))
+- Getting started link on the volume details page ([#12904](https://github.com/linode/manager/pull/12904))
+- ACLP: update default `ACLP Time Range Picker Preset` to `1 hour` ([#12915](https://github.com/linode/manager/pull/12915))
+- Check Region VPC availability for IPv6 prefix lengths instead of hardcoded prefix lengths ([#12919](https://github.com/linode/manager/pull/12919))
+- IAM Delegation: remove ProxyUserTable         ([#12921](https://github.com/linode/manager/pull/12921))
+- Add padding inside the ManagedDashboardCard component ([#12923](https://github.com/linode/manager/pull/12923))
+- Assorted VPC IPv4 and VPC IPv6 copy ([#12924](https://github.com/linode/manager/pull/12924))
+- IAM RBAC: replace grants with usePermission hook in Linodes ([#12932](https://github.com/linode/manager/pull/12932))
+- DBaaS - Host field in connection details table renders based on VPC configuration and host fields are synced between Details and Networking tabs ([#12939](https://github.com/linode/manager/pull/12939))
+
+### Fixed:
+
+- IAM RBAC: fix tooltips in volumes ([#12881](https://github.com/linode/manager/pull/12881))
+- Disable `Add Metric and Add Dimension Filter` without serviceType; skip `useResources` if no supported regions in CloudPulse Alerting ([#12891](https://github.com/linode/manager/pull/12891))
+- Navigation after successful volume deletion ([#12894](https://github.com/linode/manager/pull/12894))
+- LKE create request for standard cluster can contain LKE-E-specific payload data ([#12916](https://github.com/linode/manager/pull/12916))
+- Inaccurate Upgrade Version modal copy for LKE-E clusters and overly verbose modal title ([#12922](https://github.com/linode/manager/pull/12922))
+- Use abs value for Assign User Autocomplete next fetch ([#12925](https://github.com/linode/manager/pull/12925))
+- CloudPulse-Metrics: Update `CloudPulseDashboardFilterBuilder.tsx` and `CloudPulseRegionSelect.tsx` to handle saved preference clearance for linode region filter ([#12926](https://github.com/linode/manager/pull/12926))
+- IAM: Hide IAM Beta badge in User Menu for LA ([#12933](https://github.com/linode/manager/pull/12933))
+- Always show tax id's when available irrespective of date filtering ([#12942](https://github.com/linode/manager/pull/12942))
+
+### Tech Stories:
+
+- Refactor IAM permission/entities truncation utilities ([#12825](https://github.com/linode/manager/pull/12825))
+- Update Node.js from `20.17` to `22.19` ([#12838](https://github.com/linode/manager/pull/12838))
+- Clean up logic for toggling between kubernetes `/v4` and `/v4beta` endpoints ([#12867](https://github.com/linode/manager/pull/12867))
+- Add dependency resolution for `brace-expansion` ([#12869](https://github.com/linode/manager/pull/12869))
+- IAM - Improve type safety in `usePermissions` ([#12893](https://github.com/linode/manager/pull/12893))
+- Remove deprecated `lkeEnterprise` flag from Flags interface ([#12911](https://github.com/linode/manager/pull/12911))
+
+### Tests:
+
+- Add tests for Linode Interface Networking table - details drawer and adding a VLAN interface ([#12842](https://github.com/linode/manager/pull/12842))
+- Fix flaky Object Storage Multicluster object upload test ([#12847](https://github.com/linode/manager/pull/12847))
+- Add LKE-E Post-LA feature flag smoke tests ([#12886](https://github.com/linode/manager/pull/12886))
+- Smoke tests for nvidia blackwell gpu plan selection ([#12917](https://github.com/linode/manager/pull/12917))
+- Update vpcCreateDrawer.setSubnetIpRange page utility for Cypress tests ([#12924](https://github.com/linode/manager/pull/12924))
+
+### Upcoming Features:
+
+- Fix Datastream Stream/Destinations table search input focus, and empty search results layout ([#12802](https://github.com/linode/manager/pull/12802))
+- IAM RBAC: Implements IAM RBAC permissions for VPC Details page ([#12810](https://github.com/linode/manager/pull/12810))
+- Generate Destination's sample Path based on Stream Type or custom value ([#12851](https://github.com/linode/manager/pull/12851))
+- CloudPulse-Alerts: Add `useAlertsMutation.ts`, update `AlertInformationActionTable.tsx` to handle api integration for mutliple services ([#12870](https://github.com/linode/manager/pull/12870))
+- ACLP: add `Group By` option on `Global Filters` and `Widget Filters` ([#12887](https://github.com/linode/manager/pull/12887))
+- Logs Delivery fixes after devcloud release ([#12898](https://github.com/linode/manager/pull/12898))
+- CloudPulse-Metrics: Add new component at `CloudPulseEndpointsSelect.tsx` ([#12905](https://github.com/linode/manager/pull/12905))
+- ACLP-Alerting: Object Storage service onboarding for Alerts UI ([#12910](https://github.com/linode/manager/pull/12910))
+- CloudPulse-Metrics: Handle special conditions for `objectstorage` service addition, add related filters at `FilterConfig.ts`, integrate related component `CloudPulseEndpointsSelect.tsx` ([#12912](https://github.com/linode/manager/pull/12912))
+
 ## [2025-10-02] - v1.151.2
 
 ### Fixed:
diff --git a/packages/manager/Dockerfile b/packages/manager/Dockerfile
index 8bdc220a59b..7f65e774d78 100644
--- a/packages/manager/Dockerfile
+++ b/packages/manager/Dockerfile
@@ -3,7 +3,7 @@
 ARG IMAGE_REGISTRY=docker.io
 
 # Node.js version to use.
-ARG NODE_VERSION=20.17.0
+ARG NODE_VERSION=22.19.0
 
 # Cypress version.
 ARG CYPRESS_VERSION=14.3.0
@@ -41,21 +41,21 @@ CMD pnpm start:manager:ci
 #
 # Uses Cypress factory image. For more information, see:
 # https://github.com/cypress-io/cypress-docker-images/tree/master/factory#usage
-FROM ${IMAGE_REGISTRY}/cypress/factory:5.2.1 AS e2e-build
+FROM ${IMAGE_REGISTRY}/cypress/factory:6.0.1 AS e2e-build
 ARG CYPRESS_VERSION
 ARG NODE_VERSION
 # Add Chrome apt repo
 RUN apt-get update \
-    && apt-get install -y wget gnupg2 \
-    && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
-    && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list \
-    && apt-get update
+  && apt-get install -y wget gnupg2 \
+  && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /usr/share/keyrings/google-chrome-archive-keyring.gpg \
+  && echo "deb [signed-by=/usr/share/keyrings/google-chrome-archive-keyring.gpg] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list \
+  && apt-get update
 
 RUN apt-get install -y google-chrome-stable \
-    && rm -rf /var/cache/apt/* \
-    && rm -rf /var/lib/apt/lists* \
-    && apt-get clean \
-    && npm install -g cypress@${CYPRESS_VERSION} pnpm bun yarn
+  && rm -rf /var/cache/apt/* \
+  && rm -rf /var/lib/apt/lists* \
+  && apt-get clean \
+  && npm install -g cypress@${CYPRESS_VERSION} pnpm bun yarn
 
 USER node
 WORKDIR /home/node/app
diff --git a/packages/manager/cypress/component/features/IAM/truncated-list.spec.tsx b/packages/manager/cypress/component/features/IAM/truncated-list.spec.tsx
new file mode 100644
index 00000000000..db669757700
--- /dev/null
+++ b/packages/manager/cypress/component/features/IAM/truncated-list.spec.tsx
@@ -0,0 +1,135 @@
+import { TruncatedList } from '@src/features/IAM/Shared/TruncatedList';
+import * as React from 'react';
+import { checkComponentA11y } from 'support/util/accessibility';
+import { componentTests } from 'support/util/components';
+
+const mockPermissions = [
+  'list_linode_firewalls',
+  'list_firewall_devices',
+  'view_linode_disk',
+  'list_billing_payments',
+  'list_billing_invoices',
+  'list_payment_methods',
+  'view_billing_invoice',
+  'list_invoice_items',
+  'view_payment_method',
+  'view_billing_payment',
+];
+
+const permissionList = mockPermissions.map((permission) => (
+  <div key={permission}>{permission}</div>
+));
+
+componentTests('TruncatedList', (mount) => {
+  describe('wide breakpoint', () => {
+    beforeEach(() => {
+      cy.viewport(1600, 600);
+    });
+
+    it('renders all list items', () => {
+      mount(
+        <TruncatedList dataTestId="permission">{permissionList}</TruncatedList>
+      );
+      cy.findAllByTestId('permission-list-item').should(
+        'have.length',
+        mockPermissions.length
+      );
+      mockPermissions.forEach((permission) => {
+        cy.findByText(permission).should('be.visible');
+      });
+    });
+  });
+
+  describe('medium breakpoint', () => {
+    beforeEach(() => {
+      cy.viewport(600, 600);
+    });
+
+    it('renders a truncated list with the correct number of items', () => {
+      mount(
+        <TruncatedList dataTestId="permission">{permissionList}</TruncatedList>
+      );
+      cy.findAllByTestId('permission-list-item').should(
+        'have.length',
+        mockPermissions.length
+      );
+      mockPermissions.slice(0, 7).forEach((permission) => {
+        cy.findByText(permission).should('be.visible');
+      });
+      cy.findByText('Expand (+3)').should('be.visible').click();
+      mockPermissions.forEach((permission) => {
+        cy.findByText(permission).should('be.visible');
+      });
+      cy.findByText('Hide').should('be.visible').click();
+      mockPermissions.slice(0, 7).forEach((permission) => {
+        cy.findByText(permission).should('be.visible');
+      });
+      cy.get('[class*="visible-overflow-button"]').should('not.exist');
+    });
+
+    it('allows rendering a custom overflow button', () => {
+      const handleClick = cy.spy().as('handleClick');
+
+      mount(
+        <TruncatedList
+          customOverflowButton={() => (
+            <button onClick={handleClick}>Custom Overflow Button</button>
+          )}
+          dataTestId="permission"
+        >
+          {permissionList}
+        </TruncatedList>
+      );
+      cy.findByRole('button', { name: 'Custom Overflow Button' })
+        .should('be.visible')
+        .click();
+      cy.get('@handleClick').should('have.been.called');
+    });
+
+    it('floats the overflow button to the right with justifyOverflowButtonRight', () => {
+      mount(
+        <TruncatedList dataTestId="permission" justifyOverflowButtonRight>
+          {permissionList}
+        </TruncatedList>
+      );
+
+      cy.get('[class*="visible-overflow-button"]')
+        .should('be.visible')
+        .should('have.css', 'justify-content', 'end');
+    });
+  });
+
+  describe('small breakpoint', () => {
+    beforeEach(() => {
+      cy.viewport(400, 600);
+    });
+
+    it('renders a truncated list with the correct number of items', () => {
+      mount(
+        <TruncatedList dataTestId="permission">{permissionList}</TruncatedList>
+      );
+      cy.findAllByTestId('permission-list-item').should(
+        'have.length',
+        mockPermissions.length
+      );
+      mockPermissions.slice(0, 4).forEach((permission) => {
+        cy.findByText(permission).should('be.visible');
+      });
+      cy.findByText('Expand (+5)').should('be.visible').click();
+      mockPermissions.forEach((permission) => {
+        cy.findByText(permission).should('be.visible');
+      });
+      cy.findByText('Hide').should('be.visible').click();
+      mockPermissions.slice(0, 4).forEach((permission) => {
+        cy.findByText(permission).should('be.visible');
+      });
+    });
+  });
+
+  describe('Accessibility checks', () => {
+    it('passes aXe accessibility', () => {
+      mount(<TruncatedList>{permissionList}</TruncatedList>);
+      checkComponentA11y();
+    });
+  });
+});
diff --git a/packages/manager/cypress/e2e/core/account/restricted-user-details-pages.spec.ts b/packages/manager/cypress/e2e/core/account/restricted-user-details-pages.spec.ts
index d77503cb1df..61c93e1f830 100644
--- a/packages/manager/cypress/e2e/core/account/restricted-user-details-pages.spec.ts
+++ b/packages/manager/cypress/e2e/core/account/restricted-user-details-pages.spec.ts
@@ -8,6 +8,7 @@ import {
   databaseConfigurations,
   mockDatabaseNodeTypes,
 } from 'support/constants/databases';
+import { mockTieredStandardVersions } from 'support/constants/lke';
 import { mockGetUser } from 'support/intercepts/account';
 import { mockGetLinodeConfigs } from 'support/intercepts/configs';
 import {
@@ -30,7 +31,7 @@ import {
   mockGetCluster,
   mockGetClusterPools,
   mockGetDashboardUrl,
-  mockGetKubernetesVersions,
+  mockGetTieredKubernetesVersions,
   mockRecycleAllNodes,
   mockUpdateCluster,
 } from 'support/intercepts/lke';
@@ -301,19 +302,29 @@ describe('restricted user details pages', () => {
       .should('be.visible')
       .should('be.enabled')
       .click();
-    ['Edit', 'Manage Tags', 'Resize', 'Clone', 'Attach', 'Delete'].forEach(
-      (menuItem: string) => {
+    [
+      'Show Config',
+      'Edit',
+      'Manage Tags',
+      'Resize',
+      'Clone',
+      'Attach',
+      'Delete',
+    ].forEach((menuItem: string) => {
+      if (menuItem === 'Show Config') {
+        ui.actionMenuItem.findByTitle(menuItem).should('not.be.disabled');
+      } else {
         ui.actionMenuItem.findByTitle(menuItem).should('be.disabled');
+        // Optionally check tooltip for disabled items
 
-        if (menuItem !== 'Manage Tags') {
-          const tooltipMessage = `You don't have permissions to ${menuItem.toLocaleLowerCase()} this Volume. Please contact your ${ADMINISTRATOR} to request the necessary permissions.`;
-          ui.button
-            .findByAttribute('aria-label', tooltipMessage)
-            .trigger('mouseover');
-          ui.tooltip.findByText(tooltipMessage);
-        }
+        const tooltipMessage = `You don't have permissions to ${menuItem === 'Manage Tags' ? 'edit' : menuItem.toLocaleLowerCase()} this Volume. Please contact your ${ADMINISTRATOR} to request the necessary permissions.`;
+        ui.button
+          .findByAttribute('aria-label', tooltipMessage)
+          .first()
+          .trigger('mouseover');
+        ui.tooltip.findByText(tooltipMessage);
       }
-    );
+    });
   });
 
   databaseConfigurations.forEach(
@@ -409,8 +420,8 @@ describe('restricted user details pages', () => {
 
   it.skip("should disable action elements and buttons in the 'Kubernetes' details page", () => {
     // TODO: M3-9585 Not working for kubernets. Skip this test for now.
-    const oldVersion = '1.25';
-    const newVersion = '1.26';
+    const oldVersion = mockTieredStandardVersions[0].id;
+    const newVersion = mockTieredStandardVersions[1].id;
 
     const mockCluster = kubernetesClusterFactory.build({
       k8s_version: oldVersion,
@@ -433,7 +444,7 @@ describe('restricted user details pages', () => {
     const mockNodePools = nodePoolFactory.buildList(2);
 
     mockGetCluster(mockCluster).as('getCluster');
-    mockGetKubernetesVersions([newVersion, oldVersion]).as('getVersions');
+    mockGetTieredKubernetesVersions('standard', mockTieredStandardVersions);
     mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
     mockUpdateCluster(mockCluster.id, mockClusterUpdated).as('updateCluster');
     mockGetDashboardUrl(mockCluster.id);
@@ -451,9 +462,7 @@ describe('restricted user details pages', () => {
       .click();
 
     ui.dialog
-      .findByTitle(
-        `Upgrade Kubernetes version to ${newVersion} on ${mockCluster.label}?`
-      )
+      .findByTitle(`Upgrade Cluster ${mockCluster.label} to ${newVersion}`)
       .should('be.visible')
       .within(() => {
         upgradeNotes.forEach((note: string) => {
diff --git a/packages/manager/cypress/e2e/core/cloudpulse/create-user-alert.spec.ts b/packages/manager/cypress/e2e/core/cloudpulse/create-user-alert.spec.ts
index 69a5c06847d..e2b882a866b 100644
--- a/packages/manager/cypress/e2e/core/cloudpulse/create-user-alert.spec.ts
+++ b/packages/manager/cypress/e2e/core/cloudpulse/create-user-alert.spec.ts
@@ -499,4 +499,4 @@ describe('Create Firewall Alert Successfully', () => {
       });
     });
   });
-});
\ No newline at end of file
+});
diff --git a/packages/manager/cypress/e2e/core/cloudpulse/edit-system-alert.spec.ts b/packages/manager/cypress/e2e/core/cloudpulse/edit-system-alert.spec.ts
index 315ce8a3135..335b2ae55eb 100644
--- a/packages/manager/cypress/e2e/core/cloudpulse/edit-system-alert.spec.ts
+++ b/packages/manager/cypress/e2e/core/cloudpulse/edit-system-alert.spec.ts
@@ -42,11 +42,13 @@ const regions = [
     capabilities: ['Managed Databases'],
     id: 'us-ord',
     label: 'Chicago, IL',
+    monitors: { alerts: ['Managed Databases'] },
   }),
   regionFactory.build({
     capabilities: ['Managed Databases'],
     id: 'us-east',
     label: 'Newark',
+    monitors: { alerts: ['Managed Databases'] },
   }),
 ];
 const databases: Database[] = databaseFactory
@@ -267,4 +269,4 @@ describe('Integration Tests for Edit Alert', () => {
       ui.toast.assertMessage('Alert entities successfully updated.');
     });
   });
-});
\ No newline at end of file
+});
diff --git a/packages/manager/cypress/e2e/core/kubernetes/lke-create.spec.ts b/packages/manager/cypress/e2e/core/kubernetes/lke-create.spec.ts
index b81ff900f00..1539bc30bfa 100644
--- a/packages/manager/cypress/e2e/core/kubernetes/lke-create.spec.ts
+++ b/packages/manager/cypress/e2e/core/kubernetes/lke-create.spec.ts
@@ -5,6 +5,7 @@ import {
   dedicatedTypeFactory,
   linodeTypeFactory,
   pluralize,
+  regionAvailabilityFactory,
   regionFactory,
 } from '@linode/utilities';
 import {
@@ -21,12 +22,10 @@ import {
   dedicatedNodeCount,
   dedicatedType,
   latestEnterpriseTierKubernetesVersion,
-  latestKubernetesVersion,
   mockedLKEClusterTypes,
   mockedLKEEnterprisePrices,
   mockTieredEnterpriseVersions,
   mockTieredStandardVersions,
-  mockTieredVersions,
   nanodeNodeCount,
   nanodeType,
 } from 'support/constants/lke';
@@ -43,7 +42,6 @@ import {
   mockGetClusters,
   mockGetControlPlaneACL,
   mockGetDashboardUrl,
-  mockGetKubernetesVersions,
   mockGetLKEClusterTypes,
   mockGetTieredKubernetesVersions,
 } from 'support/intercepts/lke';
@@ -153,7 +151,7 @@ describe('LKE Cluster Creation', () => {
     exclude: ['au-mel', 'eu-west', 'id-cgk', 'br-gru'],
   });
   const clusterLabel = randomLabel();
-  const clusterVersion = '1.31';
+  const clusterVersion = mockTieredStandardVersions[0].id;
   const mockedLKECluster = kubernetesClusterFactory.build({
     label: clusterLabel,
     region: clusterRegion.id,
@@ -184,7 +182,9 @@ describe('LKE Cluster Creation', () => {
     mockGetLinodeTypes(mockedLKEClusterTypes).as('getLinodeTypes');
     mockGetLKEClusterTypes(mockedLKEClusterPrices).as('getLKEClusterTypes');
     mockGetClusters([mockedLKECluster]).as('getClusters');
-    mockGetKubernetesVersions([clusterVersion]).as('getKubernetesVersions');
+    mockGetTieredKubernetesVersions('standard', mockTieredStandardVersions).as(
+      'getKubernetesVersions'
+    );
 
     cy.visitWithLogin('/kubernetes/clusters');
 
@@ -662,7 +662,10 @@ describe('LKE Cluster Creation with ACL', () => {
 
   describe('with LKE IPACL account capability', () => {
     beforeEach(() => {
-      mockGetKubernetesVersions([clusterVersion]).as('getLKEVersions');
+      mockGetTieredKubernetesVersions(
+        'standard',
+        mockTieredStandardVersions
+      ).as('getLKEVersions');
       mockGetRegions([mockRegion]).as('getRegions');
       mockGetLinodeTypes(mockLinodeTypes).as('getLinodeTypes');
       mockGetRegionAvailability(mockRegion.id, []).as('getRegionAvailability');
@@ -935,10 +938,12 @@ describe('LKE Cluster Creation with ACL', () => {
       ).as('getAccount');
       mockGetTieredKubernetesVersions('enterprise', [
         latestEnterpriseTierKubernetesVersion,
-      ]).as('getTieredKubernetesVersions');
-      mockGetKubernetesVersions([latestKubernetesVersion]).as(
-        'getKubernetesVersions'
-      );
+      ]).as('getTieredEnterpriseVersions');
+      mockGetTieredKubernetesVersions(
+        'standard',
+        mockTieredStandardVersions
+      ).as('getTieredStandardVersions');
+
       mockGetLinodeTypes(mockedLKEClusterTypes).as('getLinodeTypes');
       mockGetLKEClusterTypes(mockedLKEEnterprisePrices).as(
         'getLKEEnterpriseClusterTypes'
@@ -969,7 +974,7 @@ describe('LKE Cluster Creation with ACL', () => {
         .click();
 
       cy.url().should('endWith', '/kubernetes/create');
-      cy.wait(['@getKubernetesVersions', '@getTieredKubernetesVersions']);
+      cy.wait(['@getTieredStandardVersions', '@getTieredEnterpriseVersions']);
 
       // Select enterprise tier.
       cy.get(`[data-qa-select-card-heading="LKE Enterprise"]`)
@@ -1094,7 +1099,6 @@ describe('LKE Cluster Creation with ACL', () => {
         '@getCluster',
         '@getClusterPools',
         '@createCluster',
-        '@getLKEEnterpriseClusterTypes',
         '@getLinodeTypes',
         '@getApiEndpoints',
         '@getControlPlaneACL',
@@ -1321,10 +1325,12 @@ describe('LKE Cluster Creation with LKE-E', () => {
       ).as('getAccount');
       mockGetTieredKubernetesVersions('enterprise', [
         latestEnterpriseTierKubernetesVersion,
-      ]).as('getTieredKubernetesVersions');
-      mockGetKubernetesVersions([latestKubernetesVersion]).as(
-        'getKubernetesVersions'
-      );
+      ]).as('getEnterpriseTieredVersions');
+      mockGetTieredKubernetesVersions(
+        'standard',
+        mockTieredStandardVersions
+      ).as('getStandardTieredVersions');
+
       mockGetLinodeTypes(mockedLKEClusterTypes).as('getLinodeTypes');
       mockGetLKEClusterTypes(mockedLKEEnterprisePrices).as(
         'getLKEEnterpriseClusterTypes'
@@ -1361,8 +1367,8 @@ describe('LKE Cluster Creation with LKE-E', () => {
 
       cy.url().should('endWith', '/kubernetes/create');
       cy.wait([
-        '@getKubernetesVersions',
-        '@getTieredKubernetesVersions',
+        '@getEnterpriseTieredVersions',
+        '@getStandardTieredVersions',
         '@getLinodeTypes',
       ]);
 
@@ -1535,7 +1541,6 @@ describe('LKE Cluster Creation with LKE-E', () => {
         '@getCluster',
         '@getClusterPools',
         '@createCluster',
-        '@getLKEEnterpriseClusterTypes',
         '@getApiEndpoints',
         '@getControlPlaneACL',
       ]);
@@ -1633,7 +1638,6 @@ describe('LKE cluster creation with LKE-E Post-LA', () => {
         capabilities: ['Kubernetes Enterprise'],
       })
     );
-    mockGetKubernetesVersions(mockTieredVersions.map((version) => version.id));
     mockGetTieredKubernetesVersions('standard', mockTieredStandardVersions);
     mockGetTieredKubernetesVersions('enterprise', mockTieredEnterpriseVersions);
   });
@@ -1839,16 +1843,161 @@ describe('LKE cluster creation with LKE-E Post-LA', () => {
       expect(nodePools[0]).to.be.an('object');
       expect(nodePools[0]['type']).to.equal(mockPlan.id);
       expect(nodePools[0]['count']).to.equal(3);
-
-      // TODO M3-10590 - Uncomment and adjust according to chosen resolution.
-      // expect(nodePools[0]['update_strategy']).to.be.undefined;
-      // expect(nodePools[0]['firewall_id']).to.be.undefined;
+      expect(nodePools[0]['update_strategy']).to.be.undefined;
+      expect(nodePools[0]['firewall_id']).to.be.undefined;
     });
 
     cy.url().should('endWith', `kubernetes/clusters/${mockCluster.id}/summary`);
   });
 });
 
+/*
+ * Each test provided w/ array of 12 mock linode types. Type excluded if:
+	- flag enabled and id includes 'blackwell'
+	- enterprise tier and id includes 'gpu'
+ * If visible in table, rows are always enabled
+*/
+describe('smoketest for Nvidia Blackwell GPUs in kubernetes/create page', () => {
+  const mockRegion = regionFactory.build({
+    id: 'us-east',
+    label: 'Newark, NJ',
+    capabilities: [
+      'GPU Linodes',
+      'Linodes',
+      'Kubernetes',
+      'Kubernetes Enterprise',
+    ],
+  });
+
+  const mockBlackwellLinodeTypes = new Array(4).fill(null).map((_, index) =>
+    linodeTypeFactory.build({
+      id: `g3-gpu-rtxpro6000-blackwell-${index + 1}`,
+      label: `RTX PRO 6000 Blackwell x${index + 1}`,
+      class: 'gpu',
+    })
+  );
+  beforeEach(() => {
+    mockGetAccount(
+      accountFactory.build({
+        capabilities: ['Linodes', 'Kubernetes', 'Kubernetes Enterprise'],
+      })
+    );
+    mockGetRegions([mockRegion]).as('getRegions');
+
+    mockGetLinodeTypes(mockBlackwellLinodeTypes).as('getLinodeTypes');
+    const mockRegionAvailability = mockBlackwellLinodeTypes.map((type) =>
+      regionAvailabilityFactory.build({
+        plan: type.label,
+        available: true,
+        region: mockRegion.id,
+      })
+    );
+    mockGetRegionAvailability(mockRegion.id, mockRegionAvailability).as(
+      'getRegionAvailability'
+    );
+  });
+
+  describe('standard tier', () => {
+    it('enabled feature flag includes blackwells', () => {
+      mockAppendFeatureFlags({
+        kubernetesBlackwellPlans: true,
+      }).as('getFeatureFlags');
+      cy.visitWithLogin('/kubernetes/create');
+      cy.wait(['@getFeatureFlags', '@getRegions', '@getLinodeTypes']);
+
+      ui.regionSelect.find().click();
+      ui.regionSelect.find().clear();
+      ui.regionSelect.find().type(`${mockRegion.label}{enter}`);
+      cy.wait('@getRegionAvailability');
+      // Navigate to "GPU" tab
+      ui.tabList.findTabByTitle('GPU').scrollIntoView();
+      ui.tabList.findTabByTitle('GPU').should('be.visible').click();
+
+      cy.findByRole('table', {
+        name: 'List of NVIDIA RTX PRO 6000 Blackwell Server Edition Plans',
+      }).within(() => {
+        cy.get('tbody tr')
+          .should('have.length', 4)
+          .each((row, index) => {
+            cy.wrap(row).within(() => {
+              cy.get('td')
+                .eq(0)
+                .within(() => {
+                  cy.findByText(mockBlackwellLinodeTypes[index].label).should(
+                    'be.visible'
+                  );
+                });
+              ui.button
+                .findByTitle('Configure Pool')
+                .should('be.visible')
+                .should('be.enabled');
+            });
+          });
+      });
+    });
+
+    it('disabled feature flag excludes blackwells', () => {
+      mockAppendFeatureFlags({
+        kubernetesBlackwellPlans: false,
+      }).as('getFeatureFlags');
+
+      cy.visitWithLogin('/kubernetes/create');
+      cy.wait(['@getFeatureFlags', '@getRegions', '@getLinodeTypes']);
+
+      ui.regionSelect.find().click();
+      ui.regionSelect.find().clear();
+      ui.regionSelect.find().type(`${mockRegion.label}{enter}`);
+      cy.wait('@getRegionAvailability');
+      // Navigate to "GPU" tab
+      // "GPU" tab hidden
+      ui.tabList.findTabByTitle('GPU').should('not.exist');
+    });
+  });
+  describe('enterprise tier hides GPU tab', () => {
+    beforeEach(() => {
+      // necessary to prevent crash after selecting Enterprise button
+      mockGetTieredKubernetesVersions('enterprise', [
+        latestEnterpriseTierKubernetesVersion,
+      ]).as('getEnterpriseTieredVersions');
+    });
+    it('enabled feature flag', () => {
+      mockAppendFeatureFlags({
+        kubernetesBlackwellPlans: true,
+      }).as('getFeatureFlags');
+
+      cy.visitWithLogin('/kubernetes/create');
+      cy.wait(['@getFeatureFlags', '@getRegions', '@getLinodeTypes']);
+
+      cy.findByText('LKE Enterprise').click();
+      cy.wait(['@getEnterpriseTieredVersions']);
+      ui.regionSelect.find().click();
+      ui.regionSelect.find().clear();
+      ui.regionSelect.find().type(`${mockRegion.label}{enter}`);
+      cy.wait('@getRegionAvailability');
+      // "GPU" tab hidden
+      ui.tabList.findTabByTitle('GPU').should('not.exist');
+    });
+
+    it('disabled feature flag', () => {
+      mockAppendFeatureFlags({
+        kubernetesBlackwellPlans: false,
+      }).as('getFeatureFlags');
+
+      cy.visitWithLogin('/kubernetes/create');
+      cy.wait(['@getFeatureFlags', '@getRegions', '@getLinodeTypes']);
+
+      ui.regionSelect.find().click();
+      ui.regionSelect.find().clear();
+      ui.regionSelect.find().type(`${mockRegion.label}{enter}`);
+      cy.findByText('LKE Enterprise').click();
+      cy.wait(['@getEnterpriseTieredVersions']);
+      2;
+      // "GPU" tab hidden
+      ui.tabList.findTabByTitle('GPU').should('not.exist');
+    });
+  });
+});
+
 /**
  * Returns each plan in an array which is similar to the given plan.
  *
diff --git a/packages/manager/cypress/e2e/core/kubernetes/lke-enterprise-create.spec.ts b/packages/manager/cypress/e2e/core/kubernetes/lke-enterprise-create.spec.ts
index f4a4737a056..32d93f7b6e7 100644
--- a/packages/manager/cypress/e2e/core/kubernetes/lke-enterprise-create.spec.ts
+++ b/packages/manager/cypress/e2e/core/kubernetes/lke-enterprise-create.spec.ts
@@ -6,12 +6,10 @@ import { linodeTypeFactory, regionFactory } from '@linode/utilities';
 import {
   clusterPlans,
   latestEnterpriseTierKubernetesVersion,
-  latestKubernetesVersion,
   mockedLKEClusterTypes,
   mockedLKEEnterprisePrices,
   mockTieredEnterpriseVersions,
   mockTieredStandardVersions,
-  mockTieredVersions,
 } from 'support/constants/lke';
 import { mockGetAccount } from 'support/intercepts/account';
 import { mockAppendFeatureFlags } from 'support/intercepts/feature-flags';
@@ -21,7 +19,6 @@ import {
   mockCreateCluster,
   mockCreateClusterError,
   mockGetCluster,
-  mockGetKubernetesVersions,
   mockGetLKEClusterTypes,
   mockGetTieredKubernetesVersions,
 } from 'support/intercepts/lke';
@@ -106,9 +103,9 @@ describe('LKE Cluster Creation with LKE-E', () => {
 
     mockGetTieredKubernetesVersions('enterprise', [
       latestEnterpriseTierKubernetesVersion,
-    ]).as('getTieredKubernetesVersions');
-    mockGetKubernetesVersions([latestKubernetesVersion]).as(
-      'getKubernetesVersions'
+    ]).as('getEnterpriseTieredVersions');
+    mockGetTieredKubernetesVersions('standard', mockTieredStandardVersions).as(
+      'getStandardTieredVersions'
     );
 
     mockGetLinodeTypes(mockedLKEClusterTypes).as('getLinodeTypes');
@@ -127,11 +124,7 @@ describe('LKE Cluster Creation with LKE-E', () => {
 
     ui.button.findByTitle('Create Cluster').click();
     cy.url().should('endWith', '/kubernetes/create');
-    cy.wait([
-      '@getKubernetesVersions',
-      '@getTieredKubernetesVersions',
-      '@getLinodeTypes',
-    ]);
+    cy.wait(['@getLinodeTypes']);
   });
 
   describe('LKE-E Phase 2 Networking Configurations', () => {
@@ -499,7 +492,6 @@ describe('LKE Enterprise cluster creation with LKE-E Post-LA', () => {
         capabilities: ['Kubernetes Enterprise'],
       })
     );
-    mockGetKubernetesVersions(mockTieredVersions.map((version) => version.id));
     mockGetTieredKubernetesVersions('standard', mockTieredStandardVersions);
     mockGetTieredKubernetesVersions('enterprise', mockTieredEnterpriseVersions);
   });
diff --git a/packages/manager/cypress/e2e/core/kubernetes/lke-enterprise-read.spec.ts b/packages/manager/cypress/e2e/core/kubernetes/lke-enterprise-read.spec.ts
index a331de55b59..9607636fb5a 100644
--- a/packages/manager/cypress/e2e/core/kubernetes/lke-enterprise-read.spec.ts
+++ b/packages/manager/cypress/e2e/core/kubernetes/lke-enterprise-read.spec.ts
@@ -16,7 +16,7 @@ import {
 import {
   mockGetCluster,
   mockGetClusterPools,
-  mockGetKubernetesVersions,
+  mockGetTieredKubernetesVersions,
 } from 'support/intercepts/lke';
 import { mockGetProfile } from 'support/intercepts/profile';
 import { mockGetVPC } from 'support/intercepts/vpc';
@@ -138,7 +138,7 @@ describe('LKE-E Cluster Summary - VPC Section', () => {
    */
   it('shows linked VPC in summary for cluster with a VPC', () => {
     mockGetCluster(mockClusterWithVPC).as('getCluster');
-    mockGetKubernetesVersions().as('getVersions');
+    mockGetTieredKubernetesVersions('enterprise').as('getTieredVersions');
     mockGetClusterPools(mockClusterWithVPC.id, []).as('getNodePools');
     mockGetVPC(mockVPC).as('getVPC');
     mockGetProfile(mockProfile).as('getProfile');
@@ -147,7 +147,7 @@ describe('LKE-E Cluster Summary - VPC Section', () => {
     cy.wait([
       '@getCluster',
       '@getNodePools',
-      '@getVersions',
+      '@getTieredVersions',
       '@getVPC',
       '@getProfile',
     ]);
@@ -174,14 +174,19 @@ describe('LKE-E Cluster Summary - VPC Section', () => {
    */
   it('does not show linked VPC in summary when cluster does not specify a VPC', () => {
     mockGetCluster(mockClusterWithoutVPC).as('getCluster');
-    mockGetKubernetesVersions().as('getVersions');
+    mockGetTieredKubernetesVersions('enterprise').as('getTieredVersions');
     mockGetClusterPools(mockClusterWithoutVPC.id, []).as('getNodePools');
     mockGetProfile(mockProfile).as('getProfile');
 
     cy.visitWithLogin(
       `/kubernetes/clusters/${mockClusterWithoutVPC.id}/summary`
     );
-    cy.wait(['@getCluster', '@getNodePools', '@getVersions', '@getProfile']);
+    cy.wait([
+      '@getCluster',
+      '@getNodePools',
+      '@getTieredVersions',
+      '@getProfile',
+    ]);
 
     // Confirm that no VPC label or link is shown in the summary section
     cy.get('[data-qa-kube-entity-footer]').within(() => {
@@ -218,7 +223,7 @@ describe('LKE-E Node Pools', () => {
     ).as('getAccount');
 
     mockGetCluster(mockClusterWithVPC).as('getCluster');
-    mockGetKubernetesVersions().as('getVersions');
+    mockGetTieredKubernetesVersions('enterprise').as('getTieredVersions');
     mockGetClusterPools(mockClusterWithVPC.id, mockNodePools).as(
       'getNodePools'
     );
@@ -229,7 +234,12 @@ describe('LKE-E Node Pools', () => {
     );
 
     cy.visitWithLogin(`/kubernetes/clusters/${mockClusterWithVPC.id}/summary`);
-    cy.wait(['@getCluster', '@getNodePools', '@getVersions', '@getProfile']);
+    cy.wait([
+      '@getCluster',
+      '@getNodePools',
+      '@getTieredVersions',
+      '@getProfile',
+    ]);
 
     // Confirm VPC IP columns are present in the table header
     cy.get('[aria-label="List of Your Cluster Nodes"] thead').within(() => {
diff --git a/packages/manager/cypress/e2e/core/kubernetes/lke-landing-page.spec.ts b/packages/manager/cypress/e2e/core/kubernetes/lke-landing-page.spec.ts
index 97b14b8b6f5..e27d00a5da1 100644
--- a/packages/manager/cypress/e2e/core/kubernetes/lke-landing-page.spec.ts
+++ b/packages/manager/cypress/e2e/core/kubernetes/lke-landing-page.spec.ts
@@ -6,7 +6,6 @@ import {
   mockGetClusterPools,
   mockGetClusters,
   mockGetKubeconfig,
-  mockGetKubernetesVersions,
   mockGetTieredKubernetesVersions,
   mockRecycleAllNodes,
   mockUpdateCluster,
@@ -19,6 +18,8 @@ import { getRegionById } from 'support/util/regions';
 import {
   accountFactory,
   kubernetesClusterFactory,
+  kubernetesEnterpriseTierVersionFactory,
+  kubernetesStandardTierVersionFactory,
   nodePoolFactory,
 } from 'src/factories';
 
@@ -187,19 +188,22 @@ describe('LKE landing page', () => {
   });
 
   it('does not show an Upgrade chip when there is no new kubernetes standard version', () => {
-    const oldVersion = '1.25';
-    const newVersion = '1.26';
+    const mockStandardTierVersions =
+      kubernetesStandardTierVersionFactory.buildList(2);
+    const newVersion = mockStandardTierVersions[1].id;
 
     const cluster = kubernetesClusterFactory.build({
       k8s_version: newVersion,
     });
 
     mockGetClusters([cluster]).as('getClusters');
-    mockGetKubernetesVersions([newVersion, oldVersion]).as('getVersions');
+    mockGetTieredKubernetesVersions('standard', mockStandardTierVersions).as(
+      'getTieredVersions'
+    );
 
     cy.visitWithLogin(`/kubernetes/clusters`);
 
-    cy.wait(['@getClusters', '@getVersions']);
+    cy.wait(['@getClusters', '@getTieredVersions']);
 
     cy.findByText(newVersion).should('be.visible');
 
@@ -207,8 +211,9 @@ describe('LKE landing page', () => {
   });
 
   it('does not show an Upgrade chip when there is no new kubernetes enterprise version', () => {
-    const oldVersion = '1.31.1+lke1';
-    const newVersion = '1.32.1+lke2';
+    const mockEnterpriseTierVersions =
+      kubernetesEnterpriseTierVersionFactory.buildList(2);
+    const newVersion = mockEnterpriseTierVersions[1].id;
 
     mockGetAccount(
       accountFactory.build({
@@ -227,10 +232,10 @@ describe('LKE landing page', () => {
     });
 
     mockGetClusters([cluster]).as('getClusters');
-    mockGetTieredKubernetesVersions('enterprise', [
-      { id: newVersion, tier: 'enterprise' },
-      { id: oldVersion, tier: 'enterprise' },
-    ]).as('getTieredVersions');
+    mockGetTieredKubernetesVersions(
+      'enterprise',
+      mockEnterpriseTierVersions
+    ).as('getTieredVersions');
 
     cy.visitWithLogin(`/kubernetes/clusters`);
 
@@ -242,8 +247,10 @@ describe('LKE landing page', () => {
   });
 
   it('can upgrade the standard kubernetes version from the landing page', () => {
-    const oldVersion = '1.25';
-    const newVersion = '1.26';
+    const mockStandardTierVersions =
+      kubernetesStandardTierVersionFactory.buildList(2);
+    const oldVersion = mockStandardTierVersions[0].id;
+    const newVersion = mockStandardTierVersions[1].id;
 
     const cluster = kubernetesClusterFactory.build({
       k8s_version: oldVersion,
@@ -254,13 +261,15 @@ describe('LKE landing page', () => {
 
     mockGetCluster(cluster).as('getCluster');
     mockGetClusters([cluster]).as('getClusters');
-    mockGetKubernetesVersions([newVersion, oldVersion]).as('getVersions');
+    mockGetTieredKubernetesVersions('standard', mockStandardTierVersions).as(
+      'getTieredVersions'
+    );
     mockUpdateCluster(cluster.id, updatedCluster).as('updateCluster');
     mockRecycleAllNodes(cluster.id).as('recycleAllNodes');
 
     cy.visitWithLogin(`/kubernetes/clusters`);
 
-    cy.wait(['@getClusters', '@getVersions']);
+    cy.wait(['@getClusters', '@getTieredVersions']);
 
     cy.findByText(oldVersion).should('be.visible');
 
@@ -269,9 +278,7 @@ describe('LKE landing page', () => {
     cy.wait(['@getCluster']);
 
     ui.dialog
-      .findByTitle(
-        `Upgrade Kubernetes version to ${newVersion} on ${cluster.label}?`
-      )
+      .findByTitle(`Upgrade Cluster ${cluster.label} to ${newVersion}`)
       .should('be.visible');
 
     mockGetClusters([updatedCluster]).as('getClusters');
@@ -300,8 +307,11 @@ describe('LKE landing page', () => {
   });
 
   it('can upgrade the enterprise kubernetes version from the landing page', () => {
-    const oldVersion = '1.31.1+lke1';
-    const newVersion = '1.32.1+lke2';
+    const mockEnterpriseTierVersions =
+      kubernetesEnterpriseTierVersionFactory.buildList(2);
+    const oldVersion = mockEnterpriseTierVersions[0].id;
+
+    const newVersion = mockEnterpriseTierVersions[1].id;
 
     mockGetAccount(
       accountFactory.build({
@@ -323,10 +333,10 @@ describe('LKE landing page', () => {
 
     mockGetCluster(cluster).as('getCluster');
     mockGetClusters([cluster]).as('getClusters');
-    mockGetTieredKubernetesVersions('enterprise', [
-      { id: newVersion, tier: 'enterprise' },
-      { id: oldVersion, tier: 'enterprise' },
-    ]).as('getTieredVersions');
+    mockGetTieredKubernetesVersions(
+      'enterprise',
+      mockEnterpriseTierVersions
+    ).as('getTieredVersions');
     mockUpdateCluster(cluster.id, updatedCluster).as('updateCluster');
     mockRecycleAllNodes(cluster.id).as('recycleAllNodes');
 
@@ -341,9 +351,7 @@ describe('LKE landing page', () => {
     cy.wait(['@getCluster']);
 
     ui.dialog
-      .findByTitle(
-        `Upgrade Kubernetes version to ${newVersion} on ${cluster.label}?`
-      )
+      .findByTitle(`Upgrade Cluster ${cluster.label} to ${newVersion}`)
       .should('be.visible');
 
     mockGetClusters([updatedCluster]).as('getClusters');
diff --git a/packages/manager/cypress/e2e/core/kubernetes/lke-standard-read.spec.ts b/packages/manager/cypress/e2e/core/kubernetes/lke-standard-read.spec.ts
index 0791247057c..af91ff19658 100644
--- a/packages/manager/cypress/e2e/core/kubernetes/lke-standard-read.spec.ts
+++ b/packages/manager/cypress/e2e/core/kubernetes/lke-standard-read.spec.ts
@@ -9,7 +9,7 @@ import { mockGetLinodes } from 'support/intercepts/linodes';
 import {
   mockGetCluster,
   mockGetClusterPools,
-  mockGetKubernetesVersions,
+  mockGetTieredKubernetesVersions,
 } from 'support/intercepts/lke';
 import { mockGetProfile } from 'support/intercepts/profile';
 
@@ -65,12 +65,17 @@ describe('LKE Cluster Summary', () => {
     ).as('getAccount');
 
     mockGetCluster(mockCluster).as('getCluster');
-    mockGetKubernetesVersions().as('getVersions');
+    mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
     mockGetClusterPools(mockCluster.id, []).as('getNodePools');
     mockGetProfile(mockProfile).as('getProfile');
 
     cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
-    cy.wait(['@getCluster', '@getNodePools', '@getVersions', '@getProfile']);
+    cy.wait([
+      '@getCluster',
+      '@getNodePools',
+      '@getTieredVersions',
+      '@getProfile',
+    ]);
 
     // Confirm that no VPC label or link is shown in the summary section
     cy.get('[data-qa-kube-entity-footer]').within(() => {
@@ -104,12 +109,17 @@ describe('LKE Node Pools', () => {
 
     mockGetCluster(mockCluster).as('getCluster');
     mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
-    mockGetKubernetesVersions().as('getVersions');
+    mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
     mockGetProfile(profileFactory.build()).as('getProfile');
     mockGetLinodes(mockLinodes).as('getLinodes');
 
     cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
-    cy.wait(['@getCluster', '@getNodePools', '@getVersions', '@getProfile']);
+    cy.wait([
+      '@getCluster',
+      '@getNodePools',
+      '@getTieredVersions',
+      '@getProfile',
+    ]);
 
     // Confirm VPC IP columns are not present in the node table
     cy.get('[aria-label="List of Your Cluster Nodes"] thead').within(() => {
diff --git a/packages/manager/cypress/e2e/core/kubernetes/lke-summary-page.spec.ts b/packages/manager/cypress/e2e/core/kubernetes/lke-summary-page.spec.ts
index a840a3f6272..f57449815fb 100644
--- a/packages/manager/cypress/e2e/core/kubernetes/lke-summary-page.spec.ts
+++ b/packages/manager/cypress/e2e/core/kubernetes/lke-summary-page.spec.ts
@@ -7,7 +7,7 @@ import {
   mockGetControlPlaneACL,
   mockGetDashboardUrl,
   mockGetKubeconfig,
-  mockGetKubernetesVersions,
+  mockGetTieredKubernetesVersions,
   mockUpdateCluster,
 } from 'support/intercepts/lke';
 import { ui } from 'support/ui';
@@ -99,7 +99,7 @@ describe('LKE summary page', () => {
     };
 
     mockGetCluster(mockCluster).as('getCluster');
-    mockGetKubernetesVersions().as('getVersions');
+    mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
     mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
     mockGetApiEndpoints(mockCluster.id).as('getApiEndpoints');
     mockGetDashboardUrl(mockCluster.id).as('getDashboardUrl');
@@ -110,7 +110,7 @@ describe('LKE summary page', () => {
     cy.wait([
       '@getCluster',
       '@getNodePools',
-      '@getVersions',
+      '@getTieredVersions',
       '@getApiEndpoints',
       '@getDashboardUrl',
     ]);
@@ -162,7 +162,7 @@ describe('LKE summary page', () => {
     };
 
     mockGetCluster(mockCluster).as('getCluster');
-    mockGetKubernetesVersions().as('getVersions');
+    mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
     mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
     mockGetApiEndpoints(mockCluster.id).as('getApiEndpoints');
     mockGetDashboardUrl(mockCluster.id).as('getDashboardUrl');
@@ -173,7 +173,7 @@ describe('LKE summary page', () => {
     cy.wait([
       '@getCluster',
       '@getNodePools',
-      '@getVersions',
+      '@getTieredVersions',
       '@getApiEndpoints',
       '@getDashboardUrl',
     ]);
@@ -232,7 +232,7 @@ describe('LKE summary page', () => {
     };
 
     mockGetCluster(mockCluster).as('getCluster');
-    mockGetKubernetesVersions().as('getVersions');
+    mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
     mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
     mockGetApiEndpoints(mockCluster.id).as('getApiEndpoints');
     mockGetDashboardUrl(mockCluster.id).as('getDashboardUrl');
@@ -243,7 +243,7 @@ describe('LKE summary page', () => {
     cy.wait([
       '@getCluster',
       '@getNodePools',
-      '@getVersions',
+      '@getTieredVersions',
       '@getApiEndpoints',
       '@getDashboardUrl',
     ]);
@@ -287,7 +287,7 @@ describe('LKE summary page', () => {
     };
 
     mockGetCluster(mockCluster).as('getCluster');
-    mockGetKubernetesVersions().as('getVersions');
+    mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
     mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
     mockGetApiEndpoints(mockCluster.id).as('getApiEndpoints');
     mockGetDashboardUrl(mockCluster.id).as('getDashboardUrl');
@@ -298,7 +298,7 @@ describe('LKE summary page', () => {
     cy.wait([
       '@getCluster',
       '@getNodePools',
-      '@getVersions',
+      '@getTieredVersions',
       '@getApiEndpoints',
       '@getDashboardUrl',
     ]);
diff --git a/packages/manager/cypress/e2e/core/kubernetes/lke-update.spec.ts b/packages/manager/cypress/e2e/core/kubernetes/lke-update.spec.ts
index 3720db12603..001dae86248 100644
--- a/packages/manager/cypress/e2e/core/kubernetes/lke-update.spec.ts
+++ b/packages/manager/cypress/e2e/core/kubernetes/lke-update.spec.ts
@@ -23,7 +23,6 @@ import {
   mockGetControlPlaneACL,
   mockGetControlPlaneACLError,
   mockGetDashboardUrl,
-  mockGetKubernetesVersions,
   mockGetTieredKubernetesVersions,
   mockRecycleAllNodes,
   mockRecycleNode,
@@ -48,6 +47,7 @@ import {
   kubernetesClusterFactory,
   kubernetesControlPlaneACLFactory,
   kubernetesControlPlaneACLOptionsFactory,
+  kubernetesStandardTierVersionFactory,
   nodePoolFactory,
 } from 'src/factories';
 import { extendType } from 'src/utilities/extendType';
@@ -97,13 +97,13 @@ describe('LKE cluster updates', () => {
 
       mockGetCluster(mockCluster).as('getCluster');
       mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
       mockUpdateCluster(mockCluster.id, mockClusterWithHA).as('updateCluster');
       mockGetDashboardUrl(mockCluster.id);
       mockGetApiEndpoints(mockCluster.id);
 
       cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}`);
-      cy.wait(['@getCluster', '@getNodePools', '@getVersions']);
+      cy.wait(['@getCluster', '@getNodePools', '@getTieredVersions']);
 
       // Initiate high availability upgrade and agree to changes.
       ui.button
@@ -145,8 +145,10 @@ describe('LKE cluster updates', () => {
      * - Confirms that Kubernetes upgrade prompt is hidden when up-to-date.
      */
     it('can upgrade standard kubernetes version from the details page', () => {
-      const oldVersion = '1.25';
-      const newVersion = '1.26';
+      const mockTieredStandardVersions =
+        kubernetesStandardTierVersionFactory.buildList(2);
+      const oldVersion = mockTieredStandardVersions[0].id;
+      const newVersion = mockTieredStandardVersions[1].id;
 
       const mockCluster = kubernetesClusterFactory.build({
         k8s_version: oldVersion,
@@ -158,7 +160,7 @@ describe('LKE cluster updates', () => {
         k8s_version: newVersion,
       };
 
-      const upgradePrompt = 'A new version of Kubernetes is available (1.26).';
+      const upgradePrompt = `A new version of Kubernetes is available (${newVersion}).`;
 
       const upgradeNotes = [
         'This upgrades the control plane on your cluster',
@@ -169,14 +171,17 @@ describe('LKE cluster updates', () => {
       ];
 
       mockGetCluster(mockCluster).as('getCluster');
-      mockGetKubernetesVersions([newVersion, oldVersion]).as('getVersions');
+      mockGetTieredKubernetesVersions(
+        'standard',
+        mockTieredStandardVersions
+      ).as('getTieredVersions');
       mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
       mockUpdateCluster(mockCluster.id, mockClusterUpdated).as('updateCluster');
       mockGetDashboardUrl(mockCluster.id);
       mockGetApiEndpoints(mockCluster.id);
 
       cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}`);
-      cy.wait(['@getCluster', '@getNodePools', '@getVersions']);
+      cy.wait(['@getCluster', '@getNodePools', '@getTieredVersions']);
 
       // Confirm that upgrade prompt is shown.
       cy.findByText(upgradePrompt).should('be.visible');
@@ -187,9 +192,7 @@ describe('LKE cluster updates', () => {
         .click();
 
       ui.dialog
-        .findByTitle(
-          `Upgrade Kubernetes version to ${newVersion} on ${mockCluster.label}?`
-        )
+        .findByTitle(`Upgrade Cluster ${mockCluster.label} to ${newVersion}`)
         .should('be.visible')
         .within(() => {
           upgradeNotes.forEach((note: string) => {
@@ -293,7 +296,7 @@ describe('LKE cluster updates', () => {
 
       const upgradeNotes = [
         'This upgrades the control plane on your cluster',
-        'Worker nodes within each node pool can then be upgraded separately.',
+        'Existing worker nodes are updated automatically or manually, depending on the update strategy defined for each node pool.',
         // Confirm that the old version and new version are both shown.
         oldVersion,
         newVersion,
@@ -327,9 +330,7 @@ describe('LKE cluster updates', () => {
         .click();
 
       ui.dialog
-        .findByTitle(
-          `Upgrade Kubernetes version to ${newVersion} on ${mockCluster.label}?`
-        )
+        .findByTitle(`Upgrade Cluster ${mockCluster.label} to ${newVersion}`)
         .should('be.visible')
         .within(() => {
           upgradeNotes.forEach((note: string) => {
@@ -387,12 +388,17 @@ describe('LKE cluster updates', () => {
       mockGetCluster(mockCluster).as('getCluster');
       mockGetClusterPools(mockCluster.id, [mockNodePool]).as('getNodePools');
       mockGetLinodes([mockLinode]).as('getLinodes');
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
       mockGetDashboardUrl(mockCluster.id);
       mockGetApiEndpoints(mockCluster.id);
 
       cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}`);
-      cy.wait(['@getCluster', '@getNodePools', '@getLinodes', '@getVersions']);
+      cy.wait([
+        '@getCluster',
+        '@getNodePools',
+        '@getLinodes',
+        '@getTieredVersions',
+      ]);
 
       // Recycle individual node.
       ui.button
@@ -525,7 +531,7 @@ describe('LKE cluster updates', () => {
 
       mockGetCluster(mockCluster).as('getCluster');
       mockGetClusterPools(mockCluster.id, [mockNodePool]).as('getNodePools');
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
       mockGetDashboardUrl(mockCluster.id);
       mockGetApiEndpoints(mockCluster.id);
       mockGetAccount(
@@ -539,7 +545,12 @@ describe('LKE cluster updates', () => {
       });
 
       cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}`);
-      cy.wait(['@getAccount', '@getCluster', '@getNodePools', '@getVersions']);
+      cy.wait([
+        '@getAccount',
+        '@getCluster',
+        '@getNodePools',
+        '@getTieredVersions',
+      ]);
 
       // Click "Autoscale Pool", enable autoscaling, and set min and max values.
       mockUpdateNodePool(mockCluster.id, mockNodePoolAutoscale).as(
@@ -677,7 +688,7 @@ describe('LKE cluster updates', () => {
 
       mockGetCluster(mockCluster).as('getCluster');
       mockGetClusterPools(mockCluster.id, [mockNodePool]).as('getNodePools');
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('enterprise').as('getTieredVersions');
       mockGetDashboardUrl(mockCluster.id);
       mockGetApiEndpoints(mockCluster.id);
       mockGetAccount(
@@ -691,7 +702,12 @@ describe('LKE cluster updates', () => {
       });
 
       cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}`);
-      cy.wait(['@getAccount', '@getCluster', '@getNodePools', '@getVersions']);
+      cy.wait([
+        '@getAccount',
+        '@getCluster',
+        '@getNodePools',
+        '@getTieredVersions',
+      ]);
 
       // Click "Autoscale Pool", enable autoscaling, and set min and max values.
       mockUpdateNodePool(mockCluster.id, mockNodePoolAutoscale).as(
@@ -801,12 +817,17 @@ describe('LKE cluster updates', () => {
         'getNodePools'
       );
       mockGetLinodes(mockLinodes).as('getLinodes');
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
       mockGetDashboardUrl(mockCluster.id);
       mockGetApiEndpoints(mockCluster.id);
 
       cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}`);
-      cy.wait(['@getCluster', '@getNodePools', '@getLinodes', '@getVersions']);
+      cy.wait([
+        '@getCluster',
+        '@getNodePools',
+        '@getLinodes',
+        '@getTieredVersions',
+      ]);
 
       // Confirm that nodes are listed with correct details.
       mockNodePoolInitial.nodes.forEach((node: PoolNodeResponse) => {
@@ -945,7 +966,7 @@ describe('LKE cluster updates', () => {
 
       mockGetCluster(mockCluster).as('getCluster');
       mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
       mockResetKubeconfig(mockCluster.id).as('resetKubeconfig');
       mockGetDashboardUrl(mockCluster.id);
       mockGetApiEndpoints(mockCluster.id);
@@ -957,7 +978,7 @@ describe('LKE cluster updates', () => {
       ];
 
       cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}`);
-      cy.wait(['@getCluster', '@getNodePools', '@getVersions']);
+      cy.wait(['@getCluster', '@getNodePools', '@getTieredVersions']);
 
       // Click "Reset" button, proceed through confirmation dialog.
       cy.findByText('Reset').should('be.visible').click({ force: true });
@@ -1088,7 +1109,7 @@ describe('LKE cluster updates', () => {
 
       mockGetCluster(mockCluster).as('getCluster');
       mockGetClusterPools(mockCluster.id, [mockNodePool]).as('getNodePools');
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
       mockAddNodePool(mockCluster.id, mockNewNodePool).as('addNodePool');
       mockDeleteNodePool(mockCluster.id, mockNewNodePool.id).as(
         'deleteNodePool'
@@ -1097,7 +1118,12 @@ describe('LKE cluster updates', () => {
       mockGetApiEndpoints(mockCluster.id);
 
       cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}`);
-      cy.wait(['@getRegions', '@getCluster', '@getNodePools', '@getVersions']);
+      cy.wait([
+        '@getRegions',
+        '@getCluster',
+        '@getNodePools',
+        '@getTieredVersions',
+      ]);
 
       // Assert that initial node pool is shown on the page.
       cy.findByText('Dedicated 8 GB', { selector: 'h3' }).should('be.visible');
@@ -1210,12 +1236,12 @@ describe('LKE cluster updates', () => {
       });
 
       mockGetCluster(mockCluster).as('getCluster');
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
       mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
       mockUpdateCluster(mockCluster.id, mockNewCluster).as('updateCluster');
 
       cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
-      cy.wait(['@getCluster', '@getNodePools', '@getVersions']);
+      cy.wait(['@getCluster', '@getNodePools', '@getTieredVersions']);
 
       // LKE clusters can be renamed by clicking on the cluster's name in the breadcrumbs towards the top of the page.
       cy.get('[data-testid="editable-text"] > [data-testid="button"]').click();
@@ -1246,14 +1272,14 @@ describe('LKE cluster updates', () => {
       const mockErrorMessage = 'API request fails';
 
       mockGetCluster(mockCluster).as('getCluster');
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
       mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
       mockUpdateClusterError(mockCluster.id, mockErrorMessage).as(
         'updateClusterError'
       );
 
       cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
-      cy.wait(['@getCluster', '@getNodePools', '@getVersions']);
+      cy.wait(['@getCluster', '@getNodePools', '@getTieredVersions']);
 
       // LKE cluster can be renamed by clicking on the cluster's name in the breadcrumbs towards the top of the page.
       cy.get('[data-testid="editable-text"] > [data-testid="button"]').click();
@@ -1308,7 +1334,7 @@ describe('LKE cluster updates', () => {
     mockGetClusterPools(mockCluster.id, [mockNodePoolNoTags]).as(
       'getNodePoolsNoTags'
     );
-    mockGetKubernetesVersions().as('getVersions');
+    mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
     mockGetControlPlaneACL(mockCluster.id, { acl: { enabled: false } }).as(
       'getControlPlaneAcl'
     );
@@ -1320,7 +1346,7 @@ describe('LKE cluster updates', () => {
     cy.wait([
       '@getCluster',
       '@getNodePoolsNoTags',
-      '@getVersions',
+      '@getTieredVersions',
       '@getType',
       '@getControlPlaneAcl',
     ]);
@@ -1425,7 +1451,7 @@ describe('LKE cluster updates', () => {
       mockGetClusterPools(mockCluster.id, [mockNodePoolInitial]).as(
         'getNodePools'
       );
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
       mockGetControlPlaneACL(mockCluster.id, { acl: { enabled: false } }).as(
         'getControlPlaneAcl'
       );
@@ -1446,7 +1472,7 @@ describe('LKE cluster updates', () => {
       cy.wait([
         '@getCluster',
         '@getNodePools',
-        '@getVersions',
+        '@getTieredVersions',
         '@getType',
         '@getControlPlaneAcl',
       ]);
@@ -1589,7 +1615,7 @@ describe('LKE cluster updates', () => {
       cy.wait([
         '@getCluster',
         '@getNodePools',
-        '@getVersions',
+        '@getTieredVersions',
         '@getType',
         '@getControlPlaneAcl',
       ]);
@@ -1771,7 +1797,7 @@ describe('LKE cluster updates', () => {
       cy.wait([
         '@getCluster',
         '@getNodePools',
-        '@getVersions',
+        '@getTieredVersions',
         '@getType',
         '@getControlPlaneAcl',
       ]);
@@ -2238,7 +2264,7 @@ describe('LKE cluster updates', () => {
       );
       mockGetLinodes(mockLinodes).as('getLinodes');
       mockGetLinodeType(mockPlanType).as('getLinodeType');
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
       mockGetDashboardUrl(mockCluster.id);
       mockGetApiEndpoints(mockCluster.id);
 
@@ -2248,7 +2274,7 @@ describe('LKE cluster updates', () => {
         '@getCluster',
         '@getNodePools',
         '@getLinodes',
-        '@getVersions',
+        '@getTieredVersions',
         '@getLinodeType',
       ]);
 
@@ -2378,7 +2404,7 @@ describe('LKE cluster updates', () => {
 
       mockGetCluster(mockCluster).as('getCluster');
       mockGetClusterPools(mockCluster.id, [mockNodePool]).as('getNodePools');
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
       mockAddNodePool(mockCluster.id, mockNewNodePool).as('addNodePool');
       mockGetLinodeType(mockPlanType).as('getLinodeType');
       mockGetLinodeTypes(dcPricingMockLinodeTypes);
@@ -2390,7 +2416,7 @@ describe('LKE cluster updates', () => {
         '@getRegions',
         '@getCluster',
         '@getNodePools',
-        '@getVersions',
+        '@getTieredVersions',
         '@getLinodeType',
       ]);
 
@@ -2506,7 +2532,7 @@ describe('LKE cluster updates', () => {
       );
       mockGetLinodes(mockLinodes).as('getLinodes');
       mockGetLinodeType(mockPlanType).as('getLinodeType');
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
       mockGetDashboardUrl(mockCluster.id);
       mockGetApiEndpoints(mockCluster.id);
 
@@ -2516,7 +2542,7 @@ describe('LKE cluster updates', () => {
         '@getCluster',
         '@getNodePools',
         '@getLinodes',
-        '@getVersions',
+        '@getTieredVersions',
         '@getLinodeType',
       ]);
 
@@ -2637,7 +2663,7 @@ describe('LKE cluster updates', () => {
 
       mockGetCluster(mockCluster).as('getCluster');
       mockGetClusterPools(mockCluster.id, [mockNodePool]).as('getNodePools');
-      mockGetKubernetesVersions().as('getVersions');
+      mockGetTieredKubernetesVersions('standard').as('getTieredVersions');
       mockAddNodePool(mockCluster.id, mockNewNodePool).as('addNodePool');
       mockGetLinodeType(mockPlanType).as('getLinodeType');
       mockGetLinodeTypes(dcPricingMockLinodeTypes);
@@ -2649,7 +2675,7 @@ describe('LKE cluster updates', () => {
         '@getRegions',
         '@getCluster',
         '@getNodePools',
-        '@getVersions',
+        '@getTieredVersions',
         '@getLinodeType',
       ]);
 
diff --git a/packages/manager/cypress/e2e/core/kubernetes/smoke-lke-enterprise.spec.ts b/packages/manager/cypress/e2e/core/kubernetes/smoke-lke-enterprise.spec.ts
index 86f121919f5..1a9f1ec1076 100644
--- a/packages/manager/cypress/e2e/core/kubernetes/smoke-lke-enterprise.spec.ts
+++ b/packages/manager/cypress/e2e/core/kubernetes/smoke-lke-enterprise.spec.ts
@@ -1,10 +1,9 @@
 /**
  * Tests basic functionality for LKE-E feature-flagged work.
- * TODO: M3-10365 - Add `postLa` smoke tests to this file.
  * TODO: M3-8838 - Delete this spec file once LKE-E is released to GA.
  */
 
-import { regionFactory } from '@linode/utilities';
+import { linodeTypeFactory, regionFactory } from '@linode/utilities';
 import {
   accountFactory,
   kubernetesClusterFactory,
@@ -15,23 +14,32 @@ import {
 import {
   latestEnterpriseTierKubernetesVersion,
   minimumNodeNotice,
+  mockTieredEnterpriseVersions,
+  mockTieredStandardVersions,
 } from 'support/constants/lke';
 import { mockGetAccount } from 'support/intercepts/account';
 import { mockAppendFeatureFlags } from 'support/intercepts/feature-flags';
+import {
+  mockGetLinodeType,
+  mockGetLinodeTypes,
+} from 'support/intercepts/linodes';
 import {
   mockCreateCluster,
   mockGetCluster,
   mockGetClusterPools,
+  mockGetClusters,
   mockGetTieredKubernetesVersions,
 } from 'support/intercepts/lke';
-import { mockGetClusters } from 'support/intercepts/lke';
 import {} from 'support/intercepts/profile';
 import { mockGetRegions } from 'support/intercepts/regions';
 import { mockGetVPC } from 'support/intercepts/vpc';
 import { ui } from 'support/ui';
+import { lkeClusterCreatePage } from 'support/ui/pages';
 import { addNodes } from 'support/util/lke';
 import { randomLabel } from 'support/util/random';
 
+import { extendType } from 'src/utilities/extendType';
+
 const mockCluster = kubernetesClusterFactory.build({
   id: 1,
   vpc_id: 123,
@@ -39,6 +47,12 @@ const mockCluster = kubernetesClusterFactory.build({
   tier: 'enterprise',
 });
 
+const mockPlan = extendType(
+  linodeTypeFactory.build({
+    class: 'dedicated',
+  })
+);
+
 const mockVPC = vpcFactory.build({
   id: 123,
   label: 'lke-e-vpc',
@@ -48,18 +62,10 @@ const mockVPC = vpcFactory.build({
 const mockNodePools = [nodePoolFactory.build()];
 
 // Mock a valid region for LKE-E to avoid test flake.
-const mockRegions = [
-  regionFactory.build({
-    capabilities: ['Linodes', 'Kubernetes', 'Kubernetes Enterprise', 'VPCs'],
-    id: 'us-iad',
-    label: 'Washington, DC',
-  }),
-];
+const mockRegion = regionFactory.build({
+  capabilities: ['Linodes', 'Kubernetes', 'Kubernetes Enterprise', 'VPCs'],
+});
 
-/**
- * - Confirms VPC and IP Stack selections are shown with the respective `phase2Mtc` feature flags enabled.
- * - Confirms VPC and IP Stack selections are not shown in create flow with their respective `phase2Mtc` feature flags disabled.
- */
 describe('LKE-E Cluster Create', () => {
   beforeEach(() => {
     mockGetAccount(
@@ -71,290 +77,446 @@ describe('LKE-E Cluster Create', () => {
         ],
       })
     ).as('getAccount');
-  });
-
-  it('Simple Page Check - Phase 2 MTC BYO VPC Flag ON', () => {
-    mockAppendFeatureFlags({
-      lkeEnterprise2: {
-        enabled: true,
-        la: true,
-        postLa: false,
-        phase2Mtc: { byoVPC: true, dualStack: false },
-      },
-    }).as('getFeatureFlags');
-
+    mockGetRegions([mockRegion]);
+    mockGetLinodeTypes([mockPlan]);
+    mockGetLinodeType(mockPlan);
+    mockGetTieredKubernetesVersions('standard', mockTieredStandardVersions);
+    mockGetTieredKubernetesVersions('enterprise', mockTieredEnterpriseVersions);
     mockCreateCluster(mockCluster).as('createCluster');
-    mockGetTieredKubernetesVersions('enterprise', [
-      latestEnterpriseTierKubernetesVersion,
-    ]).as('getTieredKubernetesVersions');
-    mockGetRegions(mockRegions);
-
-    cy.visitWithLogin('/kubernetes/create');
-    cy.findByText('Add Node Pools').should('be.visible');
-
-    cy.findByLabelText('Cluster Label').click();
-    cy.focused().type(mockCluster.label);
-
-    cy.findByText('LKE Enterprise').click();
-
-    ui.regionSelect.find().click().type(`${mockRegions[0].label}`);
-    ui.regionSelect.findItemByRegionId(mockRegions[0].id).click();
-
-    cy.findByLabelText('Kubernetes Version').should('be.visible').click();
-    cy.findByText(latestEnterpriseTierKubernetesVersion.id)
-      .should('be.visible')
-      .click();
+  });
 
-    // Confirms LKE-E Phase 2 VPC options do not display with the Dual Stack flag OFF.
-    cy.findByText('IP Stack').should('not.exist');
-    cy.findByText('IPv4', { exact: true }).should('not.exist');
-    cy.findByText('IPv4 + IPv6 (dual-stack)').should('not.exist');
+  /*
+   * Smoke tests to confirm the state of the LKE Create page when the LKE-E
+   * Post-LA feature flag is enabled and disabled.
+   *
+   * The Post-LA feature flag introduces the "Configure Node Pool" button and
+   * flow when choosing node pools during the create flow. When disabled, it's
+   * expected that users can add node pools from directly within the plan table.
+   * When the flag is enabled, users instead select the plan they want and
+   * configure the pool from within a new drawer. Additional configuration options
+   * are available for LKE-E clusters as well.
+   */
+  describe('Post-LA feature flag', () => {
+    /*
+     * - Confirms the state of the LKE create page when the LKE-E "postLa" flag is enabled.
+     * - Confirms that node pools are configured via new drawer.
+     */
+    it('Simple Page Check - Post LA Flag ON', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          postLa: true,
+          phase2Mtc: { byoVPC: false, dualStack: false },
+        },
+      });
 
-    // Confirms LKE-E Phase 2 VPC options display with the BYO VPC flag ON.
-    cy.findByText('Automatically generate a VPC for this cluster').should(
-      'be.visible'
-    );
-    cy.findByText('Use an existing VPC').should('be.visible');
+      cy.visitWithLogin('/kubernetes/create');
 
-    cy.findByText('Shared CPU').should('be.visible').click();
-    addNodes('Linode 2 GB');
+      lkeClusterCreatePage.setLabel(randomLabel());
+      lkeClusterCreatePage.selectRegionById(mockRegion.id, [mockRegion]);
+      lkeClusterCreatePage.selectPlanTab('Dedicated CPU');
+      lkeClusterCreatePage.selectNodePoolPlan(mockPlan.formattedLabel);
 
-    // Bypass ACL validation
-    cy.get('input[name="acl-acknowledgement"]').check();
+      // Confirm that the "Configure Node Pool" drawer appears.
+      lkeClusterCreatePage.withinNodePoolDrawer(mockPlan.formattedLabel, () => {
+        ui.button
+          .findByTitle('Add Pool')
+          .should('be.visible')
+          .should('be.enabled')
+          .click();
+      });
 
-    // Confirm change is reflected in checkout bar.
-    cy.get('[data-testid="kube-checkout-bar"]').within(() => {
-      cy.findByText('Linode 2 GB Plan').should('be.visible');
-      cy.findByTitle('Remove Linode 2GB Node Pool').should('be.visible');
+      // Confirm that "Edit Configuration" button is shown for each node pool
+      // in the order summary section.
+      lkeClusterCreatePage.withinOrderSummary(() => {
+        cy.contains(mockPlan.formattedLabel)
+          .closest('[data-testid="node-pool-summary"]')
+          .within(() => {
+            cy.findByText('Edit Configuration').should('be.visible');
+          });
+      });
+    });
 
-      cy.get('[data-qa-notice="true"]').within(() => {
-        cy.findByText(minimumNodeNotice).should('be.visible');
+    /*
+     * - Confirms the state of the LKE create page when the LKE-E "postLa" flag is disabled.
+     * - Confirms that node pools are added directly via the plan table.
+     */
+    it('Simple Page Check - Post LA Flag OFF', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          postLa: false,
+          phase2Mtc: { byoVPC: false, dualStack: false },
+        },
       });
 
-      ui.button
-        .findByTitle('Create Cluster')
-        .should('be.visible')
-        .should('be.enabled')
-        .click();
+      cy.visitWithLogin('/kubernetes/create');
+
+      lkeClusterCreatePage.setLabel(randomLabel());
+      lkeClusterCreatePage.selectRegionById(mockRegion.id, [mockRegion]);
+      lkeClusterCreatePage.selectPlanTab('Dedicated CPU');
+
+      // Add a node pool with a custom number of nodes, confirm that
+      // it gets added to the summary as expected.
+      lkeClusterCreatePage.addNodePool(mockPlan.formattedLabel, 5);
+
+      lkeClusterCreatePage.withinOrderSummary(() => {
+        cy.contains(mockPlan.formattedLabel)
+          .closest('[data-testid="node-pool-summary"]')
+          .within(() => {
+            // Confirm that fields to edit the node pool size are present and enabled.
+            cy.findByLabelText('Subtract 1')
+              .should('be.visible')
+              .should('be.enabled');
+            cy.findByLabelText('Add 1')
+              .should('be.visible')
+              .should('be.enabled');
+            cy.findByLabelText('Edit Quantity').should('have.value', '5');
+          });
+      });
     });
-
-    cy.wait('@createCluster');
-    cy.url().should(
-      'endWith',
-      `/kubernetes/clusters/${mockCluster.id}/summary`
-    );
   });
 
-  it('Simple Page Check - Phase 2 MTC Dual Stack Flag ON', () => {
-    mockAppendFeatureFlags({
-      lkeEnterprise2: {
-        enabled: true,
-        la: true,
-        postLa: false,
-        phase2Mtc: { byoVPC: false, dualStack: true },
-      },
-    }).as('getFeatureFlags');
-
-    mockCreateCluster(mockCluster).as('createCluster');
-    mockGetTieredKubernetesVersions('enterprise', [
-      latestEnterpriseTierKubernetesVersion,
-    ]).as('getTieredKubernetesVersions');
-    mockGetRegions(mockRegions);
+  /**
+   * - Confirms that VPC options are shown when the `phase2Mtc.byoVPC` feature is enabled.
+   * - Confirms that IP stack selections are shown when the `phase2Mtc.dualStack` feature is enabled.
+   * - Confirms that VPC options and IP stack selections are absent when respective `phase2Mtc` options are disabled.
+   */
+  describe('Phase 2 MTC feature flag', () => {
+    it('Simple Page Check - Phase 2 MTC BYO VPC Flag ON', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          postLa: false,
+          phase2Mtc: { byoVPC: true, dualStack: false },
+        },
+      }).as('getFeatureFlags');
+
+      cy.visitWithLogin('/kubernetes/create');
+      cy.findByText('Add Node Pools').should('be.visible');
+
+      cy.findByLabelText('Cluster Label').click();
+      cy.focused().type(mockCluster.label);
+
+      cy.findByText('LKE Enterprise').click();
+
+      ui.regionSelect.find().click().type(`${mockRegion.label}`);
+      ui.regionSelect.findItemByRegionId(mockRegion.id, [mockRegion]).click();
+
+      cy.findByLabelText('Kubernetes Version').should('be.visible').click();
+      cy.findByText(latestEnterpriseTierKubernetesVersion.id)
+        .should('be.visible')
+        .click();
 
-    cy.visitWithLogin('/kubernetes/create');
-    cy.findByText('Add Node Pools').should('be.visible');
+      // Confirms LKE-E Phase 2 VPC options do not display with the Dual Stack flag OFF.
+      cy.findByText('IP Stack').should('not.exist');
+      cy.findByText('IPv4', { exact: true }).should('not.exist');
+      cy.findByText('IPv4 + IPv6 (dual-stack)').should('not.exist');
 
-    cy.findByLabelText('Cluster Label').click();
-    cy.focused().type(mockCluster.label);
+      // Confirms LKE-E Phase 2 VPC options display with the BYO VPC flag ON.
+      cy.findByText('Automatically generate a VPC for this cluster').should(
+        'be.visible'
+      );
+      cy.findByText('Use an existing VPC').should('be.visible');
+
+      cy.findByText('Dedicated CPU').should('be.visible').click();
+      addNodes(mockPlan.formattedLabel);
+
+      // Bypass ACL validation
+      cy.get('input[name="acl-acknowledgement"]').check();
+
+      // Confirm change is reflected in checkout bar.
+      cy.get('[data-testid="kube-checkout-bar"]').within(() => {
+        cy.findByText(`${mockPlan.formattedLabel} Plan`).should('be.visible');
+        cy.findByTitle(`Remove ${mockPlan.label} Node Pool`).should(
+          'be.visible'
+        );
+
+        cy.get('[data-qa-notice="true"]').within(() => {
+          cy.findByText(minimumNodeNotice).should('be.visible');
+        });
+
+        ui.button
+          .findByTitle('Create Cluster')
+          .should('be.visible')
+          .should('be.enabled')
+          .click();
+      });
 
-    cy.findByText('LKE Enterprise').click();
+      cy.wait('@createCluster');
+      cy.url().should(
+        'endWith',
+        `/kubernetes/clusters/${mockCluster.id}/summary`
+      );
+    });
 
-    ui.regionSelect.find().click().type(`${mockRegions[0].label}`);
-    ui.regionSelect.findItemByRegionId(mockRegions[0].id).click();
+    it('Simple Page Check - Phase 2 MTC Dual Stack Flag ON', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          postLa: false,
+          phase2Mtc: { byoVPC: false, dualStack: true },
+        },
+      }).as('getFeatureFlags');
 
-    cy.findByLabelText('Kubernetes Version').should('be.visible').click();
-    cy.findByText(latestEnterpriseTierKubernetesVersion.id)
-      .should('be.visible')
-      .click();
+      cy.visitWithLogin('/kubernetes/create');
+      cy.findByText('Add Node Pools').should('be.visible');
 
-    // Confirms LKE-E Phase 2 IP Stack displays with the Dual Stack flag ON.
-    cy.findByText('IP Stack').should('be.visible');
-    cy.findByText('IPv4', { exact: true }).should('be.visible');
-    cy.findByText('IPv4 + IPv6 (dual-stack)').should('be.visible');
+      cy.findByLabelText('Cluster Label').click();
+      cy.focused().type(mockCluster.label);
 
-    // Confirms LKE-E Phase 2 VPC options do not display with the BYO VPC flag OFF.
-    cy.findByText('Automatically generate a VPC for this cluster').should(
-      'not.exist'
-    );
-    cy.findByText('Use an existing VPC').should('not.exist');
+      cy.findByText('LKE Enterprise').click();
 
-    cy.findByText('Shared CPU').should('be.visible').click();
-    addNodes('Linode 2 GB');
+      ui.regionSelect.find().click().type(`${mockRegion.label}`);
+      ui.regionSelect.findItemByRegionId(mockRegion.id, [mockRegion]).click();
 
-    // Bypass ACL validation
-    cy.get('input[name="acl-acknowledgement"]').check();
+      cy.findByLabelText('Kubernetes Version').should('be.visible').click();
+      cy.findByText(latestEnterpriseTierKubernetesVersion.id)
+        .should('be.visible')
+        .click();
 
-    // Confirm change is reflected in checkout bar.
-    cy.get('[data-testid="kube-checkout-bar"]').within(() => {
-      cy.findByText('Linode 2 GB Plan').should('be.visible');
-      cy.findByTitle('Remove Linode 2GB Node Pool').should('be.visible');
+      // Confirms LKE-E Phase 2 IP Stack displays with the Dual Stack flag ON.
+      cy.findByText('IP Stack').should('be.visible');
+      cy.findByText('IPv4', { exact: true }).should('be.visible');
+      cy.findByText('IPv4 + IPv6 (dual-stack)').should('be.visible');
 
-      cy.get('[data-qa-notice="true"]').within(() => {
-        cy.findByText(minimumNodeNotice).should('be.visible');
+      // Confirms LKE-E Phase 2 VPC options do not display with the BYO VPC flag OFF.
+      cy.findByText('Automatically generate a VPC for this cluster').should(
+        'not.exist'
+      );
+      cy.findByText('Use an existing VPC').should('not.exist');
+
+      cy.findByText('Dedicated CPU').should('be.visible').click();
+      addNodes(mockPlan.formattedLabel);
+
+      // Bypass ACL validation
+      cy.get('input[name="acl-acknowledgement"]').check();
+
+      // Confirm change is reflected in checkout bar.
+      cy.get('[data-testid="kube-checkout-bar"]').within(() => {
+        cy.findByText(`${mockPlan.formattedLabel} Plan`).should('be.visible');
+        cy.findByTitle(`Remove ${mockPlan.label} Node Pool`).should(
+          'be.visible'
+        );
+
+        cy.get('[data-qa-notice="true"]').within(() => {
+          cy.findByText(minimumNodeNotice).should('be.visible');
+        });
+
+        ui.button
+          .findByTitle('Create Cluster')
+          .should('be.visible')
+          .should('be.enabled')
+          .click();
       });
 
-      ui.button
-        .findByTitle('Create Cluster')
-        .should('be.visible')
-        .should('be.enabled')
-        .click();
+      cy.wait('@createCluster');
+      cy.url().should(
+        'endWith',
+        `/kubernetes/clusters/${mockCluster.id}/summary`
+      );
     });
 
-    cy.wait('@createCluster');
-    cy.url().should(
-      'endWith',
-      `/kubernetes/clusters/${mockCluster.id}/summary`
-    );
-  });
+    it('Simple Page Check - Phase 2 MTC Flags Both ON', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          postLa: false,
+          phase2Mtc: { byoVPC: true, dualStack: true },
+        },
+      }).as('getFeatureFlags');
 
-  it('Simple Page Check - Phase 2 MTC Flags Both ON', () => {
-    mockAppendFeatureFlags({
-      lkeEnterprise2: {
-        enabled: true,
-        la: true,
-        postLa: false,
-        phase2Mtc: { byoVPC: true, dualStack: true },
-      },
-    }).as('getFeatureFlags');
+      cy.visitWithLogin('/kubernetes/create');
+      cy.findByText('Add Node Pools').should('be.visible');
 
-    mockCreateCluster(mockCluster).as('createCluster');
-    mockGetTieredKubernetesVersions('enterprise', [
-      latestEnterpriseTierKubernetesVersion,
-    ]).as('getTieredKubernetesVersions');
-    mockGetRegions(mockRegions);
+      cy.findByLabelText('Cluster Label').click();
+      cy.focused().type(mockCluster.label);
 
-    cy.visitWithLogin('/kubernetes/create');
-    cy.findByText('Add Node Pools').should('be.visible');
+      cy.findByText('LKE Enterprise').click();
 
-    cy.findByLabelText('Cluster Label').click();
-    cy.focused().type(mockCluster.label);
+      ui.regionSelect.find().click().type(`${mockRegion.label}`);
+      ui.regionSelect.findItemByRegionId(mockRegion.id, [mockRegion]).click();
 
-    cy.findByText('LKE Enterprise').click();
+      cy.findByLabelText('Kubernetes Version').should('be.visible').click();
+      cy.findByText(latestEnterpriseTierKubernetesVersion.id)
+        .should('be.visible')
+        .click();
 
-    ui.regionSelect.find().click().type(`${mockRegions[0].label}`);
-    ui.regionSelect.findItemByRegionId(mockRegions[0].id).click();
+      // Confirms LKE-E Phase 2 IP Stack and VPC options display with both flags ON.
+      cy.findByText('IP Stack').should('be.visible');
+      cy.findByText('IPv4', { exact: true }).should('be.visible');
+      cy.findByText('IPv4 + IPv6 (dual-stack)').should('be.visible');
+      cy.findByText('Automatically generate a VPC for this cluster').should(
+        'be.visible'
+      );
+      cy.findByText('Use an existing VPC').should('be.visible');
+
+      cy.findByText('Dedicated CPU').should('be.visible').click();
+      addNodes(mockPlan.formattedLabel);
+
+      // Bypass ACL validation
+      cy.get('input[name="acl-acknowledgement"]').check();
+
+      // Confirm change is reflected in checkout bar.
+      cy.get('[data-testid="kube-checkout-bar"]').within(() => {
+        cy.findByText(`${mockPlan.formattedLabel} Plan`).should('be.visible');
+        cy.findByTitle(`Remove ${mockPlan.label} Node Pool`).should(
+          'be.visible'
+        );
+
+        cy.get('[data-qa-notice="true"]').within(() => {
+          cy.findByText(minimumNodeNotice).should('be.visible');
+        });
+
+        ui.button
+          .findByTitle('Create Cluster')
+          .should('be.visible')
+          .should('be.enabled')
+          .click();
+      });
 
-    cy.findByLabelText('Kubernetes Version').should('be.visible').click();
-    cy.findByText(latestEnterpriseTierKubernetesVersion.id)
-      .should('be.visible')
-      .click();
+      cy.wait('@createCluster');
+      cy.url().should(
+        'endWith',
+        `/kubernetes/clusters/${mockCluster.id}/summary`
+      );
+    });
 
-    // Confirms LKE-E Phase 2 IP Stack and VPC options display with both flags ON.
-    cy.findByText('IP Stack').should('be.visible');
-    cy.findByText('IPv4', { exact: true }).should('be.visible');
-    cy.findByText('IPv4 + IPv6 (dual-stack)').should('be.visible');
-    cy.findByText('Automatically generate a VPC for this cluster').should(
-      'be.visible'
-    );
-    cy.findByText('Use an existing VPC').should('be.visible');
+    it('Simple Page Check - Phase 2 MTC Flags Both OFF', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          postLa: false,
+          phase2Mtc: { byoVPC: false, dualStack: false },
+        },
+      }).as('getFeatureFlags');
 
-    cy.findByText('Shared CPU').should('be.visible').click();
-    addNodes('Linode 2 GB');
+      cy.visitWithLogin('/kubernetes/create');
+      cy.findByText('Add Node Pools').should('be.visible');
 
-    // Bypass ACL validation
-    cy.get('input[name="acl-acknowledgement"]').check();
+      cy.findByLabelText('Cluster Label').click();
+      cy.focused().type(mockCluster.label);
 
-    // Confirm change is reflected in checkout bar.
-    cy.get('[data-testid="kube-checkout-bar"]').within(() => {
-      cy.findByText('Linode 2 GB Plan').should('be.visible');
-      cy.findByTitle('Remove Linode 2GB Node Pool').should('be.visible');
+      cy.findByText('LKE Enterprise').click();
 
-      cy.get('[data-qa-notice="true"]').within(() => {
-        cy.findByText(minimumNodeNotice).should('be.visible');
-      });
+      ui.regionSelect.find().click().type(`${mockRegion.label}`);
+      ui.regionSelect.findItemByRegionId(mockRegion.id, [mockRegion]).click();
 
-      ui.button
-        .findByTitle('Create Cluster')
+      cy.findByLabelText('Kubernetes Version').should('be.visible').click();
+      cy.findByText(latestEnterpriseTierKubernetesVersion.id)
         .should('be.visible')
-        .should('be.enabled')
         .click();
-    });
-
-    cy.wait('@createCluster');
-    cy.url().should(
-      'endWith',
-      `/kubernetes/clusters/${mockCluster.id}/summary`
-    );
-  });
-
-  it('Simple Page Check - Phase 2 MTC Flags Both OFF', () => {
-    mockAppendFeatureFlags({
-      lkeEnterprise2: {
-        enabled: true,
-        la: true,
-        postLa: false,
-        phase2Mtc: { byoVPC: false, dualStack: false },
-      },
-    }).as('getFeatureFlags');
 
-    mockCreateCluster(mockCluster).as('createCluster');
-    mockGetTieredKubernetesVersions('enterprise', [
-      latestEnterpriseTierKubernetesVersion,
-    ]).as('getTieredKubernetesVersions');
-    mockGetRegions(mockRegions);
-
-    cy.visitWithLogin('/kubernetes/create');
-    cy.findByText('Add Node Pools').should('be.visible');
-
-    cy.findByLabelText('Cluster Label').click();
-    cy.focused().type(mockCluster.label);
+      // Confirms LKE-E Phase 2 IP Stack and VPC options do not display with both flags OFF.
+      cy.findByText('IP Stack').should('not.exist');
+      cy.findByText('IPv4', { exact: true }).should('not.exist');
+      cy.findByText('IPv4 + IPv6 (dual-stack)').should('not.exist');
+      cy.findByText('Automatically generate a VPC for this cluster').should(
+        'not.exist'
+      );
+      cy.findByText('Use an existing VPC').should('not.exist');
+
+      cy.findByText('Dedicated CPU').should('be.visible').click();
+      addNodes(mockPlan.formattedLabel);
+
+      // Bypass ACL validation
+      cy.get('input[name="acl-acknowledgement"]').check();
+
+      // Confirm change is reflected in checkout bar.
+      cy.get('[data-testid="kube-checkout-bar"]').within(() => {
+        cy.findByText(`${mockPlan.formattedLabel} Plan`).should('be.visible');
+        cy.findByTitle(`Remove ${mockPlan.label} Node Pool`).should(
+          'be.visible'
+        );
+
+        cy.get('[data-qa-notice="true"]').within(() => {
+          cy.findByText(minimumNodeNotice).should('be.visible');
+        });
+
+        ui.button
+          .findByTitle('Create Cluster')
+          .should('be.visible')
+          .should('be.enabled')
+          .click();
+      });
 
-    cy.findByText('LKE Enterprise').click();
+      cy.wait('@createCluster');
+      cy.url().should(
+        'endWith',
+        `/kubernetes/clusters/${mockCluster.id}/summary`
+      );
+    });
+  });
 
-    ui.regionSelect.find().click().type(`${mockRegions[0].label}`);
-    ui.regionSelect.findItemByRegionId(mockRegions[0].id).click();
+  describe('Phase 2 MTC & Post-LA feature flags', () => {
+    it('Simple Page Check - Phase 2 MTC Flags and Post-LA Flag ON', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          postLa: true,
+          phase2Mtc: { byoVPC: true, dualStack: true },
+        },
+      });
 
-    cy.findByLabelText('Kubernetes Version').should('be.visible').click();
-    cy.findByText(latestEnterpriseTierKubernetesVersion.id)
-      .should('be.visible')
-      .click();
+      cy.visitWithLogin('/kubernetes/create');
 
-    // Confirms LKE-E Phase 2 IP Stack and VPC options do not display with both flags OFF.
-    cy.findByText('IP Stack').should('not.exist');
-    cy.findByText('IPv4', { exact: true }).should('not.exist');
-    cy.findByText('IPv4 + IPv6 (dual-stack)').should('not.exist');
-    cy.findByText('Automatically generate a VPC for this cluster').should(
-      'not.exist'
-    );
-    cy.findByText('Use an existing VPC').should('not.exist');
+      lkeClusterCreatePage.setLabel(randomLabel());
+      lkeClusterCreatePage.selectClusterTier('enterprise');
+      lkeClusterCreatePage.selectRegionById(mockRegion.id, [mockRegion]);
+      lkeClusterCreatePage.selectPlanTab('Dedicated CPU');
 
-    cy.findByText('Shared CPU').should('be.visible').click();
-    addNodes('Linode 2 GB');
+      // Confirm that IP stack selection and VPC options are present.
+      cy.findByText('IPv4')
+        .should('be.visible')
+        .closest('input')
+        .should('be.enabled');
 
-    // Bypass ACL validation
-    cy.get('input[name="acl-acknowledgement"]').check();
+      cy.findByText('IPv4 + IPv6 (dual-stack)')
+        .should('be.visible')
+        .closest('input')
+        .should('be.enabled');
 
-    // Confirm change is reflected in checkout bar.
-    cy.get('[data-testid="kube-checkout-bar"]').within(() => {
-      cy.findByText('Linode 2 GB Plan').should('be.visible');
-      cy.findByTitle('Remove Linode 2GB Node Pool').should('be.visible');
+      cy.findByText('Automatically generate a VPC for this cluster')
+        .should('be.visible')
+        .closest('input')
+        .should('be.enabled');
 
-      cy.get('[data-qa-notice="true"]').within(() => {
-        cy.findByText(minimumNodeNotice).should('be.visible');
+      cy.findByText('Use an existing VPC')
+        .should('be.visible')
+        .closest('input')
+        .should('be.enabled');
+
+      // Confirm that node pools are configured via new drawer rather than directly within table.
+      lkeClusterCreatePage.selectNodePoolPlan(mockPlan.formattedLabel);
+      lkeClusterCreatePage.withinNodePoolDrawer(mockPlan.formattedLabel, () => {
+        // Confirm that Enterprise-tier specific options are present.
+        cy.findByText('Update Strategy').should('be.visible');
+        cy.findByText('Use default firewall').should('be.visible');
+        cy.findByText('Select existing firewall').should('be.visible');
+
+        ui.button
+          .findByTitle('Add Pool')
+          .should('be.visible')
+          .should('be.enabled')
+          .click();
       });
 
-      ui.button
-        .findByTitle('Create Cluster')
-        .should('be.visible')
-        .should('be.enabled')
-        .click();
+      lkeClusterCreatePage.withinOrderSummary(() => {
+        cy.contains(mockPlan.formattedLabel)
+          .closest('[data-testid="node-pool-summary"]')
+          .within(() => {
+            cy.findByText('3 Nodes').should('be.visible');
+            cy.findByText('Edit Configuration').should('be.visible');
+          });
+      });
     });
-
-    cy.wait('@createCluster');
-    cy.url().should(
-      'endWith',
-      `/kubernetes/clusters/${mockCluster.id}/summary`
-    );
   });
 });
 
@@ -373,129 +535,265 @@ describe('LKE-E Cluster Read', () => {
         ],
       })
     ).as('getAccount');
-  });
-
-  it('Simple Page Check - Phase 2 MTC BYO VPC Flag ON', () => {
-    mockAppendFeatureFlags({
-      lkeEnterprise2: {
-        enabled: true,
-        la: true,
-        phase2Mtc: { byoVPC: true, dualStack: false },
-      },
-    }).as('getFeatureFlags');
-
     mockGetClusters([mockCluster]).as('getClusters');
     mockGetCluster(mockCluster).as('getCluster');
     mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
     mockGetVPC(mockVPC).as('getVPC');
+  });
 
-    cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
-    cy.wait(['@getCluster', '@getVPC', '@getNodePools']);
-
-    // Confirm linked VPC is present
-    cy.get('[data-qa-kube-entity-footer]').within(() => {
-      cy.contains('VPC:').should('exist');
-      cy.findByTestId('assigned-lke-cluster-label').should(
-        'contain.text',
-        mockVPC.label
-      );
-    });
+  /*
+   * Smoke tests to confirm the state of the LKE cluster details page when the
+   * LKE-E "phase2Mtc" feature flag is enabled.
+   */
+  describe('Phase 2 MTC feature flag', () => {
+    /*
+     * - Confirms the state of the LKE cluster details page when the Phase 2 BYO VPC feature is enabled.
+     * - Confirms that attached VPC label is displayed in the cluster summary.
+     * - Confirms that VPC IP columns are not present when Phase 2 dual stack flag is disabled.
+     */
+    it('Simple Page Check - Phase 2 MTC BYO VPC Flag ON', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          phase2Mtc: { byoVPC: true, dualStack: false },
+        },
+      }).as('getFeatureFlags');
+
+      cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
+      cy.wait(['@getCluster', '@getVPC', '@getNodePools']);
+
+      // Confirm linked VPC is present
+      cy.get('[data-qa-kube-entity-footer]').within(() => {
+        cy.contains('VPC:').should('exist');
+        cy.findByTestId('assigned-lke-cluster-label').should(
+          'contain.text',
+          mockVPC.label
+        );
+      });
 
-    // Confirm VPC IP columns are not present in the node table header
-    cy.get('[aria-label="List of Your Cluster Nodes"] thead').within(() => {
-      cy.contains('th', 'VPC IPv4').should('not.exist');
-      cy.contains('th', 'VPC IPv6').should('not.exist');
+      // Confirm VPC IP columns are not present in the node table header
+      cy.get('[aria-label="List of Your Cluster Nodes"] thead').within(() => {
+        cy.contains('th', 'VPC IPv4').should('not.exist');
+        cy.contains('th', 'VPC IPv6').should('not.exist');
+      });
     });
-  });
 
-  it('Simple Page Check - Phase 2 MTC Dual Stack Flag ON', () => {
-    mockAppendFeatureFlags({
-      lkeEnterprise2: {
-        enabled: true,
-        la: true,
-        phase2Mtc: { byoVPC: false, dualStack: true },
-      },
-    }).as('getFeatureFlags');
+    /*
+     * - Confirms the state of the LKE cluster details page when the Phase 2 dual stack feature is enabled.
+     * - Confirms that VPC node pool table IP columns are present.
+     * - Confirms that attached VPC label is absent in the cluster summary when the BYO VPC feature is disabled.
+     */
+    it('Simple Page Check - Phase 2 MTC Dual Stack Flag ON', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          phase2Mtc: { byoVPC: false, dualStack: true },
+        },
+      }).as('getFeatureFlags');
+
+      cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
+      cy.wait(['@getCluster', '@getNodePools']);
+
+      // Confirm linked VPC is not present
+      cy.get('[data-qa-kube-entity-footer]').within(() => {
+        cy.contains('VPC:').should('not.exist');
+        cy.findByTestId('assigned-lke-cluster-label').should('not.exist');
+      });
 
-    mockGetClusters([mockCluster]).as('getClusters');
-    mockGetCluster(mockCluster).as('getCluster');
-    mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
+      // Confirm VPC IP columns are present in the node table header
+      cy.get('[aria-label="List of Your Cluster Nodes"] thead').within(() => {
+        cy.contains('th', 'VPC IPv4').should('be.visible');
+        cy.contains('th', 'VPC IPv6').should('be.visible');
+      });
+    });
 
-    cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
-    cy.wait(['@getCluster', '@getNodePools']);
+    /*
+     * - Confirms the state of the LKE cluster details page when the Phase 2 dual stack and BYO VPC features are enabled.
+     * - Confirms that VPC node pool table IP columns are present.
+     * - Confirms that attached VPC label is displayed in the cluster summary.
+     */
+    it('Simple Page Check - Phase 2 MTC Flags Both ON', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          phase2Mtc: { byoVPC: true, dualStack: true },
+        },
+      }).as('getFeatureFlags');
+
+      cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
+      cy.wait(['@getCluster', '@getVPC', '@getNodePools']);
+
+      // Confirm linked VPC is present
+      cy.get('[data-qa-kube-entity-footer]').within(() => {
+        cy.contains('VPC:').should('exist');
+        cy.findByTestId('assigned-lke-cluster-label').should(
+          'contain.text',
+          mockVPC.label
+        );
+      });
 
-    // Confirm linked VPC is not present
-    cy.get('[data-qa-kube-entity-footer]').within(() => {
-      cy.contains('VPC:').should('not.exist');
-      cy.findByTestId('assigned-lke-cluster-label').should('not.exist');
+      // Confirm VPC IP columns are present in the node table header
+      cy.get('[aria-label="List of Your Cluster Nodes"] thead').within(() => {
+        cy.contains('th', 'VPC IPv4').should('be.visible');
+        cy.contains('th', 'VPC IPv6').should('be.visible');
+      });
     });
 
-    // Confirm VPC IP columns are present in the node table header
-    cy.get('[aria-label="List of Your Cluster Nodes"] thead').within(() => {
-      cy.contains('th', 'VPC IPv4').should('be.visible');
-      cy.contains('th', 'VPC IPv6').should('be.visible');
+    /*
+     * - Confirms the state of the LKE cluster details page when the "phase2Mtc" feature is disabled.
+     * - Confirms that no VPC label is shown in the cluster summary.
+     * - Confirms that IPv4 and IPv6 node pool table columns are absent.
+     */
+    it('Simple Page Check - Phase 2 MTC Flags Both OFF', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          phase2Mtc: { byoVPC: false, dualStack: false },
+        },
+      }).as('getFeatureFlags');
+
+      cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
+      cy.wait(['@getCluster', '@getNodePools']);
+
+      // Confirm linked VPC is not present
+      cy.get('[data-qa-kube-entity-footer]').within(() => {
+        cy.contains('VPC:').should('not.exist');
+        cy.findByTestId('assigned-lke-cluster-label').should('not.exist');
+      });
+
+      // Confirm VPC IP columns are not present in the node table header
+      cy.get('[aria-label="List of Your Cluster Nodes"] thead').within(() => {
+        cy.contains('th', 'VPC IPv4').should('not.exist');
+        cy.contains('th', 'VPC IPv6').should('not.exist');
+      });
     });
   });
 
-  it('Simple Page Check - Phase 2 MTC Flags Both ON', () => {
-    mockAppendFeatureFlags({
-      lkeEnterprise2: {
-        enabled: true,
-        la: true,
-        phase2Mtc: { byoVPC: true, dualStack: true },
-      },
-    }).as('getFeatureFlags');
-
-    mockGetClusters([mockCluster]).as('getClusters');
-    mockGetCluster(mockCluster).as('getCluster');
-    mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
-    mockGetVPC(mockVPC).as('getVPC');
-
-    cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
-    cy.wait(['@getCluster', '@getVPC', '@getNodePools']);
+  /*
+   * Smoke tests to confirm the state of the LKE cluster details page when the
+   * LKE-E "postLa" feature flag is enabled and disabled.
+   */
+  describe('Post-LA feature flags', () => {
+    /*
+     * - Confirms the state of the LKE cluster details page when the "postLa" feature flag is enabled.
+     * - Confirms that update strategy and firewall options are present in the Add Node Pool drawer.
+     */
+    it('Simple Page Check - Post-LA Flag ON', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          postLa: true,
+          phase2Mtc: { byoVPC: false, dualStack: false },
+        },
+      }).as('getFeatureFlags');
+
+      cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
+      ui.button
+        .findByTitle('Add a Node Pool')
+        .should('be.visible')
+        .should('be.enabled')
+        .click();
 
-    // Confirm linked VPC is present
-    cy.get('[data-qa-kube-entity-footer]').within(() => {
-      cy.contains('VPC:').should('exist');
-      cy.findByTestId('assigned-lke-cluster-label').should(
-        'contain.text',
-        mockVPC.label
-      );
+      ui.drawer
+        .findByTitle(`Add a Node Pool: ${mockCluster.label}`)
+        .should('be.visible')
+        .within(() => {
+          cy.findByText('Update Strategy').scrollIntoView();
+          cy.findByText('Update Strategy').should('be.visible');
+          cy.findByText('Use default firewall').should('be.visible');
+          cy.findByText('Select existing firewall').should('be.visible');
+        });
     });
 
-    // Confirm VPC IP columns are present in the node table header
-    cy.get('[aria-label="List of Your Cluster Nodes"] thead').within(() => {
-      cy.contains('th', 'VPC IPv4').should('be.visible');
-      cy.contains('th', 'VPC IPv6').should('be.visible');
+    /*
+     * - Confirms the state of the LKE cluster details page when the "postLa" feature flag is disabled.
+     * - Confirms that update strategy and firewall options are absent in the Add Node Pool drawer.
+     */
+    it('Simple Page Check - Post-LA Flag OFF', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          phase2Mtc: { byoVPC: false, dualStack: false },
+          postLa: false,
+        },
+      }).as('getFeatureFlags');
+
+      cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
+      ui.button
+        .findByTitle('Add a Node Pool')
+        .should('be.visible')
+        .should('be.enabled')
+        .click();
+
+      ui.drawer
+        .findByTitle(`Add a Node Pool: ${mockCluster.label}`)
+        .should('be.visible')
+        .within(() => {
+          cy.findByText('Update Strategy').should('not.exist');
+          cy.findByText('Use default firewall').should('not.exist');
+          cy.findByText('Select existing firewall').should('not.exist');
+        });
     });
   });
 
-  it('Simple Page Check - Phase 2 MTC Flags Both OFF', () => {
-    mockAppendFeatureFlags({
-      lkeEnterprise2: {
-        enabled: true,
-        la: true,
-        phase2Mtc: { byoVPC: false, dualStack: false },
-      },
-    }).as('getFeatureFlags');
+  /*
+   * Smoke tests to confirm the state of the LKE cluster details page when the
+   * 'phase2Mtc' and 'postLa' LKE-E feature flags are both enabled.
+   */
+  describe('Phase 2 MTC & Post-LA feature flags', () => {
+    /*
+     * - Confirms the state of LKE details page when "phase2Mtc" and "postLa" are both enabled.
+     * - Confirms that update strategy and Firewall options are present in Add Node Pool drawer.
+     * - Confirms that attached VPC is shown in the summary, and IPv4 and IPv6 node pool table columns are present.
+     */
+    it('Simple Page Check - Phase 2 MTC Flags and Post-LA Flag ON', () => {
+      mockAppendFeatureFlags({
+        lkeEnterprise2: {
+          enabled: true,
+          la: true,
+          phase2Mtc: { byoVPC: true, dualStack: true },
+          postLa: true,
+        },
+      });
 
-    mockGetClusters([mockCluster]).as('getClusters');
-    mockGetCluster(mockCluster).as('getCluster');
-    mockGetClusterPools(mockCluster.id, mockNodePools).as('getNodePools');
+      cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
 
-    cy.visitWithLogin(`/kubernetes/clusters/${mockCluster.id}/summary`);
-    cy.wait(['@getCluster', '@getNodePools']);
+      // Confirm that VPC label is shown in summary, and that IPv4 and IPv6
+      // node pool table columns are present.
+      cy.get('[data-qa-kube-entity-footer]').within(() => {
+        cy.contains('VPC:').should('exist');
+        cy.findByTestId('assigned-lke-cluster-label').should(
+          'contain.text',
+          mockVPC.label
+        );
+      });
 
-    // Confirm linked VPC is not present
-    cy.get('[data-qa-kube-entity-footer]').within(() => {
-      cy.contains('VPC:').should('not.exist');
-      cy.findByTestId('assigned-lke-cluster-label').should('not.exist');
-    });
+      cy.findByLabelText('List of Your Cluster Nodes').within(() => {
+        cy.contains('th', 'VPC IPv4').should('be.visible');
+        cy.contains('th', 'VPC IPv6').should('be.visible');
+      });
 
-    // Confirm VPC IP columns are not present in the node table header
-    cy.get('[aria-label="List of Your Cluster Nodes"] thead').within(() => {
-      cy.contains('th', 'VPC IPv4').should('not.exist');
-      cy.contains('th', 'VPC IPv6').should('not.exist');
+      ui.button
+        .findByTitle('Add a Node Pool')
+        .should('be.visible')
+        .should('be.enabled')
+        .click();
+
+      ui.drawer
+        .findByTitle(`Add a Node Pool: ${mockCluster.label}`)
+        .should('be.visible')
+        .within(() => {
+          cy.findByText('Update Strategy').scrollIntoView();
+          cy.findByText('Update Strategy').should('be.visible');
+          cy.findByText('Use default firewall').should('be.visible');
+          cy.findByText('Select existing firewall').should('be.visible');
+        });
     });
   });
 });
diff --git a/packages/manager/cypress/e2e/core/linodes/alerts-create.spec.ts b/packages/manager/cypress/e2e/core/linodes/alerts-create.spec.ts
index 87cbfc09cf0..ab7c8e4646e 100644
--- a/packages/manager/cypress/e2e/core/linodes/alerts-create.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/alerts-create.spec.ts
@@ -299,24 +299,24 @@ describe('Create flow when beta alerts enabled by region and feature flag', func
         cy.get('pre code').should('be.visible');
         /** alert in code snippet
          * "alerts": {
-         *    "system": [
+         *    "system_alerts": [
          *             1,
          *             2,
          *      ],
-         *      "user": [
+         *      "user_alerts": [
          *             2
          *      ]
          * }
          */
-        const strAlertSnippet = `alerts '{"system": [${alertDefinitions[0].id},${alertDefinitions[1].id}],"user":[${alertDefinitions[2].id}]}`;
+        const strAlertSnippet = `alerts '{"system_alerts": [${alertDefinitions[0].id},${alertDefinitions[1].id}],"user_alerts":[${alertDefinitions[2].id}]}`;
         cy.contains(strAlertSnippet).should('be.visible');
         // cURL tab
         ui.tabList.findTabByTitle('cURL').should('be.visible').click();
         // hard to consolidate text within multiple spans in <pre><code>
         cy.get('pre code').within(() => {
           cy.contains('alerts');
-          cy.contains('system');
-          cy.contains('user');
+          cy.contains('system_alerts');
+          cy.contains('user_alerts');
         });
         ui.button
           .findByTitle('Close')
@@ -341,11 +341,11 @@ describe('Create flow when beta alerts enabled by region and feature flag', func
       .click();
     cy.wait('@createLinode').then((intercept) => {
       const alerts = intercept.request.body['alerts'];
-      expect(alerts.system.length).to.equal(2);
-      expect(alerts.system[0]).to.eq(alertDefinitions[0].id);
-      expect(alerts.system[1]).to.eq(alertDefinitions[1].id);
-      expect(alerts.user.length).to.equal(1);
-      expect(alerts.user[0]).to.eq(alertDefinitions[2].id);
+      expect(alerts.system_alerts.length).to.equal(2);
+      expect(alerts.system_alerts[0]).to.eq(alertDefinitions[0].id);
+      expect(alerts.system_alerts[1]).to.eq(alertDefinitions[1].id);
+      expect(alerts.user_alerts.length).to.equal(1);
+      expect(alerts.user_alerts[0]).to.eq(alertDefinitions[2].id);
     });
   });
 
diff --git a/packages/manager/cypress/e2e/core/linodes/alerts-edit.spec.ts b/packages/manager/cypress/e2e/core/linodes/alerts-edit.spec.ts
index d2b7e3267a4..7513f2b8fe2 100644
--- a/packages/manager/cypress/e2e/core/linodes/alerts-edit.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/alerts-edit.spec.ts
@@ -37,21 +37,21 @@ const mockEnabledLegacyAlerts = {
 };
 
 const mockDisabledBetaAlerts = {
-  system: [],
-  user: [],
+  system_alerts: [],
+  user_alerts: [],
 };
 
 const mockEnabledBetaAlerts = {
-  system: [1, 2],
-  user: [3],
+  system_alerts: [1, 2],
+  user_alerts: [3],
 };
 
 /*
  * UI of Linode alerts tab based on beta and legacy alert values in linode.alerts. Dependent on region support for alerts
  * Legacy alerts = 0, Beta alerts = [] (empty arrays or no values at all) => legacy disabled for `beta` stage OR beta disabled for `ga` stage
  * Legacy alerts > 0, Beta alerts = [] (empty arrays or no values at all) => legacy enabled
- * Legacy alerts = 0, Beta alerts has values (either system, user, or both) => beta enabled
- * Legacy alerts > 0, Beta alerts has values (either system, user, or both) => beta enabled
+ * Legacy alerts = 0, Beta alerts has values (either system_alerts, user_alerts, or both) => beta enabled
+ * Legacy alerts > 0, Beta alerts has values (either system_alerts, user_alerts, or both) => beta enabled
  *
  * Note: Here, "disabled" means that all toggles are in the OFF state, but it's still editable (not read-only)
  */
diff --git a/packages/manager/cypress/e2e/core/linodes/linode-network.spec.ts b/packages/manager/cypress/e2e/core/linodes/linode-network.spec.ts
index 1a47787c0cd..87840e9ae1a 100644
--- a/packages/manager/cypress/e2e/core/linodes/linode-network.spec.ts
+++ b/packages/manager/cypress/e2e/core/linodes/linode-network.spec.ts
@@ -1,5 +1,6 @@
 import {
   linodeInterfaceFactoryPublic,
+  linodeInterfaceFactoryVlan,
   linodeInterfaceFactoryVPC,
 } from '@linode/utilities';
 import { linodeFactory } from '@linode/utilities';
@@ -22,16 +23,18 @@ import {
   mockCreateLinodeInterface,
   mockGetLinodeDetails,
   mockGetLinodeFirewalls,
+  mockGetLinodeInterface,
   mockGetLinodeInterfaces,
   mockGetLinodeIPAddresses,
 } from 'support/intercepts/linodes';
 import { mockUpdateIPAddress } from 'support/intercepts/networking';
-import { mockGetVPCs } from 'support/intercepts/vpc';
+import { mockGetVPC, mockGetVPCs } from 'support/intercepts/vpc';
 import { ui } from 'support/ui';
 
-import type { IPRange } from '@linode/api-v4';
+import type { IPRange, LinodeIPsResponse } from '@linode/api-v4';
 
 describe('IP Addresses', () => {
+  // TODO M3-9775: Set mock linode interface type to legacy once Linode Interfaces is GA.
   const mockLinode = linodeFactory.build();
   const linodeIPv4 = mockLinode.ipv4[0];
   const mockRDNS = `${linodeIPv4}.ip.linodeusercontent.com`;
@@ -253,11 +256,11 @@ describe('Firewalls', () => {
   });
 });
 
-describe('Linode Interfaces', () => {
+describe('Linode Interfaces enabled', () => {
   beforeEach(() => {
     mockGetAccount(
       accountFactory.build({
-        capabilities: ['Linode Interfaces'],
+        capabilities: ['Linodes', 'Linode Interfaces'],
       })
     );
     mockAppendFeatureFlags({
@@ -265,162 +268,673 @@ describe('Linode Interfaces', () => {
     });
   });
 
-  it('allows the user to add a public network interface with a firewall', () => {
-    const linode = linodeFactory.build({ interface_generation: 'linode' });
-    const firewalls = firewallFactory.buildList(3);
-    const linodeInterface = linodeInterfaceFactoryPublic.build();
-
-    const selectedFirewall = firewalls[1];
+  describe('Linode with legacy config-based interfaces', () => {
+    const mockLinode = linodeFactory.build({
+      interface_generation: 'legacy_config',
+    });
 
-    mockGetLinodeDetails(linode.id, linode).as('getLinode');
-    mockGetLinodeInterfaces(linode.id, { interfaces: [] }).as('getInterfaces');
-    mockGetFirewalls(firewalls).as('getFirewalls');
-    mockCreateLinodeInterface(linode.id, linodeInterface).as('createInterface');
-    mockGetLinodeInterfaceFirewalls(linode.id, linodeInterface.id, [
-      selectedFirewall,
-    ]).as('getInterfaceFirewalls');
+    const mockLinodeIPv4 = ipAddressFactory.build({
+      linode_id: mockLinode.id,
+      public: true,
+      type: 'ipv4',
+      region: mockLinode.region,
+      interface_id: null,
+    });
 
-    cy.visitWithLogin(`/linodes/${linode.id}/networking`);
+    const mockLinodeIPs: LinodeIPsResponse = {
+      ipv4: {
+        public: [mockLinodeIPv4],
+        private: [],
+        reserved: [],
+        shared: [],
+        vpc: [],
+      },
+    };
 
-    cy.wait(['@getLinode', '@getInterfaces']);
+    beforeEach(() => {
+      mockGetLinodeDetails(mockLinode.id, mockLinode);
+      mockGetLinodeFirewalls(mockLinode.id, []);
+      mockGetLinodeIPAddresses(mockLinode.id, mockLinodeIPs);
+    });
 
-    ui.button.findByTitle('Add Network Interface').scrollIntoView().click();
+    /*
+     * - Confirms network tab Firewall table is present for Linodes with config-based interfaces.
+     * - Confirms that "Add Firewall" button is present and enabled for Linodes with config-based interfaces.
+     */
+    it('shows the Firewall table for Linodes with config-based interfaces', () => {
+      cy.visitWithLogin(`/linodes/${mockLinode.id}/networking`);
+
+      ui.button
+        .findByTitle('Add Firewall')
+        .should('be.visible')
+        .should('be.enabled');
+
+      cy.get('[data-qa-linode-firewalls-table]')
+        .should('be.visible')
+        .within(() => {
+          cy.findByText('No Firewalls are assigned.').should('be.visible');
+        });
+    });
 
-    ui.drawer.findByTitle('Add Network Interface').within(() => {
-      // Verify firewalls fetch
-      cy.wait('@getFirewalls');
+    /*
+     * - Confirms that network tab IP Addresses table is present for Linodes with config-based interfaces.
+     * - Confirms that IP address add and delete buttons are present for Linodes with config-based interfaces.
+     */
+    it('shows the IP address add and remove buttons for Linodes with config-based interfaces', () => {
+      cy.visitWithLogin(`/linodes/${mockLinode.id}/networking`);
+
+      ui.button
+        .findByTitle('Add an IP Address')
+        .should('be.visible')
+        .should('be.enabled');
+
+      cy.findByLabelText('Linode IP Addresses').should('be.visible');
+      cy.findByText(mockLinodeIPv4.address)
+        .should('be.visible')
+        .closest('tr')
+        .within(() => {
+          cy.findByText('Public – IPv4').should('be.visible');
+          ui.button.findByTitle('Delete').should('be.visible');
+        });
+    });
 
-      // Try submitting the form
-      ui.button.findByAttribute('type', 'submit').should('be.enabled').click();
+    /**
+     * - Confirms the Networking Interface table doesn't exist for config-based interfaces
+     */
+    it('does not show the Linode Interface networking table', () => {
+      cy.visitWithLogin(`/linodes/${mockLinode.id}/networking`);
 
-      // Verify a validation error shows
-      cy.findByText('You must selected an Interface type.').should(
-        'be.visible'
-      );
+      cy.get('[data-qa-linode-interfaces-table]').should('not.exist');
+      cy.findByText('Add Network Interface').should('not.exist');
+      cy.findByText('Interface Settings').should('not.exist');
+    });
+  });
 
-      // Select the public interface type
-      cy.findByLabelText('Public').click();
+  describe('Linode with Linode-based interfaces', () => {
+    const mockLinode = linodeFactory.build({
+      interface_generation: 'linode',
+    });
 
-      // Verify a validation error goes away
-      cy.findByText('You must selected an Interface type.').should('not.exist');
+    const mockLinodeIPv4 = ipAddressFactory.build({
+      linode_id: mockLinode.id,
+      public: true,
+      type: 'ipv4',
+      region: mockLinode.region,
+      interface_id: null,
+    });
 
-      // Select a Firewall
-      ui.autocomplete.findByLabel('Firewall').click();
-      ui.autocompletePopper.findByTitle(selectedFirewall.label).click();
+    const mockLinodeIPs: LinodeIPsResponse = {
+      ipv4: {
+        public: [mockLinodeIPv4],
+        private: [],
+        reserved: [],
+        shared: [],
+        vpc: [],
+      },
+    };
 
-      mockGetLinodeInterfaces(linode.id, { interfaces: [linodeInterface] });
+    const mockFirewalls = firewallFactory.buildList(3);
 
-      ui.button.findByAttribute('type', 'submit').should('be.enabled').click();
+    beforeEach(() => {
+      mockGetLinodeDetails(mockLinode.id, mockLinode).as('getLinode');
+      mockGetLinodeIPAddresses(mockLinode.id, mockLinodeIPs).as('getLinodeIPs');
+      mockGetLinodeInterfaces(mockLinode.id, { interfaces: [] }).as(
+        'getInterfaces'
+      );
     });
 
-    cy.wait('@createInterface').then((xhr) => {
-      const requestPayload = xhr.request.body;
+    /*
+     * - Confirms that network tab Firewall table is absent for Linodes using new Linode-based interfaces.
+     * - Confirms that IP address add and delete buttons are absent for Linodes using new Linode-based interfaces.
+     */
+    it('hides Firewall table and IP address buttons', () => {
+      cy.visitWithLogin(`/linodes/${mockLinode.id}/networking`);
+
+      // Confirm Firewalls section is absent
+      cy.get('[data-qa-linode-firewalls-table]').should('not.exist');
+      cy.findByText('Add Firewall').should('not.exist');
+
+      // Confirm add IP and delete IP buttons are missing from IP address section
+      cy.findByLabelText('Linode IP Addresses').should('be.visible');
+      cy.findByText('Add an IP Address').should('not.exist');
+      cy.findByText(mockLinodeIPv4.address)
+        .should('be.visible')
+        .closest('tr')
+        .within(() => {
+          cy.findByText('Public – IPv4').should('be.visible');
+          cy.findByText('Delete').should('not.exist');
+        });
+    });
 
-      // Confirm that request payload includes a Public interface only
-      expect(requestPayload['public']).to.be.an('object');
-      expect(requestPayload['vpc']).to.equal(null);
-      expect(requestPayload['vlan']).to.equal(null);
+    it('confirms the Network Interfaces table functions as expected', () => {
+      const publicInterface = linodeInterfaceFactoryPublic.build();
+      mockGetLinodeInterfaces(mockLinode.id, {
+        interfaces: [publicInterface],
+      }).as('getInterfaces');
+
+      cy.visitWithLogin(`/linodes/${mockLinode.id}/networking`);
+
+      ui.button
+        .findByTitle('Add Network Interface')
+        .should('be.visible')
+        .should('be.enabled');
+      ui.button
+        .findByTitle('Interface Settings')
+        .should('be.visible')
+        .should('be.enabled');
+
+      // Confirm table heading row
+      cy.get('[data-qa-linode-interfaces-table]')
+        .should('be.visible')
+        .within(() => {
+          cy.findByText('Type').should('be.visible');
+          cy.findByText('ID').should('be.visible');
+          cy.findByText('MAC Address').should('be.visible');
+          cy.findByText('IP Addresses').should('be.visible');
+          cy.findByText('Version').should('be.visible');
+          cy.findByText('Firewall').should('be.visible');
+          cy.findByText('Updated').should('be.visible');
+          cy.findByText('Created').should('be.visible');
+        });
+
+      // Confirm interface row's action menu
+      cy.findByText(publicInterface.mac_address)
+        .should('be.visible')
+        .closest('tr')
+        .within(() => {
+          ui.actionMenu
+            .findByTitle(
+              `Action menu for Public Interface (${publicInterface.id})`
+            )
+            .should('be.visible')
+            .should('be.enabled')
+            .click();
+
+          ui.actionMenuItem
+            .findByTitle('Details')
+            .should('be.visible')
+            .should('be.enabled');
+          ui.actionMenuItem
+            .findByTitle('Edit')
+            .should('be.visible')
+            .should('be.enabled');
+          ui.actionMenuItem
+            .findByTitle('Delete')
+            .should('be.visible')
+            .should('be.enabled');
+        });
     });
 
-    ui.toast.assertMessage('Successfully added network interface.');
+    describe('Adding a Linode Interface', () => {
+      it('allows the user to add a VLAN interface', () => {
+        const mockLinodeInterface = linodeInterfaceFactoryVlan.build();
 
-    // Verify the interface row shows upon creation
-    cy.findByText(linodeInterface.mac_address)
-      .closest('tr')
-      .within(() => {
-        // Verify we fetch the interfaces firewalls and the label shows
-        cy.wait('@getInterfaceFirewalls');
-        cy.findByText(selectedFirewall.label).should('be.visible');
+        mockGetFirewalls(mockFirewalls).as('getFirewalls');
+        mockCreateLinodeInterface(mockLinode.id, mockLinodeInterface).as(
+          'createInterface'
+        );
+        mockGetLinodeInterfaceFirewalls(
+          mockLinode.id,
+          mockLinodeInterface.id,
+          []
+        ).as('getInterfaceFirewalls');
+
+        cy.visitWithLogin(`/linodes/${mockLinode.id}/networking`);
+
+        cy.wait(['@getLinode', '@getInterfaces']);
+
+        ui.button.findByTitle('Add Network Interface').scrollIntoView().click();
+
+        ui.drawer.findByTitle('Add Network Interface').within(() => {
+          // Verify firewalls fetch
+          cy.wait('@getFirewalls');
+
+          // Try submitting the form
+          ui.button
+            .findByAttribute('type', 'submit')
+            .should('be.enabled')
+            .click();
+
+          // Verify a validation error shows
+          cy.findByText('You must selected an Interface type.').should(
+            'be.visible'
+          );
+
+          // Select the public interface type
+          cy.findByLabelText('VLAN').click();
+
+          // Verify a validation error goes away
+          cy.findByText('You must selected an Interface type.').should(
+            'not.exist'
+          );
+
+          ui.button
+            .findByAttribute('type', 'submit')
+            .should('be.enabled')
+            .click();
+
+          // Verify an error shows because a VLAN was not selected nor created
+          cy.findByText('VLAN label is required.').should('be.visible');
+
+          // Verify VLAN label and IPAM selects
+          // Type label for VLAN
+          ui.autocomplete
+            .findByLabel('VLAN')
+            .should('be.visible')
+            .click()
+            .type('testVLAN');
+
+          cy.findByText('IPAM Address').should('be.visible').click();
+          cy.findByText(
+            'IPAM address must use IP/netmask format, e.g. 192.0.2.0/24.'
+          ).should('be.visible');
+
+          // Verify VLAN error disappears
+          cy.findByText('VLAN label is required.').should('not.exist');
+
+          // Verify firewall select doees not appear
+          cy.findByText('Firewall').should('not.exist');
+
+          mockGetLinodeInterfaces(mockLinode.id, {
+            interfaces: [mockLinodeInterface],
+          });
+
+          mockGetLinodeInterfaces(mockLinode.id, {
+            interfaces: [mockLinodeInterface],
+          });
+
+          ui.button
+            .findByAttribute('type', 'submit')
+            .should('be.enabled')
+            .click();
+        });
+
+        cy.wait('@createInterface').then((xhr) => {
+          const requestPayload = xhr.request.body;
+
+          // Confirm that request payload includes a VLAN interface only
+          expect(requestPayload['public']).to.equal(null);
+          expect(requestPayload['vpc']).to.equal(null);
+          expect(requestPayload['vlan']).to.be.an('object');
+        });
+
+        ui.toast.assertMessage('Successfully added network interface.');
+
+        // Verify the interface row shows upon creation
+        cy.findByText(mockLinodeInterface.mac_address)
+          .closest('tr')
+          .within(() => {
+            // Verify we fetch the interfaces firewalls and the label shows
+            cy.wait('@getInterfaceFirewalls');
+            cy.findByText('None').should('be.visible');
+
+            // Verify the interface type shows
+            cy.findByText('VLAN').should('be.visible');
+          });
+      });
+
+      it('allows the user to add a public network interface with a firewall', () => {
+        const mockLinodeInterface = linodeInterfaceFactoryPublic.build();
+        const selectedMockFirewall = mockFirewalls[1];
 
-        // Verify the interface type shows
-        cy.findByText('Public').should('be.visible');
+        mockGetFirewalls(mockFirewalls).as('getFirewalls');
+        mockCreateLinodeInterface(mockLinode.id, mockLinodeInterface).as(
+          'createInterface'
+        );
+        mockGetLinodeInterfaceFirewalls(mockLinode.id, mockLinodeInterface.id, [
+          selectedMockFirewall,
+        ]).as('getInterfaceFirewalls');
+
+        cy.visitWithLogin(`/linodes/${mockLinode.id}/networking`);
+
+        cy.wait(['@getLinode', '@getInterfaces']);
+
+        ui.button.findByTitle('Add Network Interface').scrollIntoView().click();
+
+        ui.drawer.findByTitle('Add Network Interface').within(() => {
+          // Verify firewalls fetch
+          cy.wait('@getFirewalls');
+
+          // Try submitting the form
+          ui.button
+            .findByAttribute('type', 'submit')
+            .should('be.enabled')
+            .click();
+
+          // Verify a validation error shows
+          cy.findByText('You must selected an Interface type.').should(
+            'be.visible'
+          );
+
+          // Select the public interface type
+          cy.findByLabelText('Public').click();
+
+          // Verify a validation error goes away
+          cy.findByText('You must selected an Interface type.').should(
+            'not.exist'
+          );
+
+          // Select a Firewall
+          ui.autocomplete.findByLabel('Firewall').click();
+          ui.autocompletePopper.findByTitle(selectedMockFirewall.label).click();
+
+          mockGetLinodeInterfaces(mockLinode.id, {
+            interfaces: [mockLinodeInterface],
+          });
+
+          ui.button
+            .findByAttribute('type', 'submit')
+            .should('be.enabled')
+            .click();
+        });
+
+        cy.wait('@createInterface').then((xhr) => {
+          const requestPayload = xhr.request.body;
+
+          // Confirm that request payload includes a Public interface only
+          expect(requestPayload['public']).to.be.an('object');
+          expect(requestPayload['vpc']).to.equal(null);
+          expect(requestPayload['vlan']).to.equal(null);
+        });
+
+        ui.toast.assertMessage('Successfully added network interface.');
+
+        // Verify the interface row shows upon creation
+        cy.findByText(mockLinodeInterface.mac_address)
+          .closest('tr')
+          .within(() => {
+            // Verify we fetch the interfaces firewalls and the label shows
+            cy.wait('@getInterfaceFirewalls');
+            cy.findByText(selectedMockFirewall.label).should('be.visible');
+
+            // Verify the interface type shows
+            cy.findByText('Public').should('be.visible');
+          });
       });
-  });
 
-  it('allows the user to add a VPC network interface with a firewall', () => {
-    const linode = linodeFactory.build({ interface_generation: 'linode' });
-    const firewalls = firewallFactory.buildList(3);
-    const subnets = subnetFactory.buildList(3);
-    const vpcs = vpcFactory.buildList(3, { subnets });
-    const linodeInterface = linodeInterfaceFactoryVPC.build();
+      it('allows the user to add a VPC network interface with a firewall', () => {
+        const linode = linodeFactory.build({ interface_generation: 'linode' });
+        const firewalls = firewallFactory.buildList(3);
+        const subnets = subnetFactory.buildList(3);
+        const vpcs = vpcFactory.buildList(3, { subnets });
+        const linodeInterface = linodeInterfaceFactoryVPC.build();
 
-    const selectedFirewall = firewalls[1];
-    const selectedVPC = vpcs[1];
-    const selectedSubnet = selectedVPC.subnets[0];
+        const selectedFirewall = firewalls[1];
+        const selectedVPC = vpcs[1];
+        const selectedSubnet = selectedVPC.subnets[0];
 
-    mockGetLinodeDetails(linode.id, linode).as('getLinode');
-    mockGetLinodeInterfaces(linode.id, { interfaces: [] }).as('getInterfaces');
-    mockGetFirewalls(firewalls).as('getFirewalls');
-    mockGetVPCs(vpcs).as('getVPCs');
-    mockCreateLinodeInterface(linode.id, linodeInterface).as('createInterface');
-    mockGetLinodeInterfaceFirewalls(linode.id, linodeInterface.id, [
-      selectedFirewall,
-    ]).as('getInterfaceFirewalls');
+        mockGetLinodeDetails(linode.id, linode).as('getLinode');
+        mockGetLinodeInterfaces(linode.id, { interfaces: [] }).as(
+          'getInterfaces'
+        );
+        mockGetFirewalls(firewalls).as('getFirewalls');
+        mockGetVPCs(vpcs).as('getVPCs');
+        mockCreateLinodeInterface(linode.id, linodeInterface).as(
+          'createInterface'
+        );
+        mockGetLinodeInterfaceFirewalls(linode.id, linodeInterface.id, [
+          selectedFirewall,
+        ]).as('getInterfaceFirewalls');
 
-    cy.visitWithLogin(`/linodes/${linode.id}/networking`);
+        cy.visitWithLogin(`/linodes/${linode.id}/networking`);
 
-    cy.wait(['@getLinode', '@getInterfaces']);
+        cy.wait(['@getLinode', '@getInterfaces']);
 
-    ui.button.findByTitle('Add Network Interface').scrollIntoView().click();
+        ui.button.findByTitle('Add Network Interface').scrollIntoView().click();
 
-    ui.drawer.findByTitle('Add Network Interface').within(() => {
-      // Verify firewalls fetch
-      cy.wait('@getFirewalls');
+        ui.drawer.findByTitle('Add Network Interface').within(() => {
+          // Verify firewalls fetch
+          cy.wait('@getFirewalls');
 
-      cy.findByLabelText('VPC').click();
+          cy.findByLabelText('VPC').click();
 
-      // Verify VPCs fetch
-      cy.wait('@getVPCs');
+          // Verify VPCs fetch
+          cy.wait('@getVPCs');
 
-      // Select a VPC
-      ui.autocomplete.findByLabel('VPC').click();
-      ui.autocompletePopper.findByTitle(selectedVPC.label).click();
+          // Select a VPC
+          ui.autocomplete.findByLabel('VPC').click();
+          ui.autocompletePopper.findByTitle(selectedVPC.label).click();
 
-      // Select a Firewall
-      ui.autocomplete.findByLabel('Firewall').click();
-      ui.autocompletePopper.findByTitle(selectedFirewall.label).click();
+          // Select a Firewall
+          ui.autocomplete.findByLabel('Firewall').click();
+          ui.autocompletePopper.findByTitle(selectedFirewall.label).click();
 
-      // Submit the form
-      ui.button.findByAttribute('type', 'submit').should('be.enabled').click();
+          // Submit the form
+          ui.button
+            .findByAttribute('type', 'submit')
+            .should('be.enabled')
+            .click();
 
-      // Verify an error shows because a subnet is not selected
-      cy.findByText('Subnet is required.').should('be.visible');
+          // Verify an error shows because a subnet is not selected
+          cy.findByText('Subnet is required.').should('be.visible');
 
-      // Select a Subnet
-      ui.autocomplete.findByLabel('Subnet').click();
-      ui.autocompletePopper
-        .findByTitle(`${selectedSubnet.label} (${selectedSubnet.ipv4})`)
-        .click();
+          // Select a Subnet
+          ui.autocomplete.findByLabel('Subnet').click();
+          ui.autocompletePopper
+            .findByTitle(`${selectedSubnet.label} (${selectedSubnet.ipv4})`)
+            .click();
 
-      // Verify the error goes away
-      cy.findByText('Subnet is required.').should('not.exist');
+          // Verify the error goes away
+          cy.findByText('Subnet is required.').should('not.exist');
 
-      mockGetLinodeInterfaces(linode.id, { interfaces: [linodeInterface] });
+          mockGetLinodeInterfaces(linode.id, { interfaces: [linodeInterface] });
 
-      ui.button.findByAttribute('type', 'submit').should('be.enabled').click();
-    });
+          ui.button
+            .findByAttribute('type', 'submit')
+            .should('be.enabled')
+            .click();
+        });
 
-    cy.wait('@createInterface').then((xhr) => {
-      const requestPayload = xhr.request.body;
+        cy.wait('@createInterface').then((xhr) => {
+          const requestPayload = xhr.request.body;
+
+          // Confirm that request payload includes VPC interface only
+          expect(requestPayload['public']).to.equal(null);
+          expect(requestPayload['vpc']['subnet_id']).to.equal(
+            selectedSubnet.id
+          );
+          expect(requestPayload['vlan']).to.equal(null);
+        });
 
-      // Confirm that request payload includes VPC interface only
-      expect(requestPayload['public']).to.equal(null);
-      expect(requestPayload['vpc']['subnet_id']).to.equal(selectedSubnet.id);
-      expect(requestPayload['vlan']).to.equal(null);
+        ui.toast.assertMessage('Successfully added network interface.');
+
+        // Verify the interface row shows upon creation
+        cy.findByText(linodeInterface.mac_address)
+          .closest('tr')
+          .within(() => {
+            // Verify we fetch the interfaces firewalls and the label shows
+            cy.wait('@getInterfaceFirewalls');
+            cy.findByText(selectedFirewall.label).should('be.visible');
+
+            // Verify the interface type shows
+            cy.findByText('VPC').should('be.visible');
+          });
+      });
     });
 
-    ui.toast.assertMessage('Successfully added network interface.');
+    describe('Interface Details drawer', () => {
+      it('confirms the details drawer for a public interface', () => {
+        const linodeInterface = linodeInterfaceFactoryPublic.build({
+          public: {
+            ipv6: {
+              ranges: [
+                {
+                  range: '2600:3c06:e001:149::/64',
+                  route_target: null,
+                },
+                {
+                  range: '2600:3c06:e001:149::/56',
+                  route_target: null,
+                },
+              ],
+              shared: [],
+              slaac: [
+                { address: '2600:3c06::2000:13ff:fe6b:31b0', prefix: '64' },
+              ],
+            },
+          },
+        });
+        mockGetLinodeInterfaces(mockLinode.id, {
+          interfaces: [linodeInterface],
+        }).as('getInterfaces');
+        mockGetLinodeInterface(
+          mockLinode.id,
+          linodeInterface.id,
+          linodeInterface
+        );
 
-    // Verify the interface row shows upon creation
-    cy.findByText(linodeInterface.mac_address)
-      .closest('tr')
-      .within(() => {
-        // Verify we fetch the interfaces firewalls and the label shows
-        cy.wait('@getInterfaceFirewalls');
-        cy.findByText(selectedFirewall.label).should('be.visible');
+        cy.visitWithLogin(`/linodes/${mockLinode.id}/networking`);
+
+        // Open up the detail drawer
+        cy.findByText(linodeInterface.mac_address)
+          .should('be.visible')
+          .closest('tr')
+          .within(() => {
+            ui.actionMenu
+              .findByTitle(
+                `Action menu for Public Interface (${linodeInterface.id})`
+              )
+              .should('be.visible')
+              .should('be.enabled')
+              .click();
+
+            ui.actionMenuItem
+              .findByTitle('Details')
+              .should('be.visible')
+              .should('be.enabled')
+              .click();
+          });
+
+        // Confirm drawer content
+        ui.drawer
+          .findByTitle(`Network Interface Details (ID: ${linodeInterface.id})`)
+          .within(() => {
+            cy.findByText('IPv4 Default Route').should('be.visible');
+            cy.findByText('IPv6 Default Route').should('be.visible');
+            cy.findByText('Type').should('be.visible');
+            cy.findByText('Public').should('be.visible');
+            cy.findByText('IPv4 Addresses').should('be.visible');
+            cy.findByText(
+              `${linodeInterface.public?.ipv4.addresses[0].address} (Primary)`
+            ).should('be.visible');
+            cy.findByText('2600:3c06::2000:13ff:fe6b:31b0 (SLAAC)').should(
+              'be.visible'
+            );
+            cy.findByText('2600:3c06:e001:149::/64 (Range)').should(
+              'be.visible'
+            );
+            cy.findByText('2600:3c06:e001:149::/56 (Range)').should(
+              'be.visible'
+            );
+          });
+      });
+
+      it('confirms the details drawer for a VLAN interface', () => {
+        const linodeInterface = linodeInterfaceFactoryVlan.build();
+        mockGetLinodeInterfaces(mockLinode.id, {
+          interfaces: [linodeInterface],
+        }).as('getInterfaces');
+        mockGetLinodeInterface(
+          mockLinode.id,
+          linodeInterface.id,
+          linodeInterface
+        );
+
+        cy.visitWithLogin(`/linodes/${mockLinode.id}/networking`);
 
-        // Verify the interface type shows
-        cy.findByText('VPC').should('be.visible');
+        // Open up the detail drawer
+        cy.findByText(linodeInterface.mac_address)
+          .should('be.visible')
+          .closest('tr')
+          .within(() => {
+            ui.actionMenu
+              .findByTitle(
+                `Action menu for VLAN Interface (${linodeInterface.id})`
+              )
+              .should('be.visible')
+              .should('be.enabled')
+              .click();
+
+            ui.actionMenuItem
+              .findByTitle('Details')
+              .should('be.visible')
+              .should('be.enabled')
+              .click();
+          });
+
+        // Confirm drawer content
+        ui.drawer
+          .findByTitle(`Network Interface Details (ID: ${linodeInterface.id})`)
+          .within(() => {
+            cy.findByText('Type').should('be.visible');
+            cy.findByText('VLAN').should('be.visible');
+            cy.findByText('VLAN Label').should('be.visible');
+            cy.findByText(`${linodeInterface.vlan?.vlan_label}`).should(
+              'be.visible'
+            );
+            cy.findByText('IPAM Address').should('be.visible');
+            cy.findByText(`${linodeInterface.vlan?.ipam_address}`).should(
+              'be.visible'
+            );
+          });
+      });
+
+      it('confirms the details drawer for a VPC interface', () => {
+        const linodeInterface = linodeInterfaceFactoryVPC.build();
+        const mockSubnet = subnetFactory.build({
+          id: linodeInterface.vpc?.subnet_id,
+        });
+        const mockVPC = vpcFactory.build({
+          id: linodeInterface.vpc?.vpc_id,
+          subnets: [mockSubnet],
+        });
+
+        mockGetVPC(mockVPC);
+        mockGetLinodeInterfaces(mockLinode.id, {
+          interfaces: [linodeInterface],
+        }).as('getInterfaces');
+        mockGetLinodeInterface(
+          mockLinode.id,
+          linodeInterface.id,
+          linodeInterface
+        );
+
+        cy.visitWithLogin(`/linodes/${mockLinode.id}/networking`);
+
+        // Open up the details drawer
+        cy.findByText(linodeInterface.mac_address)
+          .should('be.visible')
+          .closest('tr')
+          .within(() => {
+            ui.actionMenu
+              .findByTitle(
+                `Action menu for VPC Interface (${linodeInterface.id})`
+              )
+              .should('be.visible')
+              .should('be.enabled')
+              .click();
+
+            ui.actionMenuItem
+              .findByTitle('Details')
+              .should('be.visible')
+              .should('be.enabled')
+              .click();
+          });
+
+        // Confirm drawer content
+        ui.drawer
+          .findByTitle(`Network Interface Details (ID: ${linodeInterface.id})`)
+          .within(() => {
+            cy.findByText('IPv4 Default Route').should('be.visible');
+            cy.findByText('Type').should('be.visible');
+            cy.findByText('VPC').should('be.visible');
+            cy.findByText('VPC Label').should('be.visible');
+            cy.findByText(`${mockVPC.label}`).should('be.visible');
+            cy.findByText('Subnet Label').should('be.visible');
+            cy.findByText(`${mockSubnet.label}`).should('be.visible');
+            cy.findByText('IPv4 Addresses').should('be.visible');
+          });
       });
+    });
   });
 });
diff --git a/packages/manager/cypress/e2e/core/objectStorageMulticluster/object-storage-objects-multicluster.spec.ts b/packages/manager/cypress/e2e/core/objectStorageMulticluster/object-storage-objects-multicluster.spec.ts
index 38e6e618872..95814459df2 100644
--- a/packages/manager/cypress/e2e/core/objectStorageMulticluster/object-storage-objects-multicluster.spec.ts
+++ b/packages/manager/cypress/e2e/core/objectStorageMulticluster/object-storage-objects-multicluster.spec.ts
@@ -45,12 +45,13 @@ const getNonEmptyBucketMessage = (bucketLabel: string) => {
 const setUpBucketMulticluster = (
   label: string,
   regionId: string,
-  cors_enabled: boolean = true
+  cors_enabled: boolean = false
 ) => {
   return createBucket(
     createObjectStorageBucketFactoryGen1.build({
       // to avoid 400 responses from the API.
       cluster: undefined,
+      // disable CORS to avoid 400 responses from the API.
       cors_enabled,
       label,
 
@@ -153,6 +154,21 @@ describe('Object Storage Multicluster objects', () => {
       { name: '2.jpg', path: 'object-storage-files/2.jpg' },
     ];
 
+    cy.on('fail', (err) => {
+      if (
+        err.name === 'CypressError' &&
+        err.message.includes('uploadObject') &&
+        err.message.includes('Timed out')
+      ) {
+        // Handle the timeout error and retry
+        uploadFile(bucketFiles[0].path, bucketFiles[0].name);
+        cy.wait('@uploadObject', { timeout: 160000 });
+        // Return false to prevent test failure
+        return false;
+      }
+      throw err;
+    });
+
     cy.defer(
       () => setUpBucketMulticluster(bucketLabel, bucketRegionId),
       'creating Object Storage bucket'
diff --git a/packages/manager/cypress/e2e/core/vpc/vpc-create.spec.ts b/packages/manager/cypress/e2e/core/vpc/vpc-create.spec.ts
index ef9807d401d..fd95d254972 100644
--- a/packages/manager/cypress/e2e/core/vpc/vpc-create.spec.ts
+++ b/packages/manager/cypress/e2e/core/vpc/vpc-create.spec.ts
@@ -110,7 +110,7 @@ describe('VPC create flow', () => {
         cy.findByText('Subnet Label').should('be.visible').click();
         cy.focused().type(mockSubnets[0].label);
 
-        cy.findByText('Subnet IP Address Range').should('be.visible').click();
+        cy.findByText('Subnet IPv4 Range (CIDR)').should('be.visible').click();
         cy.focused().type(`{selectAll}{backspace}`);
       });
 
@@ -123,7 +123,7 @@ describe('VPC create flow', () => {
     cy.findByText(ipValidationErrorMessage1).should('be.visible');
 
     // Enter a random non-IP address string to further test client side validation.
-    cy.findByText('Subnet IP Address Range').should('be.visible').click();
+    cy.findByText('Subnet IPv4 Range (CIDR)').should('be.visible').click();
     cy.focused().type(`{selectAll}{backspace}`);
     cy.focused().type(randomString(18));
 
@@ -136,7 +136,7 @@ describe('VPC create flow', () => {
     cy.findByText(ipValidationErrorMessage2).should('be.visible');
 
     // Enter a valid IP address with an invalid network prefix to further test client side validation.
-    cy.findByText('Subnet IP Address Range').should('be.visible').click();
+    cy.findByText('Subnet IPv4 Range (CIDR)').should('be.visible').click();
     cy.focused().type(`{selectAll}{backspace}`);
     cy.focused().type(mockInvalidIpRange);
 
@@ -149,7 +149,7 @@ describe('VPC create flow', () => {
     cy.findByText(ipValidationErrorMessage2).should('be.visible');
 
     // Replace invalid IP address range with valid range.
-    cy.findByText('Subnet IP Address Range').should('be.visible').click();
+    cy.findByText('Subnet IPv4 Range (CIDR)').should('be.visible').click();
     cy.focused().type(`{selectAll}{backspace}`);
     cy.focused().type(mockSubnets[0].ipv4!);
 
@@ -165,7 +165,7 @@ describe('VPC create flow', () => {
     getSubnetNodeSection(1)
       .should('be.visible')
       .within(() => {
-        cy.findByText('Subnet IP Address Range').should('be.visible').click();
+        cy.findByText('Subnet IPv4 Range (CIDR)').should('be.visible').click();
         cy.focused().type(`{selectAll}{backspace}`);
         cy.focused().type(mockSubnetToDelete.ipv4!);
       });
@@ -209,7 +209,9 @@ describe('VPC create flow', () => {
           cy.findByText('Subnet Label').should('be.visible').click();
           cy.focused().type(mockSubnet.label);
 
-          cy.findByText('Subnet IP Address Range').should('be.visible').click();
+          cy.findByText('Subnet IPv4 Range (CIDR)')
+            .should('be.visible')
+            .click();
           cy.focused().type(`{selectAll}{backspace}`);
           cy.focused().type(`${randomIp()}/${randomNumber(0, 32)}`);
         });
diff --git a/packages/manager/cypress/e2e/core/vpc/vpc-landing-page.spec.ts b/packages/manager/cypress/e2e/core/vpc/vpc-landing-page.spec.ts
index 50ad31d690a..62f9e387b66 100644
--- a/packages/manager/cypress/e2e/core/vpc/vpc-landing-page.spec.ts
+++ b/packages/manager/cypress/e2e/core/vpc/vpc-landing-page.spec.ts
@@ -28,25 +28,28 @@ describe('VPC landing page', () => {
     cy.wait('@getVPCs');
 
     // Confirm each VPC is listed with expected data.
-    mockVPCs.forEach((mockVPC) => {
-      const regionLabel = getRegionById(mockVPC.region).label;
-      cy.findByText(mockVPC.label)
-        .should('be.visible')
-        .closest('tr')
-        .within(() => {
-          cy.findByText(regionLabel).should('be.visible');
-
-          ui.button
-            .findByTitle('Edit')
-            .should('be.visible')
-            .should('be.enabled');
-
-          ui.button
-            .findByTitle('Delete')
-            .should('be.visible')
-            .should('be.enabled');
-        });
-    });
+    const regionLabel = getRegionById(mockVPCs[0].region).label;
+    cy.findByText(mockVPCs[0].label)
+      .should('be.visible')
+      .closest('tr')
+      .within(() => {
+        cy.findByText(regionLabel).should('be.visible');
+
+        ui.actionMenu
+          .findByTitle(`Action menu for VPC ${mockVPCs[0].label}`)
+          .should('be.visible')
+          .click();
+
+        ui.actionMenuItem
+          .findByTitle('Edit')
+          .should('be.visible')
+          .should('be.enabled');
+
+        ui.actionMenuItem
+          .findByTitle('Delete')
+          .should('be.visible')
+          .should('be.enabled');
+      });
   });
 
   /*
@@ -112,7 +115,11 @@ describe('VPC landing page', () => {
       .should('be.visible')
       .closest('tr')
       .within(() => {
-        ui.button.findByTitle('Edit').should('be.visible').click();
+        ui.actionMenu
+          .findByTitle(`Action menu for VPC ${mockVPCs[1].label}`)
+          .should('be.visible')
+          .click();
+        ui.actionMenuItem.findByTitle('Edit').should('be.visible').click();
       });
 
     // Confirm correct information is shown and update label and description.
@@ -149,7 +156,11 @@ describe('VPC landing page', () => {
       .should('be.visible')
       .closest('tr')
       .within(() => {
-        ui.button.findByTitle('Edit').should('be.visible').click();
+        ui.actionMenu
+          .findByTitle(`Action menu for VPC ${mockUpdatedVPC.label}`)
+          .should('be.visible')
+          .click();
+        ui.actionMenuItem.findByTitle('Edit').should('be.visible').click();
       });
 
     ui.drawer
@@ -179,7 +190,11 @@ describe('VPC landing page', () => {
       .should('be.visible')
       .closest('tr')
       .within(() => {
-        ui.button
+        ui.actionMenu
+          .findByTitle(`Action menu for VPC ${mockVPCs[0].label}`)
+          .should('be.visible')
+          .click();
+        ui.actionMenuItem
           .findByTitle('Delete')
           .should('be.visible')
           .should('be.enabled')
@@ -192,7 +207,6 @@ describe('VPC landing page', () => {
       .within(() => {
         cy.findByLabelText('VPC Label').should('be.visible').click();
         cy.focused().type(mockVPCs[0].label);
-
         ui.button
           .findByTitle('Delete')
           .should('be.visible')
@@ -211,7 +225,11 @@ describe('VPC landing page', () => {
       .should('be.visible')
       .closest('tr')
       .within(() => {
-        ui.button
+        ui.actionMenu
+          .findByTitle(`Action menu for VPC ${mockVPCs[1].label}`)
+          .should('be.visible')
+          .click();
+        ui.actionMenuItem
           .findByTitle('Delete')
           .should('be.visible')
           .should('be.enabled')
@@ -269,7 +287,11 @@ describe('VPC landing page', () => {
       .should('be.visible')
       .closest('tr')
       .within(() => {
-        ui.button
+        ui.actionMenu
+          .findByTitle(`Action menu for VPC ${mockVPCs[0].label}`)
+          .should('be.visible')
+          .click();
+        ui.actionMenuItem
           .findByTitle('Delete')
           .should('be.visible')
           .should('be.enabled')
@@ -312,7 +334,11 @@ describe('VPC landing page', () => {
       .should('be.visible')
       .closest('tr')
       .within(() => {
-        ui.button
+        ui.actionMenu
+          .findByTitle(`Action menu for VPC ${mockVPCs[1].label}`)
+          .should('be.visible')
+          .click();
+        ui.actionMenuItem
           .findByTitle('Delete')
           .should('be.visible')
           .should('be.enabled')
diff --git a/packages/manager/cypress/e2e/core/vpc/vpc-linodes-update.spec.ts b/packages/manager/cypress/e2e/core/vpc/vpc-linodes-update.spec.ts
index 566894a6d20..6a5615b8c00 100644
--- a/packages/manager/cypress/e2e/core/vpc/vpc-linodes-update.spec.ts
+++ b/packages/manager/cypress/e2e/core/vpc/vpc-linodes-update.spec.ts
@@ -140,7 +140,7 @@ describe('VPC assign/unassign flows', () => {
       .click();
 
     ui.drawer
-      .findByTitle(`Assign Linodes to subnet: ${mockSubnet.label} (0.0.0.0/0)`)
+      .findByTitle(`Assign Linodes to subnet: ${mockSubnet.label}`)
       .should('be.visible')
       .within(() => {
         // confirm that the user is warned that a reboot / shutdown is required
@@ -167,7 +167,7 @@ describe('VPC assign/unassign flows', () => {
           .click();
 
         // Auto-assign IPv4 checkbox checked by default
-        cy.findByLabelText('Auto-assign VPC IPv4 address').should('be.checked');
+        cy.findByLabelText('Auto-assign VPC IPv4').should('be.checked');
 
         cy.wait('@getLinodeConfigs');
 
@@ -277,7 +277,7 @@ describe('VPC assign/unassign flows', () => {
       .click();
 
     ui.drawer
-      .findByTitle(`Assign Linodes to subnet: ${mockSubnet.label} (0.0.0.0/0)`)
+      .findByTitle(`Assign Linodes to subnet: ${mockSubnet.label}`)
       .should('be.visible')
       .within(() => {
         // confirm that the user is warned that a reboot / shutdown is required
@@ -304,9 +304,7 @@ describe('VPC assign/unassign flows', () => {
           .click();
 
         // Uncheck auto-assign checkbox and type in VPC IPv4
-        cy.findByLabelText('Auto-assign VPC IPv4 address')
-          .should('be.checked')
-          .click();
+        cy.findByLabelText('Auto-assign VPC IPv4').should('be.checked').click();
         cy.findByLabelText('VPC IPv4').should('be.visible').click();
         cy.focused().type(mockVPCInterface.ipv4?.vpc ?? '10.0.0.7');
 
diff --git a/packages/manager/cypress/support/intercepts/cloudpulse.ts b/packages/manager/cypress/support/intercepts/cloudpulse.ts
index 27a8236571f..da8a091b869 100644
--- a/packages/manager/cypress/support/intercepts/cloudpulse.ts
+++ b/packages/manager/cypress/support/intercepts/cloudpulse.ts
@@ -595,4 +595,4 @@ export const mockGetCloudPulseServiceByType = (
     apiMatcher(`monitor/services/${serviceType}`),
     makeResponse(service)
   );
-};
\ No newline at end of file
+};
diff --git a/packages/manager/cypress/support/intercepts/linodes.ts b/packages/manager/cypress/support/intercepts/linodes.ts
index 28516154615..26c50864836 100644
--- a/packages/manager/cypress/support/intercepts/linodes.ts
+++ b/packages/manager/cypress/support/intercepts/linodes.ts
@@ -684,6 +684,27 @@ export const mockGetLinodeInterfaces = (
   );
 };
 
+/**
+ * Mocks GET request to get a single Linode Interface.
+ *
+ * @param linodeId - ID of Linode to get interface associated with it
+ * @param interfaceId - ID of interface to get
+ * @param interfaces - the mocked Linode interface
+ *
+ * @returns Cypress Chainable.
+ */
+export const mockGetLinodeInterface = (
+  linodeId: number,
+  interfaceId: number,
+  linodeInterface: LinodeInterface
+): Cypress.Chainable<null> => {
+  return cy.intercept(
+    'GET',
+    apiMatcher(`linode/instances/${linodeId}/interfaces/${interfaceId}`),
+    linodeInterface
+  );
+};
+
 /**
  * Intercepts POST request to create a Linode Interface.
  *
diff --git a/packages/manager/cypress/support/intercepts/lke.ts b/packages/manager/cypress/support/intercepts/lke.ts
index 3890968e67d..4c2b6935e9a 100644
--- a/packages/manager/cypress/support/intercepts/lke.ts
+++ b/packages/manager/cypress/support/intercepts/lke.ts
@@ -7,7 +7,6 @@ import {
   kubernetesDashboardUrlFactory,
 } from '@src/factories';
 import {
-  kubernetesVersions,
   latestEnterpriseTierKubernetesVersion,
   latestStandardTierKubernetesVersion,
 } from 'support/constants/lke';
@@ -24,32 +23,9 @@ import type {
   KubernetesControlPlaneACLPayload,
   KubernetesTier,
   KubernetesTieredVersion,
-  KubernetesVersion,
   PriceType,
 } from '@linode/api-v4';
 
-// TODO M3-10442: Examine `mockGetKubernetesVersions` and consider modifying/adding alternative util that mocks response containing tiered version objects.
-/**
- * Intercepts GET request to retrieve Kubernetes versions and mocks response.
- *
- * @param versions - Optional array of strings containing mocked versions.
- *
- * @returns Cypress chainable.
- */
-export const mockGetKubernetesVersions = (versions?: string[] | undefined) => {
-  const versionObjects = (versions ? versions : kubernetesVersions).map(
-    (kubernetesVersionString: string): KubernetesVersion => {
-      return { id: kubernetesVersionString };
-    }
-  );
-
-  return cy.intercept(
-    'GET',
-    apiMatcher('lke/versions*'),
-    paginateResponse(versionObjects)
-  );
-};
-
 /**
  * Intercepts GET request to retrieve tiered Kubernetes versions and mocks response.
  *
diff --git a/packages/manager/cypress/support/plugins/node-version-check.ts b/packages/manager/cypress/support/plugins/node-version-check.ts
index bda06bd4cec..f01b43bd0d9 100644
--- a/packages/manager/cypress/support/plugins/node-version-check.ts
+++ b/packages/manager/cypress/support/plugins/node-version-check.ts
@@ -2,7 +2,7 @@ import type { CypressPlugin } from './plugin';
 
 // Supported major versions of Node.js.
 // Running Cypress using other versions will cause a warning to be displayed.
-const supportedVersions = [18, 20];
+const supportedVersions = [20, 22, 24];
 
 /**
  * Returns a string describing the version of Node.js that is running the tests.
diff --git a/packages/manager/cypress/support/ui/pages/vpc-create-drawer.ts b/packages/manager/cypress/support/ui/pages/vpc-create-drawer.ts
index 20c5635dc4b..9713b2e5267 100644
--- a/packages/manager/cypress/support/ui/pages/vpc-create-drawer.ts
+++ b/packages/manager/cypress/support/ui/pages/vpc-create-drawer.ts
@@ -57,7 +57,7 @@ export const vpcCreateDrawer = {
    * @param subnetIndex - Optional index of subnet for which to update IP range.
    */
   setSubnetIpRange: (subnetIpRange: string, subnetIndex: number = 0) => {
-    cy.findByText('Subnet IP Address Range', {
+    cy.findByText('Subnet IPv4 Range (CIDR)', {
       selector: `label[for="subnet-ipv4-${subnetIndex}"]`,
     })
       .should('be.visible')
diff --git a/packages/manager/package.json b/packages/manager/package.json
index 2ce25a30033..6232508998d 100644
--- a/packages/manager/package.json
+++ b/packages/manager/package.json
@@ -2,7 +2,7 @@
   "name": "linode-manager",
   "author": "Linode",
   "description": "The Linode Manager website",
-  "version": "1.151.2",
+  "version": "1.152.0",
   "private": true,
   "type": "module",
   "bugs": {
@@ -145,7 +145,7 @@
     "@types/markdown-it": "^14.1.2",
     "@types/md5": "^2.1.32",
     "@types/mocha": "^10.0.2",
-    "@types/node": "^20.17.0",
+    "@types/node": "^22.13.14",
     "@types/ramda": "0.25.16",
     "@types/react": "^19.1.6",
     "@types/react-csv": "^1.1.3",
diff --git a/packages/manager/public/assets/cribl.svg b/packages/manager/public/assets/cribl.svg
new file mode 100644
index 00000000000..7f1999c6f4f
--- /dev/null
+++ b/packages/manager/public/assets/cribl.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 243.7 243.7"><defs><style>.cls-1{fill:#0cc;}</style></defs><path class="cls-1" d="M113.71,54c1.34.77,1.25,1.85-.2,2.38l-85.01,31.49c-.91.45-2,.08-2.45-.82-.16-.31-.22-.66-.18-1.01V6.09c0-1.55,1.1-2.18,2.44-1.41l85.41,49.32ZM133.93,65.67c-1.57-.79-3.39-.95-5.07-.43L28.48,102.43c-1.53.66-2.56,2.12-2.64,3.79v6c0,1.55,1.26,2.81,2.81,2.81h187.92c1.55,0,1.72-.63.38-1.4l-83.02-47.96Z"/><path class="cls-1" d="M28.29,239.02c-1.34.77-2.44.14-2.44-1.41v-79.96c-.04-.35.02-.7.18-1.01.45-.91,1.55-1.27,2.45-.82l85.01,31.5c1.45.54,1.54,1.61.2,2.38l-85.41,49.32Z"/><path class="cls-1" d="M216.95,130.06c1.34-.76,1.17-1.4-.38-1.4H28.65c-1.55,0-2.81,1.26-2.81,2.81v6c.08,1.66,1.11,3.13,2.64,3.79l100.38,37.19c1.68.52,3.5.36,5.07-.43l83.01-47.96Z"/></svg>
\ No newline at end of file
diff --git a/packages/manager/public/assets/jaeger.svg b/packages/manager/public/assets/jaeger.svg
new file mode 100644
index 00000000000..5afce684c30
--- /dev/null
+++ b/packages/manager/public/assets/jaeger.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 504 504">
+  <!-- Generator: Adobe Illustrator 29.7.1, SVG Export Plug-In . SVG Version: 2.1.1 Build 8)  -->
+  <defs>
+    <style>
+      .st0 {
+        fill: none;
+      }
+
+      .st1 {
+        fill: #231f20;
+      }
+
+      .st2 {
+        fill: #648c1a;
+      }
+
+      .st3 {
+        fill: #67cfe3;
+      }
+
+      .st4 {
+        fill: #fff;
+      }
+
+      .st5 {
+        fill: #dfcaa3;
+      }
+    </style>
+  </defs>
+  <g>
+    <g>
+      <path class="st0" d="M298.12,201.93c-6.3-3.8-13.7-6-21.6-6-22.9,0-41.5,18.6-41.5,41.5,0,15,8,28.2,20,35.5,6.3,3.8,13.6,6,21.5,6,22.9,0,41.5-18.6,41.5-41.5,0-15-8-28.2-19.9-35.5Z"/>
+      <path class="st0" d="M189.42,267.33c0-15-8-28.2-19.9-35.4-6.3-3.8-13.7-6-21.6-6-22.9,0-41.5,18.6-41.5,41.5,0,15,8,28.2,20,35.5,6.3,3.8,13.6,6,21.5,6,22.9-.1,41.5-18.7,41.5-41.6Z"/>
+      <path class="st3" d="M203.42,348.63c2.4,4.6,5.6,8.5,9.5,8.5.8,0,1.6-.2,2.5-.5,4-1.6,4.2-8.6,3.2-15.3-5.8,1.9-10.8,4.7-15.2,7.3Z"/>
+      <path class="st3" d="M401.82,371.33v-.2c-1.7-12.2-6.9-17.7-11.5-22.5-4.3-4.5-8.3-8.8-7-16.6,1.2-7.2,6.9-11.7,16.3-12.8-5.7-38.5-14-87.1-24.8-128.5-5.4-20.7-13.8-35.1-25.2-44.6-13,6.7-28.6,14-46.1,21.5-12.6,5.5-25.6,10.8-38,15.7-10,10.7-20.9,21.2-27.5,24.3-4.8,2.1-9,3-12.7,3-8,0-13.3-4-15.9-7.5-3,.8-5.4,1.3-7.1,1.5-2,.2-4.8.5-8.4.7,1.4,3.6.8,7.9-1.8,11.1-2.9,3.5-7.6,5.3-14.3,5.3-9.6,0-23.3-3.7-41.6-11.1-2.7-1.1-5.2-2.1-7.4-2.9h-4.2c-17.5,0-31.1-.5-41.8-1.4-11.7,24.3-6.6,51.2-2.3,73.4,4.1,21.3,18.4,59.2,31.6,91.8,4.9,12.1,9.7,23.4,13.7,32.9,35.8,3.2,81.8,5.1,131.9,5.1,59.6,0,113.3-2.7,151.1-7-3-11.4-6.4-27.2-7-31.2h0ZM126.42,302.83c-12-7.3-20-20.4-20-35.5,0-22.9,18.6-41.5,41.5-41.5,7.9,0,15.3,2.2,21.6,6,11.9,7.3,19.9,20.4,19.9,35.4,0,22.9-18.6,41.5-41.5,41.5-7.8.1-15.2-2.1-21.5-5.9ZM271.02,337.03c-4.3,1.9-10.5,2.7-20.4,2.8,0,.9.1,1.7.1,2.3.4,5.7-.9,10.2-4,13.5-2.8,3-6.8,4.6-11.3,4.6-2,0-4.1-.3-5.7-.9-1.8-.7-3.3-1.8-4.7-3.6-1.3,3.7-3.6,6.3-6.9,7.7-1.7.7-3.4,1.1-5.2,1.1-6.1,0-11.4-4.2-15.7-12.1-.6.3-1.2.7-1.7,1-3,1.6-6.6,2.4-10.4,2.4-7.3,0-14.1-2.8-18.2-7.6-3.4-3.9-4.8-8.9-4.1-14.1,2.2-15.9,23.2-22.3,25.6-23l4.9-1.4,3.3,3.9c.4.5,2.8,2.8,11.8,2.8,3.4,0,7.3-.3,11.7-1,14.4-2.3,19.9-13.8,20.3-14.5l2-4.7h5.2c31.2.3,36,14,36.8,18.2,1.4,9.8-3.5,18.3-13.4,22.6h0ZM276.52,278.93c-7.9,0-15.2-2.2-21.5-6-12-7.3-20-20.4-20-35.5,0-22.9,18.6-41.5,41.5-41.5,7.9,0,15.3,2.2,21.6,6,11.9,7.3,19.9,20.4,19.9,35.4,0,23-18.6,41.6-41.5,41.6Z"/>
+      <path class="st3" d="M247.32,304.03s-7,16-26.2,19c-5,.8-9.3,1.1-12.9,1.1-10.3,0-15.3-2.7-17.8-5.6,0,0-18.4,5.3-20,16.6-1.2,8.5,7.2,12.8,14.6,12.8,2.5,0,4.9-.5,6.7-1.5,7.4-4,18.4-12.6,33.2-14.5,1.3-.2,3.2-.2,5.4-.2,5,0,11.9.3,18.6.3,7.6,0,14.9-.4,18.9-2.2,9.1-4,9.1-10.7,8.5-14.1-.6-3.8-6.1-11.5-29-11.7h0Z"/>
+      <path class="st3" d="M243.32,339.73c-1.7,0-3.5,0-5.2-.1-2.9-.1-5.5-.1-7.8-.1-1.8,0-3.2,0-4.3.2,1.7,6.1,3.9,12,6.2,12.9.7.2,1.8.5,3.2.5,3.7,0,8.8-1.8,8.1-10.4-.1-.9-.1-1.9-.2-3Z"/>
+    </g>
+    <path class="st0" d="M82.62,168.33s-.2-.9-.5-2.4-.7-3.7-1.2-6.2c-.2-1.2-.4-2.6-.5-3.9-.1-1.3-.1-2.8.2-3.8.1-.5.3-.9.5-1.1.2-.2.3-.2.6-.3h.2l.3-.1c.1,0,0,.1,0,.1h-.2.2c.3.1.8.4,1.3.7,1,.7,2.1,1.9,3.1,3.1,1,1.2,2,2.5,2.9,3.7,1.9,2.5,3.6,5,5.1,7.1s2.8,3.9,3.8,5.1c.9,1.2,1.5,1.9,1.5,1.9,0,0,0-.2-.1-.6-.1-.4-.1-1-.3-1.8-.3-1.5-.8-3.7-1.6-6.3-.8-2.5-2-5.5-3.6-8.5-.8-1.5-1.7-3-2.8-4.5-1.1-1.5-2.4-3-4.1-4.3-.9-.7-2-1.3-3.3-1.7-.4-.1-.7-.2-1.1-.2h-1.5c-.2,0-.6.1-.7.1l-.3.1-.3.1-.4.1-.1.1-.2.1c-1.3.5-2.5,1.6-3.2,2.8s-1,2.4-1.1,3.5c-.2,2.2.2,3.9.7,5.5s1.1,3,1.7,4.2c1.2,2.5,2.5,4.3,3.5,5.5.5.6.9,1.1,1.2,1.4.1.3.3.5.3.5h0Z"/>
+    <path class="st0" d="M329.72,97.73l-.3-.5-.4-.5c-.4-.6-1.9-1.6-2-1.6l-.2-.1h-.1l-.3-.1h-.1l-.4-.1-.8-.3c-.6-.2-1.2-.3-1.8-.4-.6-.1-1.3-.1-1.9-.1s-1.3.1-1.9.2c-2.5.4-4.8,1.7-6.5,3.2s-3,3.1-4.1,4.8c-2.1,3.3-3.3,6.7-4.1,9.6-.8,2.9-1.1,5.3-1.2,7.1-.1.9-.1,1.5-.1,2v.7s.5-.9,1.3-2.4,2-3.6,3.4-6,3.2-5.2,5.2-7.7c1-1.2,2.2-2.4,3.4-3.3,1.2-.9,2.5-1.5,3.7-1.7.3,0,.6-.1.9-.1s.6,0,1,.1c.3.1.7.1,1,.2l.8.2.3.1h.1s.1.1.1.2c.2.3.3.9.4,1.6.1,1.4-.1,3-.3,4.5-.3,1.5-.6,3-.9,4.4-.6,2.7-1.3,5.1-1.7,6.7-.4,1.6-.6,2.6-.6,2.6,0,0,.7-.7,1.8-2.1,1.1-1.3,2.5-3.3,4-6,.7-1.3,1.4-2.8,2.1-4.4.6-1.7,1.2-3.5,1.4-5.7.1-1.1,0-2.4-.4-3.8-.4-.6-.6-1-.8-1.3h0Z"/>
+    <path class="st0" d="M106.52,267.33c0-22.9,18.6-41.5,41.5-41.5,7.9,0,15.2,2.2,21.5,6-6.3-3.8-13.7-6-21.6-6-22.9,0-41.5,18.6-41.4,41.5-.1,15,7.9,28.2,19.9,35.4-11.9-7.2-19.9-20.4-19.9-35.4h0Z"/>
+    <path class="st0" d="M255.02,272.93c-11.9-7.3-19.9-20.4-19.9-35.4,0-22.9,18.6-41.5,41.5-41.5,7.9,0,15.2,2.2,21.5,6-6.3-3.8-13.7-6-21.6-6-22.9,0-41.5,18.6-41.5,41.5,0,14.9,8,28.1,20,35.4h0Z"/>
+    <path class="st1" d="M146.02,448.23c-7.1,1.6-28,13-46.1,16.4s-33.7,5.3-39.2,7.3-9.7,6.1,1,10.1c10.8,4.1,62.9,5.5,67.6,0s-3.2-7.9-14.6-7.7c-8.1.1-7.1-2.7-7.1-3,0,0,.5-3.6,13-5.3,12.5-1.7,67.6-6.9,66.5-12.8-1-5.8-34-6.6-41.1-5h0Z"/>
+    <ellipse class="st1" cx="110.21" cy="491.6" rx="10.8" ry="3.1" transform="translate(-102.04 34.69) rotate(-12.28)"/>
+    <ellipse class="st1" cx="85.2" cy="490.22" rx="11.4" ry="3" transform="translate(-38.62 8.3) rotate(-4.55)"/>
+    <ellipse class="st1" cx="65.25" cy="487.75" rx="7.6" ry="2.4" transform="translate(-65.26 13.28) rotate(-7.76)"/>
+    <ellipse class="st1" cx="50.5" cy="485.42" rx="7.4" ry="1.9" transform="translate(-69.21 12.29) rotate(-8.26)"/>
+    <ellipse class="st1" cx="47.11" cy="481.33" rx="7.4" ry="1.9" transform="translate(-68.66 11.76) rotate(-8.26)"/>
+    <ellipse class="st1" cx="46.3" cy="476.63" rx="6.4" ry="1.7" transform="translate(-67.99 11.6) rotate(-8.26)"/>
+    <path class="st1" d="M254.32,453.93c-12.4.6-40.4-.8-44.2,5.7-3.9,6.5,11.4,8.9,35.3,6.9,23.9-2,57.8-4.7,59.2-12,1.4-7.3-6.3-5.9-7.1-10.5-.8-4.7,8.5-4.7,10.3-11.6s-12.6-6.1-25.4-6.1-34.1,1.2-36.1,7.9c-2,6.7,9.7,6.7,18.1,8.3,8.3,1.6,5.9,4.7,5.9,4.7-.4,4.3-3.6,6.1-16,6.7Z"/>
+    <ellipse class="st1" cx="221.22" cy="471.73" rx="10.7" ry="3.5"/>
+    <ellipse class="st1" cx="248.82" cy="470.93" rx="7.2" ry="3.2"/>
+    <ellipse class="st1" cx="271.12" cy="468.73" rx="7.8" ry="2.6"/>
+    <ellipse class="st1" cx="288.32" cy="465.83" rx="5.7" ry="2.7"/>
+    <ellipse class="st1" cx="303.22" cy="462.63" rx="5.8" ry="2.7"/>
+    <path class="st1" d="M50.92,387.83c0,3.5,7.5,6.7,20.9,9.6-1-6.9-.4-13.9.5-19.4-13.7,3-21.4,6.3-21.4,9.8Z"/>
+    <path class="st1" d="M446.32,378.93c-.2.6-.4,1.1-.7,1.7-1.6,3.9-4,7.3-7,10.1-6.1,5.7-11.4,9.2-16.1,10.4,26.2-3.7,41.7-8.3,41.7-13.2.1-3.3-6.3-6.3-17.9-9Z"/>
+    <path class="st5" d="M96.62,415.73c9.7,0,16.6-5.3,21.4-12.2-5.5-12.8-14.5-34.2-23.1-56.9-2.3,2-5,5-7.9,9.5-7.2,11.2-13.2,37.3-5.7,51,3.1,5.8,8.1,8.6,15.3,8.6Z"/>
+    <path class="st5" d="M440.02,351.13c-5.7-14.8-17.8-25.2-29.5-25.5h-.4s-2.3-.3-5.3-.3c-6.3,0-14.1,1.4-15.2,7.8-.7,4.5,1.2,6.8,5.4,11.1,4.7,5,11.2,11.8,13.2,26,2.2,16.3,6.2,24.6,11.8,24.6h0c2.6,0,7.4-1.6,15.3-9.1,9.7-9.2,8.8-23.9,4.7-34.6Z"/>
+    <path class="st4" d="M235.12,237.43c0,15,8,28.2,19.9,35.4,6.3,3.8,13.6,6,21.5,6,22.9,0,41.5-18.6,41.5-41.5,0-15-8-28.2-19.9-35.4-6.3-3.8-13.6-6-21.5-6-22.9,0-41.5,18.6-41.5,41.5h0ZM284.02,251.33c0,7.2-5.9,13.1-13.1,13.1s-13.1-5.9-13.1-13.1,5.9-13.1,13.1-13.1,13.1,5.8,13.1,13.1h0Z"/>
+    <path class="st4" d="M106.52,267.33c0,15,8,28.2,19.9,35.4,6.3,3.8,13.6,6,21.5,6,22.9,0,41.5-18.6,41.5-41.5,0-15-8-28.2-19.9-35.4-6.3-3.8-13.6-6-21.5-6-22.9,0-41.5,18.6-41.5,41.5h0ZM157.32,281.93c0,7.2-5.9,13.1-13.1,13.1s-13.1-5.9-13.1-13.1,5.9-13.1,13.1-13.1,13.1,5.9,13.1,13.1Z"/>
+    <circle class="st1" cx="144.32" cy="281.93" r="13.1"/>
+    <circle class="st1" cx="271.02" cy="251.33" r="13.1"/>
+    <path class="st2" d="M108.32,201.13c-1.4-.3-2.3-.4-2.6-.4-5.5.3-10.6-3.5-11.6-9.1-.1-.6-.1-1.1-.2-1.7-3,1.7-6,3.5-8.8,5.5l-5,3.5-3.7-4.8c-1.1-1.5-6.2-8.4-10.9-17.5-8.9,4.2-15.8,8.8-17.5,13.1-.3.8-.2,1.3.1,1.7,1.5,2.1,10.1,8.6,60.2,9.7Z"/>
+    <path class="st2" d="M345.32,119.13c-1.7,9.9-4.9,20.8-7,23.8l-2,2.8c9-4.4,17.1-8.6,23.9-12.4,23.7-13.3,26.7-19.1,27-20.6.2-1,0-1.3-.1-1.4-.3-.3-1.9-1.9-9.4-1.9-8.2,0-19.7,1.9-31.6,4.5-.2,1.6-.5,3.3-.8,5.2Z"/>
+    <path class="st2" d="M336.12,145.83l-3.4-.3c-.1,0-6.3-.5-14.9-.5s-20.5.5-30.1,2.8c1.8,3.8,1.4,8.5-1.5,11.9-2.3,2.8-6.3,7.5-11.1,12.9,8.4-3.4,17.1-7.1,25.8-10.8,12.9-5.5,24.7-11,35.2-16h0Z"/>
+    <path class="st2" d="M108.82,135.83c10.2,2.8,21.7,4.2,34.3,4.2,48.8,0,102.4-21.1,123.3-30.2l1.3-.6c-.2-3.1.1-6.5.8-9.9,1.3-6.1,4-11.2,7.2-14.6-.6-2.3-1.1-4-1.5-4.9-6.9-3.7-64.2-25-94.1-25-3,0-5.6.2-7.7.7-26.5,5.4-66.7,51.4-68.1,57.9-.4,2.8-.3,11.7,0,21.2l4.5,1.2h0Z"/>
+    <path class="st2" d="M212.32,186.93c4.4-2.8,10-2.1,13.6,1.3.6-.1,1.5-.3,2.9-1,5.5-2.6,25.3-23.7,40.3-41.8.5-.7,1.1-1.2,1.8-1.7-34.3,14.8-82.3,31.1-128,31.1-7.3,0-14.3-.4-20.8-1.3l1,3-5.7,2.2s-1,.4-2.7,1.1c7.4,1.7,17.3,5.1,29.8,10.1,22.9,9.2,31.6,9.6,33.8,9.5,3.1-1.6,6.9-1.7,10.1-.1,5.9-.4,10.5-.7,13.3-1,1.3-.1,3.1-.5,5.5-1.1-.3-4.1,1.5-8,5.1-10.3Z"/>
+    <path class="st5" d="M268.92,115.63c-.7.3-1.4.6-2.1.9-.2.1-.3.1-.5.2-.7.3-1.4.6-2.2.9-.1.1-.3.1-.4.2-.7.3-1.4.6-2.1.9-.1.1-.3.1-.4.2-.8.3-1.6.7-2.4,1-.2.1-.4.1-.5.2-.9.3-1.7.7-2.6,1h0c-.9.4-1.8.7-2.7,1.1-.2.1-.4.2-.6.2-.9.4-1.9.7-2.8,1.1-.1.1-.3.1-.4.2-.9.3-1.8.7-2.7,1-.2.1-.3.1-.5.2-1,.4-2,.7-3,1.1-.2.1-.4.2-.6.2-1,.4-2.1.7-3.1,1.1h-.1c-1.1.4-2.2.8-3.3,1.1-.2.1-.5.2-.7.2-1.1.4-2.2.8-3.3,1.1-.1,0-.3.1-.5.1-1,.3-2.1.7-3.1,1-.2.1-.4.1-.6.2-1.1.4-2.3.7-3.5,1.1-.2.1-.5.1-.7.2-1.1.4-2.3.7-3.5,1.1-.07,0-.13.03-.2.1-1.2.4-2.4.7-3.7,1.1-.3.1-.5.2-.8.2-1.2.4-2.5.7-3.7,1-.2,0-.3.1-.5.1-1.2.3-2.3.6-3.5.9-.2.1-.5.1-.7.2-1.3.3-2.5.6-3.8,1-.3.1-.5.1-.8.2-1.2.3-2.5.6-3.7.9-.1,0-.2.1-.3.1-1.3.3-2.6.6-3.9.9-.3.1-.6.1-.9.2-1.3.3-2.6.6-4,.8-.2,0-.3.1-.5.1-1.2.2-2.5.5-3.7.7-.3,0-.5.1-.8.1-1.3.2-2.6.5-4,.7-.3,0-.5.1-.8.1-1.3.2-2.5.4-3.8.6-.1,0-.3,0-.4.1-1.3.2-2.7.4-4.1.6-.3,0-.6.1-.9.1-1.4.2-2.7.3-4.1.5h-.4c-1.3.1-2.5.3-3.8.4-.3,0-.5.1-.8.1-1.3.1-2.7.2-4,.3-.3,0-.5,0-.8.1-1.3.1-2.5.2-3.8.2h-.5c-1.4.1-2.7.1-4,.2h-.9c-1.4,0-2.7.1-4.1.1h-.4c-1.3,0-2.6,0-3.9-.1h-.8c-1.3,0-2.7-.1-4-.2h-.8c-1.3-.1-2.6-.2-3.8-.3h-.3c-1.3-.1-2.7-.3-4-.4-.3,0-.6-.1-.9-.1-1.3-.2-2.6-.3-3.9-.5-.2,0-.4-.1-.5-.1-1.2-.2-2.4-.4-3.6-.6-.2,0-.5-.1-.7-.1-1.3-.2-2.5-.5-3.8-.8-.3-.1-.5-.1-.8-.2-1.3-.3-2.6-.6-3.9-1h0c1.2,1.8,2.4,3.7,3.5,5.8,4.2,7.4,7.3,14.8,9,19.1.7.1,1.5.2,2.3.3.3,0,.5.1.8.1.5.1,1.1.1,1.7.2.3,0,.6.1,1,.1.5.1,1.1.1,1.7.2.4,0,.7.1,1.1.1.6,0,1.1.1,1.7.1.4,0,.8.1,1.3.1.6,0,1.1.1,1.7.1.4,0,.9,0,1.4.1.6,0,1.1.1,1.7.1h1.5c.6,0,1.2,0,1.8.1h7.5c.9,0,1.7,0,2.6-.1h1.1c.9,0,1.9-.1,2.8-.1h.7c1.2-.1,2.4-.1,3.7-.2.3,0,.6,0,.9-.1,1-.1,2-.2,2.9-.2.4,0,.8-.1,1.2-.1,1.1-.1,2.2-.2,3.3-.3.3,0,.5-.1.8-.1,1.3-.2,2.7-.3,4.1-.5.4,0,.7-.1,1.1-.1,1.1-.1,2.2-.3,3.3-.5.4-.1.9-.1,1.3-.2,1.2-.2,2.5-.4,3.7-.6.3,0,.5-.1.8-.1,1.5-.3,3-.5,4.6-.8.4-.1.8-.2,1.2-.2,1.2-.2,2.4-.5,3.6-.7.5-.1,1-.2,1.5-.3,1.4-.3,2.8-.6,4.2-.9.2-.1.5-.1.7-.2,1.6-.4,3.3-.8,5-1.2.5-.1.9-.2,1.4-.4,1.3-.3,2.6-.6,3.9-1,.5-.1,1.1-.3,1.6-.4,1.6-.4,3.1-.8,4.8-1.3.2-.1.4-.1.6-.2,1.8-.5,3.6-1,5.5-1.6.5-.2,1-.3,1.6-.5,1.4-.4,2.8-.9,4.2-1.3.6-.2,1.2-.4,1.7-.6,1.8-.6,3.5-1.2,5.3-1.8.2-.1.3-.1.5-.2,2-.7,3.9-1.4,5.9-2.1.6-.2,1.2-.4,1.7-.6,1.5-.5,3-1.1,4.6-1.7.6-.2,1.2-.5,1.9-.7,2-.7,4-1.5,6-2.3.1,0,.2-.1.3-.1,2.1-.8,4.3-1.7,6.4-2.6.6-.3,1.3-.5,1.9-.8,1.6-.7,3.3-1.4,4.9-2.1.7-.3,1.3-.6,2-.8,2.2-1,4.5-2,6.7-3,.9-3,2.2-6.7,3.8-10.8h-.4c-.6,0-1.3-.1-1.9-.2-3.7-.5-6.5-3.5-8-8h0Z"/>
+    <path class="st2" d="M143.22,146.33h-.4.4s-.05,0,0,0Z"/>
+    <polygon class="st3" points="80.12 125.73 80.12 125.73 80.12 128.93 80.12 125.73"/>
+    <path class="st5" d="M286.42,80.43c3.9.9,6.8,4.1,8.3,9.2.2.8.4,1.7.6,2.6,8.9-12.5,18.6-18.9,29-18.9,4.4,0,8.2,1,11.4,3,5.5-6.7,8.9-11.2,8.9-11.2-4.1.7-12.7,1.9-12.7,1.9,32.5-12,29.9-44.5,29.9-44.5,0,5.6-16.8,19.1-16.8,19.1.7-4.9-1.9-11.2-1.9-11.2.7,6.4-19.4,22.8-19.4,22.8,1.5-3,.4-8.2.4-8.2-1.1,6-10.1,8.2-10.1,8.2,5.6-6.7,16.1-42.2,8.2-44.5-7.8-2.2-18.7,23.2-18.7,23.2-.4-6-3.7-6-3.7-6,1.5,18.7-13.5,33.6-13.5,33.6-1.1-3.7-7.1-5.6-7.1-5.6,1.4,3,.6,13.8-.2,21.5-.3,3-.6,5.5-.8,6.9,2-1.4,4.1-2.2,6.2-2.2.7.1,1.4.2,2,.3h0Z"/>
+    <path class="st1" d="M278.22,117.73c1.2.3,2.7-.4,4.2-1.8,1-2.3,2-4.6,3.2-7,1-2.2,2.1-4.2,3.2-6.2.8-4.1.7-8.2-.2-11.3-.8-2.7-2.1-4.5-3.5-4.8-.2,0-.4-.1-.5-.1-3.2,0-8,5.6-9.8,14-1,4.4-1,8.9,0,12.3.6,2.7,2,4.5,3.4,4.9h0Z"/>
+    <path class="st3" d="M324.62,100.73h-.1.1s-.05,0,0,0t0,0h0Z"/>
+    <path class="st3" d="M324.22,79.73c-25.1,0-41.2,51.3-44.3,62,.9.2,1.8.5,2.6.9,10.8-3.2,24.7-4,35.3-4,8.9,0,15.4.5,15.4.5,2.8-3.9,19-59.4-9-59.4ZM330.62,102.53c-.2,2.2-.8,4-1.4,5.7-.6,1.6-1.4,3.1-2.1,4.4-1.4,2.6-2.9,4.6-4,6s-1.8,2.1-1.8,2.1c0,0,.2-1,.6-2.6.4-1.7,1-4,1.7-6.7.3-1.4.6-2.8.9-4.4.3-1.5.4-3.1.3-4.5-.1-.7-.2-1.3-.4-1.6,0-.1-.1-.1-.1-.2h0l-.3-.1-.8-.2c-.3-.1-.7-.1-1-.2s-.6,0-1-.1c-.3,0-.6.1-.9.1-1.2.2-2.5.8-3.7,1.7-1.2.9-2.4,2.1-3.4,3.3-2.1,2.5-3.8,5.3-5.2,7.7-1.4,2.4-2.6,4.5-3.4,6s-1.3,2.4-1.3,2.4v-.7c0-.5,0-1.1.1-2,.1-1.7.5-4.2,1.2-7.1.8-2.9,2-6.2,4.1-9.6,1.1-1.7,2.4-3.3,4.1-4.8s4-2.7,6.5-3.2c.6-.1,1.3-.1,1.9-.2.6,0,1.3,0,1.9.1s1.2.2,1.8.4l.8.3.4.1h.1l.3.1h.1l.2.1c.1,0,1.6,1,2,1.6l.4.5.3.5c.2.4.4.7.5,1.1.7,1.7.7,2.9.6,4h0Z"/>
+    <path class="st3" d="M324.52,100.63s-.05,0,0,0,.05,0,0,0h0c0,.1,0,0,0,0Z"/>
+    <path class="st4" d="M324.52,100.73h0Z"/>
+    <path class="st1" d="M225.32,203.83c3,0,6.4-.8,9.9-2.4,7.4-3.3,25.4-21.4,45.9-46,.7-.9,1.1-2,1-3.2s-.7-2.2-1.6-3c-1-.8-2.1-1-2.8-1-1.3,0-2.5.6-3.4,1.6-8.9,10.7-34,39.5-42.6,43.6l-.1.1c-1.7.8-3.2,1.2-4.6,1.5l-3.3.5-2.4-2.3c-.8-.8-1.9-1.2-3-1.2-.8,0-1.6.2-2.3.7-1,.6-1.7,1.6-1.9,2.8-.3,1.1,0,2.3.6,3.3.2.4,3.4,5,10.6,5h0Z"/>
+    <path class="st1" d="M183.52,204.83c-.7,0-1.4.2-2.1.5l-1.3.7-1.5.1h-1.1c-4.1,0-14.2-1.3-35.7-10-23.7-9.6-33-11-36.5-11-.7,0-1.1.1-1.2.1-1.2.2-2.2.9-2.8,1.8-.7,1-.9,2.1-.7,3.3.4,2.1,2.2,3.6,4.3,3.6h1.3c2.6.2,11,1.7,32.5,10.3,17.4,7,30.5,10.6,39.1,10.6,4.5,0,7.6-1,9.1-2.9.7-.9,1.1-2,1-3.2s-.7-2.2-1.6-3c-1-.7-2.1-.9-2.8-.9h0Z"/>
+    <path class="st3" d="M115.12,172.83s-14.9-43.9-35.1-43.9c-2.6,0-5.3.7-8.1,2.4-24.1,14.6,9.5,58.9,9.5,58.9,14.7-10.1,33.7-17.4,33.7-17.4h0ZM77.52,160.93c-.6-1.2-1.2-2.6-1.7-4.2-.4-1.6-.9-3.4-.7-5.5.1-1.1.4-2.3,1.1-3.5s2-2.3,3.2-2.8l.2-.1.1-.1.4-.1.3-.1.3-.1c.1,0,.5-.1.7-.1h1.5c.4.1.7.1,1.1.2,1.4.4,2.4,1,3.3,1.7,1.8,1.4,3,2.8,4.1,4.3s2,3,2.8,4.5c1.6,3,2.8,5.9,3.6,8.5.8,2.5,1.3,4.7,1.6,6.3.2.8.2,1.4.3,1.8,0,.4.1.6.1.6,0,0-.6-.7-1.5-1.9s-2.3-3-3.8-5.1-3.2-4.6-5.1-7.1c-.9-1.3-1.9-2.5-2.9-3.7s-2.1-2.3-3.1-3.1c-.5-.4-1-.6-1.3-.7h-.2.2s.1-.1,0-.1l-.3.1h-.2c-.3.1-.4.2-.6.3-.2.2-.4.6-.5,1.1-.3,1-.3,2.5-.2,3.8.1,1.4.3,2.7.5,3.9.4,2.5.9,4.6,1.2,6.2.3,1.5.5,2.4.5,2.4,0,0-.2-.2-.4-.5-.3-.3-.7-.8-1.2-1.4-.9-1.2-2.2-3.1-3.4-5.5h0Z"/>
+    <path class="st1" d="M218.82,308.73c.2,0,.5-.1.7-.1.3,0,.5-.1.8-.2,10.6-2.2,18.5-8.3,18.6-14.5,0-.4,0-.9-.1-1.3-.1-.8-.4-1.6-.8-2.3-.1-.3-.3-.5-.5-.8-.1-.1-.2-.2-.2-.3-.1-.1-.2-.2-.3-.3-.3-.3-.5-.6-.8-.9h0c-.2-.2-.5-.4-.8-.6h0c-1.3-1-2.9-1.9-4.8-2.5-.1,0-.2-.1-.3-.1-.3-.1-.6-.2-.9-.3-.1,0-.3-.1-.4-.1-.3-.1-.6-.2-.9-.2-.2,0-.3-.1-.5-.1-.3-.1-.6-.1-.9-.2-.2,0-.5-.1-.7-.1-.4-.1-.8-.1-1.3-.2-.3,0-.6-.1-.9-.1h-4.1c-.4,0-.8,0-1.1.1h-.6c-.6,0-1.2.1-1.7.2s-1.1.1-1.6.2-1,.2-1.5.3c-.1,0-.2.1-.4.1-.5.1-1,.2-1.4.3h0c-.5.1-1,.3-1.4.4-.1,0-.2.1-.3.1-.5.1-.9.3-1.4.4h0c-.5.2-.9.3-1.3.5-.1,0-.2.1-.3.1-.9.4-1.7.7-2.5,1.1-.1,0-.2.1-.2.1-.4.2-.8.4-1.1.6h0c-.3.2-.6.4-1,.6-.1,0-.1.1-.2.1-.2.2-.5.3-.7.5-.1.1-.2.1-.2.2-.2.2-.4.3-.6.5-.07.07-.13.13-.2.2-.5.4-1,.9-1.5,1.3-.1,0-.1.1-.1.1-.2.2-.3.3-.5.5-.07.07-.13.13-.2.2-.2.2-.3.3-.4.5-.07.07-.13.13-.2.2-.2.2-.4.5-.5.7h0c-.2.2-.3.5-.5.7,0,.1-.1.1-.1.2-.1.2-.2.4-.3.5,0,.1-.1.2-.1.2-.1.2-.2.3-.2.5,0,.1-.1.1-.1.2-.1.2-.2.5-.2.7h0c-.1.2-.1.5-.2.7v.2c0,.2,0,.3-.1.5v1c0,.2,0,.5.1.7.1.4.2.8.3,1.1,1.9,6.4,12.1,9.8,23.6,7.9h0Z"/>
+    <path class="st1" d="M192.22,300.93c.4,2.2,1.6,4,3.6,5.5.2.2.4.3.6.5,3.3,2.3,8.2,3.6,13.9,3.7,2.2,0,4.5-.2,6.9-.6,7.1-1.2,13.2-4.1,16.9-7.6.8-.8,1.5-1.6,2.1-2.5.6-.8,1-1.7,1.3-2.6s.5-1.8.5-2.7c0-.4,0-.9-.1-1.3-.3-1.8-1.2-3.4-2.6-4.7-.4-.3-.7-.7-1.2-1-.8-.6-1.8-1.2-2.8-1.6-1.4-.7-3.1-1.2-4.8-1.6-.8-.2-1.6-.3-2.4-.4-1.3-.2-2.7-.3-4.2-.3h-.1c-1.5,0-3,.1-4.5.2-.8.1-1.6.2-2.4.3-2.4.4-4.6,1-6.7,1.7-9,3.2-15,9.2-14,15Z"/>
+    <path class="st4" d="M212.92,357.13c.8,0,1.6-.2,2.5-.5,4-1.6,4.2-8.6,3.2-15.3-5.7,1.8-10.8,4.7-15.2,7.3,2.4,4.6,5.6,8.5,9.5,8.5Z"/>
+    <path class="st4" d="M232.22,352.53c.7.2,1.8.5,3.2.5,3.7,0,8.8-1.8,8.1-10.4-.1-.8-.1-1.8-.1-2.9-1.7,0-3.5,0-5.2-.1-2.9-.1-5.5-.1-7.8-.1-1.8,0-3.2,0-4.3.2,1.6,6,3.8,11.9,6.1,12.8Z"/>
+    <path class="st5" d="M247.32,304.03s-7,16-26.2,19c-5,.8-9.3,1.1-12.9,1.1-10.3,0-15.3-2.7-17.8-5.6,0,0-18.4,5.3-20,16.6-1.2,8.5,7.2,12.8,14.6,12.8,2.5,0,4.9-.5,6.7-1.5,7.4-4,18.4-12.6,33.2-14.5,1.3-.2,3.2-.2,5.4-.2,5,0,11.9.3,18.6.3,7.6,0,14.9-.4,18.9-2.2,9.1-4,9.1-10.7,8.5-14.1-.6-3.8-6.1-11.5-29-11.7h0Z"/>
+  </g>
+  <path class="st1" d="M77.52,160.93c-.6-1.2-1.2-2.6-1.7-4.2-.4-1.6-.9-3.4-.7-5.5.1-1.1.4-2.3,1.1-3.5s2-2.3,3.2-2.8l.2-.1.1-.1.4-.1.3-.1.3-.1c.1,0,.5-.1.7-.1h1.5c.4.1.7.1,1.1.2,1.4.4,2.4,1,3.3,1.7,1.8,1.4,3,2.8,4.1,4.3s2,3,2.8,4.5c1.6,3,2.8,5.9,3.6,8.5.8,2.5,1.3,4.7,1.6,6.3.2.8.2,1.4.3,1.8,0,.4.1.6.1.6,0,0-.6-.7-1.5-1.9s-2.3-3-3.8-5.1-3.2-4.6-5.1-7.1c-.9-1.3-1.9-2.5-2.9-3.7s-2.1-2.3-3.1-3.1c-.5-.4-1-.6-1.3-.7h-.2.2s.1-.1,0-.1l-.3.1h-.2c-.3.1-.4.2-.6.3-.2.2-.4.6-.5,1.1-.3,1-.3,2.5-.2,3.8.1,1.4.3,2.7.5,3.9.4,2.5.9,4.6,1.2,6.2.3,1.5.5,2.4.5,2.4,0,0-.2-.2-.4-.5-.3-.3-.7-.8-1.2-1.4-.9-1.2-2.2-3.1-3.4-5.5h0Z"/>
+  <path class="st1" d="M330.62,102.53c-.2,2.2-.8,4-1.4,5.7-.6,1.6-1.4,3.1-2.1,4.4-1.4,2.6-2.9,4.6-4,6s-1.8,2.1-1.8,2.1c0,0,.2-1,.6-2.6.4-1.7,1-4,1.7-6.7.3-1.4.6-2.8.9-4.4.3-1.5.4-3.1.3-4.5-.1-.7-.2-1.3-.4-1.6,0-.1-.1-.1-.1-.2h0l-.3-.1-.8-.2c-.3-.1-.7-.1-1-.2s-.6,0-1-.1c-.3,0-.6.1-.9.1-1.2.2-2.5.8-3.7,1.7-1.2.9-2.4,2.1-3.4,3.3-2.1,2.5-3.8,5.3-5.2,7.7-1.4,2.4-2.6,4.5-3.4,6s-1.3,2.4-1.3,2.4v-.7c0-.5,0-1.1.1-2,.1-1.7.5-4.2,1.2-7.1.8-2.9,2-6.2,4.1-9.6,1.1-1.7,2.4-3.3,4.1-4.8s4-2.7,6.5-3.2c.6-.1,1.3-.1,1.9-.2.6,0,1.3,0,1.9.1s1.2.2,1.8.4l.8.3.4.1h.1l.3.1h.1l.2.1c.1,0,1.6,1,2,1.6l.4.5.3.5c.2.4.4.7.5,1.1.7,1.7.7,2.9.6,4h0Z"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/public/assets/white/cribl.svg b/packages/manager/public/assets/white/cribl.svg
new file mode 100644
index 00000000000..1024e1ae3ec
--- /dev/null
+++ b/packages/manager/public/assets/white/cribl.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 243.7 243.7"><defs><style>.cls-1{fill:#fff;}</style></defs><path class="cls-1" d="M113.71,54c1.34.77,1.25,1.85-.2,2.38l-85.01,31.49c-.91.45-2,.08-2.45-.82-.16-.31-.22-.66-.18-1.01V6.09c0-1.55,1.1-2.18,2.44-1.41l85.41,49.32ZM133.93,65.67c-1.57-.79-3.39-.95-5.07-.43L28.48,102.43c-1.53.66-2.56,2.12-2.64,3.79v6c0,1.55,1.26,2.81,2.81,2.81h187.92c1.55,0,1.72-.63.38-1.4l-83.02-47.96Z"/><path class="cls-1" d="M28.29,239.02c-1.34.77-2.44.14-2.44-1.41v-79.96c-.04-.35.02-.7.18-1.01.45-.91,1.55-1.27,2.45-.82l85.01,31.5c1.45.54,1.54,1.61.2,2.38l-85.41,49.32Z"/><path class="cls-1" d="M216.95,130.06c1.34-.76,1.17-1.4-.38-1.4H28.65c-1.55,0-2.81,1.26-2.81,2.81v6c.08,1.66,1.11,3.13,2.64,3.79l100.38,37.19c1.68.52,3.5.36,5.07-.43l83.01-47.96Z"/></svg>
\ No newline at end of file
diff --git a/packages/manager/public/assets/white/jaeger.svg b/packages/manager/public/assets/white/jaeger.svg
new file mode 100644
index 00000000000..aa15ba8a690
--- /dev/null
+++ b/packages/manager/public/assets/white/jaeger.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 504 504">
+  <!-- Generator: Adobe Illustrator 29.7.1, SVG Export Plug-In . SVG Version: 2.1.1 Build 8)  -->
+  <defs>
+    <style>
+      .st0 {
+        fill: none;
+      }
+
+      .st1 {
+        fill: #648c1a;
+      }
+
+      .st2 {
+        fill: #67cfe3;
+      }
+
+      .st3 {
+        fill: #fff;
+      }
+    </style>
+  </defs>
+  <g>
+    <path class="st0" d="M298.12,201.95c-6.3-3.8-13.7-6-21.6-6-22.9,0-41.5,18.6-41.5,41.5,0,15,8,28.2,20,35.5,6.3,3.8,13.6,6,21.5,6,22.9,0,41.5-18.6,41.5-41.5,0-15-8-28.2-19.9-35.5h0Z"/>
+    <path class="st0" d="M189.42,267.35c0-15-8-28.2-19.9-35.4-6.3-3.8-13.7-6-21.6-6-22.9,0-41.5,18.6-41.5,41.5,0,15,8,28.2,20,35.5,6.3,3.8,13.6,6,21.5,6,22.9-.1,41.5-18.7,41.5-41.6Z"/>
+    <path class="st2" d="M203.42,348.65c2.4,4.6,5.6,8.5,9.5,8.5.8,0,1.6-.2,2.5-.5,4-1.6,4.2-8.6,3.2-15.3-5.8,1.9-10.8,4.7-15.2,7.3Z"/>
+    <path class="st2" d="M247.32,304.05s-7,16-26.2,19c-5,.8-9.3,1.1-12.9,1.1-10.3,0-15.3-2.7-17.8-5.6,0,0-18.4,5.3-20,16.6-1.2,8.5,7.2,12.8,14.6,12.8,2.5,0,4.9-.5,6.7-1.5,7.4-4,18.4-12.6,33.2-14.5,1.3-.2,3.2-.2,5.4-.2,5,0,11.9.3,18.6.3,7.6,0,14.9-.4,18.9-2.2,9.1-4,9.1-10.7,8.5-14.1-.6-3.8-6.1-11.5-29-11.7h0Z"/>
+    <path class="st2" d="M243.32,339.75c-1.7,0-3.5,0-5.2-.1-2.9-.1-5.5-.1-7.8-.1-1.8,0-3.2,0-4.3.2,1.7,6.1,3.9,12,6.2,12.9.7.2,1.8.5,3.2.5,3.7,0,8.8-1.8,8.1-10.4-.1-.9-.1-1.9-.2-3Z"/>
+  </g>
+  <path class="st0" d="M82.62,168.35s-.2-.9-.5-2.4-.7-3.7-1.2-6.2c-.2-1.2-.4-2.6-.5-3.9-.1-1.3-.1-2.8.2-3.8.1-.5.3-.9.5-1.1.2-.2.3-.2.6-.3h.2l.3-.1c.1,0,0,.1,0,.1h-.2.2c.3.1.8.4,1.3.7,1,.7,2.1,1.9,3.1,3.1,1,1.2,2,2.5,2.9,3.7,1.9,2.5,3.6,5,5.1,7.1s2.8,3.9,3.8,5.1c.9,1.2,1.5,1.9,1.5,1.9,0,0,0-.2-.1-.6-.1-.4-.1-1-.3-1.8-.3-1.5-.8-3.7-1.6-6.3-.8-2.5-2-5.5-3.6-8.5-.8-1.5-1.7-3-2.8-4.5s-2.4-3-4.1-4.3c-.9-.7-2-1.3-3.3-1.7-.4-.1-.7-.2-1.1-.2h-1.5c-.2,0-.6.1-.7.1l-.3.1-.3.1-.4.1-.1.1-.2.1c-1.3.5-2.5,1.6-3.2,2.8s-1,2.4-1.1,3.5c-.2,2.2.2,3.9.7,5.5s1.1,3,1.7,4.2c1.2,2.5,2.5,4.3,3.5,5.5.5.6.9,1.1,1.2,1.4.1.3.3.5.3.5h0Z"/>
+  <path class="st0" d="M329.72,97.75l-.3-.5-.4-.5c-.4-.6-1.9-1.6-2-1.6l-.2-.1h-.1l-.3-.1h-.1l-.4-.1-.8-.3c-.6-.2-1.2-.3-1.8-.4s-1.3-.1-1.9-.1-1.3.1-1.9.2c-2.5.4-4.8,1.7-6.5,3.2s-3,3.1-4.1,4.8c-2.1,3.3-3.3,6.7-4.1,9.6s-1.1,5.3-1.2,7.1c-.1.9-.1,1.5-.1,2v.7s.5-.9,1.3-2.4,2-3.6,3.4-6,3.2-5.2,5.2-7.7c1-1.2,2.2-2.4,3.4-3.3s2.5-1.5,3.7-1.7c.3,0,.6-.1.9-.1s.6,0,1,.1c.3.1.7.1,1,.2l.8.2.3.1h.1s.1.1.1.2c.2.3.3.9.4,1.6.1,1.4-.1,3-.3,4.5-.3,1.5-.6,3-.9,4.4-.6,2.7-1.3,5.1-1.7,6.7s-.6,2.6-.6,2.6c0,0,.7-.7,1.8-2.1,1.1-1.3,2.5-3.3,4-6,.7-1.3,1.4-2.8,2.1-4.4.6-1.7,1.2-3.5,1.4-5.7.1-1.1,0-2.4-.4-3.8-.4-.6-.6-1-.8-1.3h0Z"/>
+  <path class="st0" d="M106.52,267.35c0-22.9,18.6-41.5,41.5-41.5,7.9,0,15.2,2.2,21.5,6-6.3-3.8-13.7-6-21.6-6-22.9,0-41.5,18.6-41.4,41.5-.1,15,7.9,28.2,19.9,35.4-11.9-7.2-19.9-20.4-19.9-35.4h0Z"/>
+  <path class="st0" d="M255.02,272.95c-11.9-7.3-19.9-20.4-19.9-35.4,0-22.9,18.6-41.5,41.5-41.5,7.9,0,15.2,2.2,21.5,6-6.3-3.8-13.7-6-21.6-6-22.9,0-41.5,18.6-41.5,41.5,0,14.9,8,28.1,20,35.4h0Z"/>
+  <path class="st3" d="M146.02,448.25c-7.1,1.6-28,13-46.1,16.4s-33.7,5.3-39.2,7.3-9.7,6.1,1,10.1c10.8,4.1,62.9,5.5,67.6,0s-3.2-7.9-14.6-7.7c-8.1.1-7.1-2.7-7.1-3,0,0,.5-3.6,13-5.3,12.5-1.7,67.6-6.9,66.5-12.8-1-5.8-34-6.6-41.1-5h0Z"/>
+  <ellipse class="st3" cx="110.22" cy="491.58" rx="10.8" ry="3.1" transform="translate(-102.03 34.69) rotate(-12.28)"/>
+  <ellipse class="st3" cx="85.19" cy="490.26" rx="11.4" ry="3" transform="translate(-38.62 8.3) rotate(-4.55)"/>
+  <ellipse class="st3" cx="65.25" cy="487.75" rx="7.6" ry="2.4" transform="translate(-65.26 13.28) rotate(-7.76)"/>
+  <ellipse class="st3" cx="50.5" cy="485.46" rx="7.4" ry="1.9" transform="translate(-69.22 12.29) rotate(-8.26)"/>
+  <ellipse class="st3" cx="47.11" cy="481.37" rx="7.4" ry="1.9" transform="translate(-68.67 11.76) rotate(-8.26)"/>
+  <ellipse class="st3" cx="46.3" cy="476.67" rx="6.4" ry="1.7" transform="translate(-68 11.6) rotate(-8.26)"/>
+  <path class="st3" d="M254.32,453.95c-12.4.6-40.4-.8-44.2,5.7-3.9,6.5,11.4,8.9,35.3,6.9,23.9-2,57.8-4.7,59.2-12s-6.3-5.9-7.1-10.5c-.8-4.7,8.5-4.7,10.3-11.6s-12.6-6.1-25.4-6.1-34.1,1.2-36.1,7.9c-2,6.7,9.7,6.7,18.1,8.3,8.3,1.6,5.9,4.7,5.9,4.7-.4,4.3-3.6,6.1-16,6.7Z"/>
+  <ellipse class="st3" cx="221.22" cy="471.75" rx="10.7" ry="3.5"/>
+  <ellipse class="st3" cx="248.82" cy="470.95" rx="7.2" ry="3.2"/>
+  <ellipse class="st3" cx="271.12" cy="468.75" rx="7.8" ry="2.6"/>
+  <ellipse class="st3" cx="288.32" cy="465.85" rx="5.7" ry="2.7"/>
+  <ellipse class="st3" cx="303.22" cy="462.65" rx="5.8" ry="2.7"/>
+  <path class="st3" d="M50.92,387.85c0,3.5,7.5,6.7,20.9,9.6-1-6.9-.4-13.9.5-19.4-13.7,3-21.4,6.3-21.4,9.8Z"/>
+  <path class="st3" d="M446.32,378.95c-.2.6-.4,1.1-.7,1.7-1.6,3.9-4,7.3-7,10.1-6.1,5.7-11.4,9.2-16.1,10.4,26.2-3.7,41.7-8.3,41.7-13.2.1-3.3-6.3-6.3-17.9-9Z"/>
+  <path class="st3" d="M96.62,415.75c9.7,0,16.6-5.3,21.4-12.2-5.5-12.8-14.5-34.2-23.1-56.9-2.3,2-5,5-7.9,9.5-7.2,11.2-13.2,37.3-5.7,51,3.1,5.8,8.1,8.6,15.3,8.6Z"/>
+  <path class="st3" d="M440.02,351.15c-5.7-14.8-17.8-25.2-29.5-25.5h-.4s-2.3-.3-5.3-.3c-6.3,0-14.1,1.4-15.2,7.8-.7,4.5,1.2,6.8,5.4,11.1,4.7,5,11.2,11.8,13.2,26,2.2,16.3,6.2,24.6,11.8,24.6h0c2.6,0,7.4-1.6,15.3-9.1,9.7-9.2,8.8-23.9,4.7-34.6Z"/>
+  <circle class="st3" cx="144.32" cy="281.95" r="13.1"/>
+  <circle class="st3" cx="271.02" cy="251.35" r="13.1"/>
+  <path class="st3" d="M108.32,201.15c-1.4-.3-2.3-.4-2.6-.4-5.5.3-10.6-3.5-11.6-9.1-.1-.6-.1-1.1-.2-1.7-3,1.7-6,3.5-8.8,5.5l-5,3.5-3.7-4.8c-1.1-1.5-6.2-8.4-10.9-17.5-8.9,4.2-15.8,8.8-17.5,13.1-.3.8-.2,1.3.1,1.7,1.5,2.1,10.1,8.6,60.2,9.7Z"/>
+  <path class="st3" d="M345.32,119.15c-1.7,9.9-4.9,20.8-7,23.8l-2,2.8c9-4.4,17.1-8.6,23.9-12.4,23.7-13.3,26.7-19.1,27-20.6.2-1,0-1.3-.1-1.4-.3-.3-1.9-1.9-9.4-1.9-8.2,0-19.7,1.9-31.6,4.5-.2,1.6-.5,3.3-.8,5.2h0Z"/>
+  <path class="st3" d="M336.12,145.85l-3.4-.3c-.1,0-6.3-.5-14.9-.5s-20.5.5-30.1,2.8c1.8,3.8,1.4,8.5-1.5,11.9-2.3,2.8-6.3,7.5-11.1,12.9,8.4-3.4,17.1-7.1,25.8-10.8,12.9-5.5,24.7-11,35.2-16h0Z"/>
+  <path class="st3" d="M108.82,135.85c10.2,2.8,21.7,4.2,34.3,4.2,48.8,0,102.4-21.1,123.3-30.2l1.3-.6c-.2-3.1.1-6.5.8-9.9,1.3-6.1,4-11.2,7.2-14.6-.6-2.3-1.1-4-1.5-4.9-6.9-3.7-64.2-25-94.1-25-3,0-5.6.2-7.7.7-26.5,5.4-66.7,51.4-68.1,57.9-.4,2.8-.3,11.7,0,21.2l4.5,1.2h0Z"/>
+  <path class="st3" d="M212.32,186.95c4.4-2.8,10-2.1,13.6,1.3.6-.1,1.5-.3,2.9-1,5.5-2.6,25.3-23.7,40.3-41.8.5-.7,1.1-1.2,1.8-1.7-34.3,14.8-82.3,31.1-128,31.1-7.3,0-14.3-.4-20.8-1.3l1,3-5.7,2.2s-1,.4-2.7,1.1c7.4,1.7,17.3,5.1,29.8,10.1,22.9,9.2,31.6,9.6,33.8,9.5,3.1-1.6,6.9-1.7,10.1-.1,5.9-.4,10.5-.7,13.3-1,1.3-.1,3.1-.5,5.5-1.1-.3-4.1,1.5-8,5.1-10.3h0Z"/>
+  <path class="st3" d="M268.92,115.65c-.7.3-1.4.6-2.1.9-.2.1-.3.1-.5.2-.7.3-1.4.6-2.2.9-.1.1-.3.1-.4.2-.7.3-1.4.6-2.1.9-.1.1-.3.1-.4.2-.8.3-1.6.7-2.4,1-.2.1-.4.1-.5.2-.9.3-1.7.7-2.6,1h0c-.9.4-1.8.7-2.7,1.1-.2.1-.4.2-.6.2-.9.4-1.9.7-2.8,1.1-.1.1-.3.1-.4.2-.9.3-1.8.7-2.7,1-.2.1-.3.1-.5.2-1,.4-2,.7-3,1.1-.2.1-.4.2-.6.2-1,.4-2.1.7-3.1,1.1h-.1c-1.1.4-2.2.8-3.3,1.1-.2.1-.5.2-.7.2-1.1.4-2.2.8-3.3,1.1-.1,0-.3.1-.5.1-1,.3-2.1.7-3.1,1-.2.1-.4.1-.6.2-1.1.4-2.3.7-3.5,1.1-.2.1-.5.1-.7.2-1.1.4-2.3.7-3.5,1.1-.07,0-.13.03-.2.1-1.2.4-2.4.7-3.7,1.1-.3.1-.5.2-.8.2-1.2.4-2.5.7-3.7,1-.2,0-.3.1-.5.1-1.2.3-2.3.6-3.5.9-.2.1-.5.1-.7.2-1.3.3-2.5.6-3.8,1-.3.1-.5.1-.8.2-1.2.3-2.5.6-3.7.9-.1,0-.2.1-.3.1-1.3.3-2.6.6-3.9.9-.3.1-.6.1-.9.2-1.3.3-2.6.6-4,.8-.2,0-.3.1-.5.1-1.2.2-2.5.5-3.7.7-.3,0-.5.1-.8.1-1.3.2-2.6.5-4,.7-.3,0-.5.1-.8.1-1.3.2-2.5.4-3.8.6-.1,0-.3,0-.4.1-1.3.2-2.7.4-4.1.6-.3,0-.6.1-.9.1-1.4.2-2.7.3-4.1.5h-.4c-1.3.1-2.5.3-3.8.4-.3,0-.5.1-.8.1-1.3.1-2.7.2-4,.3-.3,0-.5,0-.8.1-1.3.1-2.5.2-3.8.2h-.5c-1.4.1-2.7.1-4,.2h-.9c-1.4,0-2.7.1-4.1.1h-.4c-1.3,0-2.6,0-3.9-.1h-.8c-1.3,0-2.7-.1-4-.2h-.8c-1.3-.1-2.6-.2-3.8-.3h-.3c-1.3-.1-2.7-.3-4-.4-.3,0-.6-.1-.9-.1-1.3-.2-2.6-.3-3.9-.5-.2,0-.4-.1-.5-.1-1.2-.2-2.4-.4-3.6-.6-.2,0-.5-.1-.7-.1-1.3-.2-2.5-.5-3.8-.8-.3-.1-.5-.1-.8-.2-1.3-.3-2.6-.6-3.9-1h0c1.2,1.8,2.4,3.7,3.5,5.8,4.2,7.4,7.3,14.8,9,19.1.7.1,1.5.2,2.3.3.3,0,.5.1.8.1.5.1,1.1.1,1.7.2.3,0,.6.1,1,.1.5.1,1.1.1,1.7.2.4,0,.7.1,1.1.1.6,0,1.1.1,1.7.1.4,0,.8.1,1.3.1.6,0,1.1.1,1.7.1.4,0,.9,0,1.4.1.6,0,1.1.1,1.7.1h1.5c.6,0,1.2,0,1.8.1h7.5c.9,0,1.7,0,2.6-.1h1.1c.9,0,1.9-.1,2.8-.1h.7c1.2-.1,2.4-.1,3.7-.2.3,0,.6,0,.9-.1,1-.1,2-.2,2.9-.2.4,0,.8-.1,1.2-.1,1.1-.1,2.2-.2,3.3-.3.3,0,.5-.1.8-.1,1.3-.2,2.7-.3,4.1-.5.4,0,.7-.1,1.1-.1,1.1-.1,2.2-.3,3.3-.5.4-.1.9-.1,1.3-.2,1.2-.2,2.5-.4,3.7-.6.3,0,.5-.1.8-.1,1.5-.3,3-.5,4.6-.8.4-.1.8-.2,1.2-.2,1.2-.2,2.4-.5,3.6-.7.5-.1,1-.2,1.5-.3,1.4-.3,2.8-.6,4.2-.9.2-.1.5-.1.7-.2,1.6-.4,3.3-.8,5-1.2.5-.1.9-.2,1.4-.4,1.3-.3,2.6-.6,3.9-1,.5-.1,1.1-.3,1.6-.4,1.6-.4,3.1-.8,4.8-1.3.2-.1.4-.1.6-.2,1.8-.5,3.6-1,5.5-1.6.5-.2,1-.3,1.6-.5,1.4-.4,2.8-.9,4.2-1.3.6-.2,1.2-.4,1.7-.6,1.8-.6,3.5-1.2,5.3-1.8.2-.1.3-.1.5-.2,2-.7,3.9-1.4,5.9-2.1.6-.2,1.2-.4,1.7-.6,1.5-.5,3-1.1,4.6-1.7.6-.2,1.2-.5,1.9-.7,2-.7,4-1.5,6-2.3.1,0,.2-.1.3-.1,2.1-.8,4.3-1.7,6.4-2.6.6-.3,1.3-.5,1.9-.8,1.6-.7,3.3-1.4,4.9-2.1.7-.3,1.3-.6,2-.8,2.2-1,4.5-2,6.7-3,.9-3,2.2-6.7,3.8-10.8h-.4c-.6,0-1.3-.1-1.9-.2-3.7-.5-6.5-3.5-8-8h0Z"/>
+  <path class="st1" d="M143.22,146.35h-.4.4s-.05,0,0,0Z"/>
+  <polygon class="st2" points="80.12 125.75 80.12 125.75 80.12 128.95 80.12 125.75"/>
+  <path class="st3" d="M286.42,80.45c3.9.9,6.8,4.1,8.3,9.2.2.8.4,1.7.6,2.6,8.9-12.5,18.6-18.9,29-18.9,4.4,0,8.2,1,11.4,3,5.5-6.7,8.9-11.2,8.9-11.2-4.1.7-12.7,1.9-12.7,1.9,32.5-12,29.9-44.5,29.9-44.5,0,5.6-16.8,19.1-16.8,19.1.7-4.9-1.9-11.2-1.9-11.2.7,6.4-19.4,22.8-19.4,22.8,1.5-3,.4-8.2.4-8.2-1.1,6-10.1,8.2-10.1,8.2,5.6-6.7,16.1-42.2,8.2-44.5-7.8-2.2-18.7,23.2-18.7,23.2-.4-6-3.7-6-3.7-6,1.5,18.7-13.5,33.6-13.5,33.6-1.1-3.7-7.1-5.6-7.1-5.6,1.4,3,.6,13.8-.2,21.5-.3,3-.6,5.5-.8,6.9,2-1.4,4.1-2.2,6.2-2.2.7.1,1.4.2,2,.3h0Z"/>
+  <path class="st3" d="M278.22,117.75c1.2.3,2.7-.4,4.2-1.8,1-2.3,2-4.6,3.2-7,1-2.2,2.1-4.2,3.2-6.2.8-4.1.7-8.2-.2-11.3-.8-2.7-2.1-4.5-3.5-4.8-.2,0-.4-.1-.5-.1-3.2,0-8,5.6-9.8,14-1,4.4-1,8.9,0,12.3.6,2.7,2,4.5,3.4,4.9h0Z"/>
+  <path class="st2" d="M324.62,100.75h-.1.1s-.05,0,0,0,.05,0,0,0h0Z"/>
+  <path class="st3" d="M324.22,79.75c-25.1,0-41.2,51.3-44.3,62,.9.2,1.8.5,2.6.9,10.8-3.2,24.7-4,35.3-4,8.9,0,15.4.5,15.4.5,2.8-3.9,19-59.4-9-59.4ZM330.62,102.55c-.2,2.2-.8,4-1.4,5.7-.6,1.6-1.4,3.1-2.1,4.4-1.4,2.6-2.9,4.6-4,6s-1.8,2.1-1.8,2.1c0,0,.2-1,.6-2.6.4-1.7,1-4,1.7-6.7.3-1.4.6-2.8.9-4.4.3-1.5.4-3.1.3-4.5-.1-.7-.2-1.3-.4-1.6,0-.1-.1-.1-.1-.2h0l-.3-.1-.8-.2c-.3-.1-.7-.1-1-.2s-.6,0-1-.1c-.3,0-.6.1-.9.1-1.2.2-2.5.8-3.7,1.7-1.2.9-2.4,2.1-3.4,3.3-2.1,2.5-3.8,5.3-5.2,7.7-1.4,2.4-2.6,4.5-3.4,6s-1.3,2.4-1.3,2.4v-.7c0-.5,0-1.1.1-2,.1-1.7.5-4.2,1.2-7.1.8-2.9,2-6.2,4.1-9.6,1.1-1.7,2.4-3.3,4.1-4.8s4-2.7,6.5-3.2c.6-.1,1.3-.1,1.9-.2.6,0,1.3,0,1.9.1s1.2.2,1.8.4l.8.3.4.1h.1l.3.1h.1l.2.1c.1,0,1.6,1,2,1.6l.4.5.3.5c.2.4.4.7.5,1.1.7,1.7.7,2.9.6,4h0Z"/>
+  <path class="st2" d="M324.52,100.65s-.05,0,0,0,.05,0,0,0h0c0,.1,0,0,0,0Z"/>
+  <path class="st3" d="M324.52,100.75h0Z"/>
+  <path class="st3" d="M225.32,203.85c3,0,6.4-.8,9.9-2.4,7.4-3.3,25.4-21.4,45.9-46,.7-.9,1.1-2,1-3.2s-.7-2.2-1.6-3c-1-.8-2.1-1-2.8-1-1.3,0-2.5.6-3.4,1.6-8.9,10.7-34,39.5-42.6,43.6l-.1.1c-1.7.8-3.2,1.2-4.6,1.5l-3.3.5-2.4-2.3c-.8-.8-1.9-1.2-3-1.2-.8,0-1.6.2-2.3.7-1,.6-1.7,1.6-1.9,2.8-.3,1.1,0,2.3.6,3.3.2.4,3.4,5,10.6,5h0Z"/>
+  <path class="st3" d="M183.52,204.85c-.7,0-1.4.2-2.1.5l-1.3.7-1.5.1h-1.1c-4.1,0-14.2-1.3-35.7-10-23.7-9.6-33-11-36.5-11-.7,0-1.1.1-1.2.1-1.2.2-2.2.9-2.8,1.8-.7,1-.9,2.1-.7,3.3.4,2.1,2.2,3.6,4.3,3.6h1.3c2.6.2,11,1.7,32.5,10.3,17.4,7,30.5,10.6,39.1,10.6,4.5,0,7.6-1,9.1-2.9.7-.9,1.1-2,1-3.2s-.7-2.2-1.6-3c-1-.7-2.1-.9-2.8-.9h0Z"/>
+  <path class="st3" d="M115.12,172.85s-14.9-43.9-35.1-43.9c-2.6,0-5.3.7-8.1,2.4-24.1,14.6,9.5,58.9,9.5,58.9,14.7-10.1,33.7-17.4,33.7-17.4h0ZM77.52,160.95c-.6-1.2-1.2-2.6-1.7-4.2-.4-1.6-.9-3.4-.7-5.5.1-1.1.4-2.3,1.1-3.5s2-2.3,3.2-2.8l.2-.1.1-.1.4-.1.3-.1.3-.1c.1,0,.5-.1.7-.1h1.5c.4.1.7.1,1.1.2,1.4.4,2.4,1,3.3,1.7,1.8,1.4,3,2.8,4.1,4.3s2,3,2.8,4.5c1.6,3,2.8,5.9,3.6,8.5.8,2.5,1.3,4.7,1.6,6.3.2.8.2,1.4.3,1.8,0,.4.1.6.1.6,0,0-.6-.7-1.5-1.9s-2.3-3-3.8-5.1-3.2-4.6-5.1-7.1c-.9-1.3-1.9-2.5-2.9-3.7s-2.1-2.3-3.1-3.1c-.5-.4-1-.6-1.3-.7h-.2.2s.1-.1,0-.1l-.3.1h-.2c-.3.1-.4.2-.6.3-.2.2-.4.6-.5,1.1-.3,1-.3,2.5-.2,3.8.1,1.4.3,2.7.5,3.9.4,2.5.9,4.6,1.2,6.2.3,1.5.5,2.4.5,2.4,0,0-.2-.2-.4-.5-.3-.3-.7-.8-1.2-1.4-.9-1.2-2.2-3.1-3.4-5.5h0Z"/>
+  <g>
+    <path class="st0" d="M189.42,267.25c0-15-8-28.1-19.9-35.4-6.3-3.8-13.7-6-21.6-6-22.9,0-41.5,18.6-41.5,41.5,0,15.1,8,28.2,20,35.5,6.3,3.8,13.7,6,21.5,5.9,22.9,0,41.5-18.6,41.5-41.5Z"/>
+    <path class="st0" d="M247.62,296.25h-5.2l-2,4.7c-.4.7-5.9,12.2-20.3,14.5-4.4.7-8.3,1-11.7,1-9,0-11.4-2.3-11.8-2.8l-3.3-3.9-4.9,1.4c-2.4.7-23.4,7.1-25.6,23-.7,5.2.7,10.2,4.1,14.1,4.1,4.8,10.9,7.6,18.2,7.6,3.8,0,7.4-.8,10.4-2.4.5-.3,1.1-.7,1.7-1,4.3,7.9,9.6,12.1,15.7,12.1,1.8,0,3.5-.4,5.2-1.1,3.3-1.4,5.6-4,6.9-7.7,1.4,1.8,2.9,2.9,4.7,3.6,1.6.6,3.7.9,5.7.9,4.5,0,8.5-1.6,11.3-4.6,3.1-3.3,4.4-7.8,4-13.5,0-.6-.1-1.4-.1-2.3,9.9-.1,16.1-.9,20.4-2.8,9.9-4.3,14.8-12.8,13.4-22.6-.8-4.2-5.6-17.9-36.8-18.2h0Z"/>
+    <path class="st0" d="M298.12,201.95c-6.3-3.8-13.7-6-21.6-6-22.9,0-41.5,18.6-41.5,41.5,0,15.1,8,28.2,20,35.5,6.3,3.8,13.6,6,21.5,6,22.9,0,41.5-18.6,41.5-41.6,0-15-8-28.1-19.9-35.4h0Z"/>
+    <path class="st3" d="M401.82,371.35v-.2c-1.7-12.2-6.9-17.7-11.5-22.5-4.3-4.5-8.3-8.8-7-16.6,1.2-7.2,6.9-11.7,16.3-12.8-5.7-38.5-14-87.1-24.8-128.5-5.4-20.7-13.8-35.1-25.2-44.6-13,6.7-28.6,14-46.1,21.5-12.6,5.5-25.6,10.8-38,15.7-10,10.7-20.9,21.2-27.5,24.3-4.8,2.1-9,3-12.7,3-8,0-13.3-4-15.9-7.5-3,.8-5.4,1.3-7.1,1.5-2,.2-4.8.5-8.4.7,1.4,3.6.8,7.9-1.8,11.1-2.9,3.5-7.6,5.3-14.3,5.3-9.6,0-23.3-3.7-41.6-11.1-2.7-1.1-5.2-2.1-7.4-2.9h-4.2c-17.5,0-31.1-.5-41.8-1.4-11.7,24.3-6.6,51.2-2.3,73.4,4.1,21.3,18.4,59.2,31.6,91.8,4.9,12.1,9.7,23.4,13.7,32.9,35.8,3.2,81.8,5.1,131.9,5.1,59.6,0,113.3-2.7,151.1-7-3-11.4-6.4-27.2-7-31.2h0ZM194.82,298.85v-.8c.1-.2.1-.3.1-.5v-.2c.1-.2.1-.5.2-.7,0-.2.1-.5.2-.7,0-.1.1-.1.1-.2,0-.2.1-.3.2-.5,0,0,.1-.1.1-.2.1-.1.2-.3.3-.5,0-.1.1-.1.1-.2.2-.2.3-.5.5-.7.1-.2.3-.5.5-.7.07-.07.13-.13.2-.2.1-.2.2-.3.4-.5l.2-.2.5-.5s0-.1.1-.1c.5-.4,1-.9,1.5-1.3.07-.07.13-.13.2-.2.2-.2.4-.3.6-.5,0-.1.1-.1.2-.2.2-.2.5-.3.7-.5.1,0,.1-.1.2-.1.4-.2.7-.4,1-.6s.7-.4,1.1-.6c0,0,.1-.1.2-.1.8-.4,1.6-.7,2.5-1.1.1,0,.2-.1.3-.1.4-.2.8-.3,1.3-.5.5-.1.9-.3,1.4-.4.1,0,.2-.1.3-.1.4-.1.9-.3,1.4-.4.4-.1.9-.2,1.4-.3.2,0,.3-.1.4-.1.5-.1,1-.2,1.5-.3.5-.1,1.1-.1,1.6-.2s1.1-.2,1.7-.2h.6c.3-.1.7-.1,1.1-.1h4.1c.3,0,.6.1.9.1.5.1.9.1,1.3.2.2,0,.5.1.7.1.3.1.6.1.9.2.2,0,.3.1.5.1.3,0,.6.1.9.2.1,0,.3.1.4.1.3.1.6.2.9.3.1,0,.2.1.3.1,1.9.6,3.5,1.5,4.8,2.5.3.2.6.4.8.6.3.3.5.6.8.9l.3.3c0,.1.1.2.2.3.2.3.4.5.5.8.4.7.7,1.5.8,2.3.1.4.1.9.1,1.3-.1,6.2-8,12.3-18.6,14.5-.3.1-.5.2-.8.2-.2,0-.5.1-.7.1-11.5,1.9-21.7-1.5-23.6-7.9-.1-.3-.2-.7-.3-1.1-.1-.2-.1-.5-.1-.7v-.2h0ZM126.42,302.85c-12-7.3-20-20.4-20-35.5,0-22.9,18.6-41.5,41.5-41.5,7.9,0,15.3,2.2,21.6,6,11.9,7.3,19.9,20.4,19.9,35.4,0,22.9-18.6,41.5-41.5,41.5-7.8.1-15.2-2.1-21.5-5.9ZM271.02,337.05c-4.3,1.9-10.5,2.7-20.4,2.8,0,.9.1,1.7.1,2.3.4,5.7-.9,10.2-4,13.5-2.8,3-6.8,4.6-11.3,4.6-2,0-4.1-.3-5.7-.9-1.8-.7-3.3-1.8-4.7-3.6-1.3,3.7-3.6,6.3-6.9,7.7-1.7.7-3.4,1.1-5.2,1.1-6.1,0-11.4-4.2-15.7-12.1-.6.3-1.2.7-1.7,1-3,1.6-6.6,2.4-10.4,2.4-7.3,0-14.1-2.8-18.2-7.6-3.4-3.9-4.8-8.9-4.1-14.1,2.2-15.9,23.2-22.3,25.6-23l4.9-1.4,3.3,3.9c.4.5,2.8,2.8,11.8,2.8,3.4,0,7.3-.3,11.7-1,14.4-2.3,19.9-13.8,20.3-14.5l2-4.7h5.2c31.2.3,36,14,36.8,18.2,1.4,9.8-3.5,18.3-13.4,22.6h0ZM276.52,278.95c-7.9,0-15.2-2.2-21.5-6-12-7.3-20-20.4-20-35.5,0-22.9,18.6-41.5,41.5-41.5,7.9,0,15.3,2.2,21.6,6,11.9,7.3,19.9,20.4,19.9,35.4,0,23-18.6,41.6-41.5,41.6Z"/>
+  </g>
+  <path class="st3" d="M212.92,357.15c.8,0,1.6-.2,2.5-.5,4-1.6,4.2-8.6,3.2-15.3-5.7,1.8-10.8,4.7-15.2,7.3,2.4,4.6,5.6,8.5,9.5,8.5Z"/>
+  <path class="st3" d="M232.22,352.55c.7.2,1.8.5,3.2.5,3.7,0,8.8-1.8,8.1-10.4-.1-.8-.1-1.8-.1-2.9-1.7,0-3.5,0-5.2-.1-2.9-.1-5.5-.1-7.8-.1-1.8,0-3.2,0-4.3.2,1.6,6,3.8,11.9,6.1,12.8Z"/>
+  <path class="st3" d="M247.32,304.05s-7,16-26.2,19c-5,.8-9.3,1.1-12.9,1.1-10.3,0-15.3-2.7-17.8-5.6,0,0-18.4,5.3-20,16.6-1.2,8.5,7.2,12.8,14.6,12.8,2.5,0,4.9-.5,6.7-1.5,7.4-4,18.4-12.6,33.2-14.5,1.3-.2,3.2-.2,5.4-.2,5,0,11.9.3,18.6.3,7.6,0,14.9-.4,18.9-2.2,9.1-4,9.1-10.7,8.5-14.1-.6-3.8-6.1-11.5-29-11.7h0Z"/>
+</svg>
\ No newline at end of file
diff --git a/packages/manager/src/App.tsx b/packages/manager/src/App.tsx
index ace9e20e6e7..cac1e8d2b6c 100644
--- a/packages/manager/src/App.tsx
+++ b/packages/manager/src/App.tsx
@@ -20,6 +20,9 @@ export const App = withDocumentTitleProvider(
       window.location.pathname === '/oauth/callback' ||
       window.location.pathname === '/admin/callback';
 
+    const { isLoading } = useInitialRequests();
+    const { areFeatureFlagsLoading } = useSetupFeatureFlags();
+
     if (isAuthCallback) {
       return (
         <ErrorBoundaryFallback>
@@ -29,9 +32,6 @@ export const App = withDocumentTitleProvider(
       );
     }
 
-    const { isLoading } = useInitialRequests();
-    const { areFeatureFlagsLoading } = useSetupFeatureFlags();
-
     if (isLoading || areFeatureFlagsLoading) {
       return <SplashScreen />;
     }
diff --git a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
index 03aa8db3ff5..e618d8103a0 100644
--- a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
+++ b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
@@ -40,7 +40,6 @@ export type NavEntity =
   | 'Cloud Load Balancers'
   | 'Dashboard'
   | 'Databases'
-  | 'Delivery'
   | 'Domains'
   | 'Firewalls'
   | 'Help & Support'
@@ -49,6 +48,7 @@ export type NavEntity =
   | 'Kubernetes'
   | 'Linodes'
   | 'Login History'
+  | 'Logs'
   | 'Longview'
   | 'Maintenance'
   | 'Managed'
@@ -240,7 +240,7 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
                 to: '/longview',
               },
               {
-                display: 'Delivery',
+                display: 'Logs',
                 hide: !flags.aclpLogs?.enabled,
                 to: '/logs/delivery',
                 isBeta: flags.aclpLogs?.beta,
diff --git a/packages/manager/src/dev-tools/FeatureFlagTool.tsx b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
index d3e9336f14c..4b22c2b28a3 100644
--- a/packages/manager/src/dev-tools/FeatureFlagTool.tsx
+++ b/packages/manager/src/dev-tools/FeatureFlagTool.tsx
@@ -54,6 +54,7 @@ const options: { flag: keyof Flags; label: string }[] = [
   },
   { flag: 'apicliButtonCopy', label: 'APICLI Button Copy' },
   { flag: 'iam', label: 'Identity and Access Beta' },
+  { flag: 'iamDelegation', label: 'IAM Delegation (Parent/Child)' },
   { flag: 'iamRbacPrimaryNavChanges', label: 'IAM Primary Nav Changes' },
   {
     flag: 'linodeCloneFirewall',
diff --git a/packages/manager/src/dev-tools/load.ts b/packages/manager/src/dev-tools/load.ts
index 489e4989c09..eb6079b3e23 100644
--- a/packages/manager/src/dev-tools/load.ts
+++ b/packages/manager/src/dev-tools/load.ts
@@ -79,6 +79,14 @@ export async function loadDevTools() {
     // Merge the contexts
     const mergedContext: MockState = {
       ...initialContext,
+      childAccounts: [
+        ...initialContext.childAccounts,
+        ...(seedContext?.childAccounts || []),
+      ],
+      delegations: [
+        ...initialContext.delegations,
+        ...(seedContext?.delegations || []),
+      ],
       domains: [...initialContext.domains, ...(seedContext?.domains || [])],
       eventQueue: [
         ...initialContext.eventQueue,
@@ -92,6 +100,7 @@ export async function loadDevTools() {
         ...initialContext.firewalls,
         ...(seedContext?.firewalls || []),
       ],
+      entities: [...initialContext.entities, ...(seedContext?.entities || [])],
       kubernetesClusters: [
         ...initialContext.kubernetesClusters,
         ...(seedContext?.kubernetesClusters || []),
diff --git a/packages/manager/src/factories/cloudpulse/services.ts b/packages/manager/src/factories/cloudpulse/services.ts
index 6e9c00f9eda..b794146457a 100644
--- a/packages/manager/src/factories/cloudpulse/services.ts
+++ b/packages/manager/src/factories/cloudpulse/services.ts
@@ -8,6 +8,7 @@ const serviceTypes: CloudPulseServiceType[] = [
   'nodebalancer',
   'dbaas',
   'firewall',
+  'objectstorage',
 ];
 
 export const serviceAlertFactory = Factory.Sync.makeFactory<ServiceAlert>({
diff --git a/packages/manager/src/factories/delivery.ts b/packages/manager/src/factories/delivery.ts
index 3fbb843b8df..da8c1f2400b 100644
--- a/packages/manager/src/factories/delivery.ts
+++ b/packages/manager/src/factories/delivery.ts
@@ -27,7 +27,7 @@ export const streamFactory = Factory.Sync.makeFactory<Stream>({
   destinations: Factory.each(() => [
     { ...destinationFactory.build(), id: 123 },
   ]),
-  details: {},
+  details: null,
   updated: '2025-07-30',
   updated_by: 'username',
   id: Factory.each((id) => id),
diff --git a/packages/manager/src/featureFlags.ts b/packages/manager/src/featureFlags.ts
index 743afea1d6e..96e3c77ae00 100644
--- a/packages/manager/src/featureFlags.ts
+++ b/packages/manager/src/featureFlags.ts
@@ -175,6 +175,7 @@ export interface Flags {
   gecko2: GeckoFeatureFlag;
   gpuv2: GpuV2;
   iam: BetaFeatureFlag;
+  iamDelegation: BaseFeatureFlag;
   iamRbacPrimaryNavChanges: boolean;
   ipv6Sharing: boolean;
   kubernetesBlackwellPlans: boolean;
@@ -182,7 +183,6 @@ export interface Flags {
   linodeCloneFirewall: boolean;
   linodeDiskEncryption: boolean;
   linodeInterfaces: LinodeInterfacesFlag;
-  lkeEnterprise: LkeEnterpriseFlag;
   lkeEnterprise2: LkeEnterpriseFlag;
   mainContentBanner: MainContentBanner;
   marketplaceAppOverrides: MarketplaceAppOverride[];
diff --git a/packages/manager/src/features/Account/SwitchAccountDrawer.tsx b/packages/manager/src/features/Account/SwitchAccountDrawer.tsx
index 33f245d5403..0bdf4754103 100644
--- a/packages/manager/src/features/Account/SwitchAccountDrawer.tsx
+++ b/packages/manager/src/features/Account/SwitchAccountDrawer.tsx
@@ -42,7 +42,7 @@ export const SwitchAccountDrawer = (props: Props) => {
 
   const {
     createToken,
-    createTokenError,
+    error: createTokenError,
     revokeToken,
     updateCurrentToken,
     validateParentToken,
diff --git a/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.tsx b/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.tsx
index ab10d75d8af..2ef7c4fe026 100644
--- a/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.tsx
+++ b/packages/manager/src/features/Account/SwitchAccounts/ChildAccountList.tsx
@@ -1,4 +1,7 @@
-import { useChildAccountsInfiniteQuery } from '@linode/queries';
+import {
+  useAllListMyDelegatedChildAccountsQuery,
+  useChildAccountsInfiniteQuery,
+} from '@linode/queries';
 import {
   Box,
   Button,
@@ -8,10 +11,11 @@ import {
   Stack,
   Typography,
 } from '@linode/ui';
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { Waypoint } from 'react-waypoint';
 
 import ErrorStateCloud from 'src/assets/icons/error-state-cloud.svg';
+import { useIsIAMDelegationEnabled } from 'src/features/IAM/hooks/useIsIAMEnabled';
 
 import type { Filter, UserType } from '@linode/api-v4';
 
@@ -39,6 +43,8 @@ export const ChildAccountList = React.memo(
     searchQuery,
     userType,
   }: ChildAccountListProps) => {
+    const { isIAMDelegationEnabled } = useIsIAMDelegationEnabled();
+
     const filter: Filter = {
       ['+order']: 'asc',
       ['+order_by']: 'company',
@@ -56,22 +62,54 @@ export const ChildAccountList = React.memo(
       isInitialLoading,
       isRefetching,
       refetch: refetchChildAccounts,
-    } = useChildAccountsInfiniteQuery({
-      filter,
-      headers:
-        userType === 'proxy'
-          ? {
-              Authorization: currentTokenWithBearer,
-            }
-          : undefined,
+    } = useChildAccountsInfiniteQuery(
+      {
+        filter,
+        headers:
+          userType === 'proxy'
+            ? {
+                Authorization: currentTokenWithBearer,
+              }
+            : undefined,
+      },
+      isIAMDelegationEnabled === false
+    );
+    const {
+      data: allChildAccounts,
+      error: allChildAccountsError,
+      isLoading: allChildAccountsLoading,
+      isRefetching: allChildAccountsIsRefetching,
+      refetch: refetchAllChildAccounts,
+    } = useAllListMyDelegatedChildAccountsQuery({
+      params: {},
+      enabled: isIAMDelegationEnabled,
     });
-    const childAccounts = data?.pages.flatMap((page) => page.data);
+
+    const refetchFn = isIAMDelegationEnabled
+      ? refetchAllChildAccounts
+      : refetchChildAccounts;
+
+    const childAccounts = useMemo(() => {
+      if (isIAMDelegationEnabled) {
+        if (searchQuery && allChildAccounts) {
+          // Client-side filter: match company field with searchQuery (case-insensitive, contains)
+          const normalizedQuery = searchQuery.toLowerCase();
+          return allChildAccounts.filter((account) =>
+            account.company?.toLowerCase().includes(normalizedQuery)
+          );
+        }
+        return allChildAccounts;
+      }
+      return data?.pages.flatMap((page) => page.data);
+    }, [isIAMDelegationEnabled, searchQuery, allChildAccounts, data]);
 
     if (
       isInitialLoading ||
       isLoading ||
       isSwitchingChildAccounts ||
-      isRefetching
+      isRefetching ||
+      allChildAccountsLoading ||
+      allChildAccountsIsRefetching
     ) {
       return (
         <Box display="flex" justifyContent="center">
@@ -80,7 +118,7 @@ export const ChildAccountList = React.memo(
       );
     }
 
-    if (childAccounts?.length === 0) {
+    if (childAccounts && childAccounts.length === 0) {
       return (
         <Notice variant="info">
           There are no child accounts
@@ -92,7 +130,7 @@ export const ChildAccountList = React.memo(
       );
     }
 
-    if (isError) {
+    if (isError || allChildAccountsError) {
       return (
         <Stack alignItems="center" gap={1} justifyContent="center">
           <ErrorStateCloud />
@@ -102,7 +140,7 @@ export const ChildAccountList = React.memo(
           </Typography>
           <Button
             buttonType="primary"
-            onClick={() => refetchChildAccounts()}
+            onClick={() => refetchFn()}
             sx={(theme) => ({
               marginTop: theme.spacing(2),
             })}
diff --git a/packages/manager/src/features/Account/SwitchAccounts/SessionExpirationDialog.tsx b/packages/manager/src/features/Account/SwitchAccounts/SessionExpirationDialog.tsx
index f25942cf0e2..b809a19c6a9 100644
--- a/packages/manager/src/features/Account/SwitchAccounts/SessionExpirationDialog.tsx
+++ b/packages/manager/src/features/Account/SwitchAccounts/SessionExpirationDialog.tsx
@@ -36,8 +36,8 @@ export const SessionExpirationDialog = React.memo(
 
     const {
       createToken,
-      createTokenError,
-      createTokenLoading,
+      error: createTokenError,
+      loading: createTokenLoading,
       revokeToken,
       updateCurrentToken,
       validateParentToken,
diff --git a/packages/manager/src/features/Account/SwitchAccounts/useParentChildAuthentication.tsx b/packages/manager/src/features/Account/SwitchAccounts/useParentChildAuthentication.tsx
index b3e4891b213..79742411df4 100644
--- a/packages/manager/src/features/Account/SwitchAccounts/useParentChildAuthentication.tsx
+++ b/packages/manager/src/features/Account/SwitchAccounts/useParentChildAuthentication.tsx
@@ -2,20 +2,26 @@ import {
   deletePersonalAccessToken,
   getPersonalAccessTokens,
 } from '@linode/api-v4';
-import { useCreateChildAccountPersonalAccessTokenMutation } from '@linode/queries';
+import {
+  useCreateChildAccountPersonalAccessTokenMutation,
+  useGenerateChildAccountTokenQuery,
+} from '@linode/queries';
 import { useCallback } from 'react';
+import React from 'react';
 
 import {
   getPersonalAccessTokenForRevocation,
   isParentTokenValid,
   updateCurrentTokenBasedOnUserType,
 } from 'src/features/Account/SwitchAccounts/utils';
+import { useIsIAMDelegationEnabled } from 'src/features/IAM/hooks/useIsIAMEnabled';
 import { getStorage, storage } from 'src/utilities/storage';
 
 import type { Token, UserType } from '@linode/api-v4';
 
 export const useParentChildAuthentication = () => {
   const currentTokenWithBearer = storage.authentication.token.get() ?? '';
+  const { isIAMDelegationEnabled } = useIsIAMDelegationEnabled();
 
   const {
     error: createTokenError,
@@ -23,20 +29,38 @@ export const useParentChildAuthentication = () => {
     mutateAsync: createProxyToken,
   } = useCreateChildAccountPersonalAccessTokenMutation();
 
+  const {
+    error: generateTokenError,
+    isPending: generateTokenLoading,
+    mutateAsync: generateProxyToken,
+  } = useGenerateChildAccountTokenQuery();
+
+  const error = React.useMemo(
+    () => (isIAMDelegationEnabled ? generateTokenError : createTokenError),
+    [isIAMDelegationEnabled, createTokenError, generateTokenError]
+  );
+
+  const loading = React.useMemo(
+    () => (isIAMDelegationEnabled ? generateTokenLoading : createTokenLoading),
+    [isIAMDelegationEnabled, createTokenLoading, generateTokenLoading]
+  );
+
   const createToken = useCallback(
     async (euuid: string): Promise<Token> => {
-      return createProxyToken({
-        euuid,
-        headers: {
-          /**
-           * Headers are required for proxy users when obtaining a proxy token.
-           * For 'proxy' userType, use the stored parent token in the request.
-           */
-          Authorization: getStorage('authentication/parent_token/token'),
-        },
-      });
+      return isIAMDelegationEnabled
+        ? generateProxyToken({ euuid })
+        : createProxyToken({
+            euuid,
+            headers: {
+              /**
+               * Headers are required for proxy users when obtaining a proxy token.
+               * For 'proxy' userType, use the stored parent token in the request.
+               */
+              Authorization: getStorage('authentication/parent_token/token'),
+            },
+          });
     },
-    [createProxyToken]
+    [createProxyToken, generateProxyToken, isIAMDelegationEnabled]
   );
 
   const revokeToken = useCallback(async (): Promise<void> => {
@@ -70,8 +94,8 @@ export const useParentChildAuthentication = () => {
 
   return {
     createToken,
-    createTokenError,
-    createTokenLoading,
+    error,
+    loading,
     revokeToken,
     updateCurrentToken,
     validateParentToken,
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsEndpointFilter.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsEndpointFilter.test.tsx
new file mode 100644
index 00000000000..c8a2f3e7ff0
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsEndpointFilter.test.tsx
@@ -0,0 +1,78 @@
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { AlertsEndpointFilter } from './AlertsEndpointFilter';
+
+describe('AlertsEndpointFilter', () => {
+  const endpointOptions = ['endpoint-1', 'endpoint-2'];
+  it('calls handleFilterChange with correct arguments when an endpoint is selected', async () => {
+    const handleFilterChange = vi.fn();
+
+    renderWithTheme(
+      <AlertsEndpointFilter
+        endpointOptions={endpointOptions}
+        handleFilterChange={handleFilterChange}
+      />
+    );
+
+    await userEvent.click(screen.getByRole('button', { name: 'Open' }));
+
+    // Check first option exists
+    expect(
+      screen.getByRole('option', { name: endpointOptions[0] })
+    ).toBeVisible();
+
+    // Select first option
+    await userEvent.click(
+      screen.getByRole('option', { name: endpointOptions[0] })
+    );
+    expect(handleFilterChange).toHaveBeenCalledWith(
+      [endpointOptions[0]],
+      'endpoint'
+    );
+  });
+  it('renders with empty endpointOptions', async () => {
+    const handleFilterChange = vi.fn();
+
+    renderWithTheme(
+      <AlertsEndpointFilter
+        endpointOptions={[]}
+        handleFilterChange={handleFilterChange}
+      />
+    );
+
+    await userEvent.click(screen.getByRole('button', { name: 'Open' })); // indicates there is a drop down
+    expect(
+      screen.getByText('You have no options to choose from')
+    ).toBeVisible();
+  });
+
+  it('renders with multiple selection endpoints', async () => {
+    const handleFilterChange = vi.fn();
+
+    renderWithTheme(
+      <AlertsEndpointFilter
+        endpointOptions={endpointOptions}
+        handleFilterChange={handleFilterChange}
+      />
+    );
+
+    await userEvent.click(screen.getByRole('button', { name: 'Open' }));
+
+    // Select first option
+    await userEvent.click(
+      screen.getByRole('option', { name: endpointOptions[0] })
+    );
+    // Select second option
+    await userEvent.click(
+      screen.getByRole('option', { name: endpointOptions[1] })
+    );
+    expect(handleFilterChange).toHaveBeenCalledWith(
+      [...endpointOptions],
+      'endpoint'
+    );
+  });
+});
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsEndpointFilter.tsx b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsEndpointFilter.tsx
new file mode 100644
index 00000000000..abb2d8b48c1
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsEndpointFilter.tsx
@@ -0,0 +1,63 @@
+import { Autocomplete } from '@linode/ui';
+import React from 'react';
+
+import type { AlertFilterKey } from './types';
+
+interface EndpointOption {
+  label: string;
+}
+export interface AlertsEndpointFilterProps {
+  /**
+   * List of object storage endpoints.
+   */
+  endpointOptions: string[];
+  /**
+   * Callback to publish the selected engine type
+   */
+  handleFilterChange: (
+    endpoints: string[] | undefined,
+    type: AlertFilterKey
+  ) => void;
+}
+
+export const AlertsEndpointFilter = React.memo(
+  (props: AlertsEndpointFilterProps) => {
+    const { handleFilterChange: handleSelection, endpointOptions } = props;
+    const [selectedEndpoints, setSelectedEndpoints] = React.useState<
+      EndpointOption[]
+    >([]);
+    const endpointBuiltOptions: EndpointOption[] = endpointOptions.map(
+      (option) => ({
+        label: option,
+      })
+    );
+
+    const handleFilterSelection = React.useCallback(
+      (_: React.SyntheticEvent, endpoints: EndpointOption[]) => {
+        setSelectedEndpoints(endpoints);
+        handleSelection(
+          endpoints.length ? endpoints.map(({ label }) => label) : undefined,
+          'endpoint'
+        );
+      },
+      [handleSelection]
+    );
+    return (
+      <Autocomplete
+        autoHighlight
+        clearOnBlur
+        isOptionEqualToValue={(option, value) => option.label === value.label}
+        label="Endpoints"
+        limitTags={1}
+        multiple
+        onChange={handleFilterSelection}
+        options={endpointBuiltOptions}
+        placeholder="Select Endpoints"
+        textFieldProps={{
+          hideLabel: true,
+        }}
+        value={selectedEndpoints}
+      />
+    );
+  }
+);
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResources.tsx b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResources.tsx
index 5490bef4be5..2b2bbc9b6eb 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResources.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResources.tsx
@@ -12,7 +12,9 @@ import { MULTILINE_ERROR_SEPARATOR } from '../constants';
 import { AlertListNoticeMessages } from '../Utils/AlertListNoticeMessages';
 import {
   getAlertResourceFilterProps,
+  getEndpointOptions,
   getFilteredResources,
+  getOfflineRegionFilteredResources,
   getRegionOptions,
   getRegionsIdRegionMap,
   getSupportedRegionIds,
@@ -119,7 +121,7 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
   const [selectedOnly, setSelectedOnly] = React.useState<boolean>(false);
   const [additionalFilters, setAdditionalFilters] = React.useState<
     Record<AlertAdditionalFilterKey, AlertFilterType>
-  >({ engineType: undefined, tags: undefined });
+  >({ engineType: undefined, tags: undefined, endpoint: undefined });
 
   const {
     data: regions,
@@ -129,19 +131,23 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
 
   const theme = useTheme();
 
-  const supportedRegionIds = getSupportedRegionIds(regions, serviceType);
+  const supportedRegionIds = React.useMemo(() => {
+    return getSupportedRegionIds(regions, serviceType);
+  }, [regions, serviceType]);
   const xFilterToBeApplied: Filter | undefined = React.useMemo(() => {
-    if (serviceType === 'firewall') {
+    if (
+      serviceType === 'firewall' ||
+      serviceType === 'objectstorage' ||
+      !supportedRegionIds?.length
+    ) {
       return undefined;
     }
 
-    const regionFilter: Filter = supportedRegionIds
-      ? {
-          '+or': supportedRegionIds.map((regionId) => ({
-            region: regionId,
-          })),
-        }
-      : {};
+    const regionFilter: Filter = {
+      '+or': supportedRegionIds?.map((regionId) => ({
+        region: regionId,
+      })),
+    };
 
     // if service type is other than dbaas, return only region filter
     if (serviceType !== 'dbaas') {
@@ -153,7 +159,7 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
 
     // If alertType is not 'system' or alertClass is not defined, return only platform filter
     if (alertType !== 'system' || !alertClass) {
-      return platformFilter;
+      return { ...platformFilter, '+and': [regionFilter] };
     }
 
     // Dynamically exclude 'dedicated' if alertClass is 'shared'
@@ -182,20 +188,29 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
     isError: isResourcesError,
     isLoading: isResourcesLoading,
   } = useResourcesQuery(
-    Boolean(serviceType),
+    Boolean(
+      serviceType && (serviceType === 'firewall' || supportedRegionIds?.length)
+    ), // Enable query only if serviceType and supportedRegionIds are available, in case of firewall only serviceType is needed
     serviceType,
     {},
     xFilterToBeApplied
   );
 
+  const regionFilteredResources = React.useMemo(() => {
+    if (serviceType === 'objectstorage' && resources && supportedRegionIds) {
+      return getOfflineRegionFilteredResources(resources, supportedRegionIds);
+    }
+    return resources;
+  }, [serviceType, resources, supportedRegionIds]);
+
   const computedSelectedResources = React.useMemo(() => {
-    if (!isSelectionsNeeded || !resources) {
+    if (!isSelectionsNeeded || !regionFilteredResources) {
       return alertResourceIds;
     }
-    return resources
+    return regionFilteredResources
       .filter(({ id }) => alertResourceIds.includes(id))
       .map(({ id }) => id);
-  }, [resources, isSelectionsNeeded, alertResourceIds]);
+  }, [regionFilteredResources, isSelectionsNeeded, alertResourceIds]);
 
   React.useEffect(() => {
     setSelectedResources(computedSelectedResources);
@@ -209,13 +224,25 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
   // Derived list of regions associated with the provided resource IDs, filtered based on available data.
   const regionOptions: Region[] = React.useMemo(() => {
     return getRegionOptions({
-      data: resources,
+      data: regionFilteredResources,
       isAdditionOrDeletionNeeded: isSelectionsNeeded,
       regionsIdToRegionMap,
       resourceIds: alertResourceIds,
     });
-  }, [resources, alertResourceIds, regionsIdToRegionMap, isSelectionsNeeded]);
+  }, [
+    regionFilteredResources,
+    alertResourceIds,
+    regionsIdToRegionMap,
+    isSelectionsNeeded,
+  ]);
 
+  const endpointOptions: string[] = React.useMemo(() => {
+    return getEndpointOptions(
+      regionFilteredResources,
+      isSelectionsNeeded,
+      alertResourceIds
+    );
+  }, [alertResourceIds, isSelectionsNeeded, regionFilteredResources]);
   const isDataLoadingError = isRegionsError || isResourcesError;
 
   const handleSearchTextChange = (searchText: string) => {
@@ -246,7 +273,7 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
   const filteredResources: AlertInstance[] = React.useMemo(() => {
     return getFilteredResources({
       additionalFilters,
-      data: resources,
+      data: regionFilteredResources,
       filteredRegions,
       isAdditionOrDeletionNeeded: isSelectionsNeeded,
       regionsIdToRegionMap,
@@ -256,7 +283,7 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
       selectedResources,
     });
   }, [
-    resources,
+    regionFilteredResources,
     filteredRegions,
     isSelectionsNeeded,
     regionsIdToRegionMap,
@@ -283,7 +310,7 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
 
   const handleAllSelection = React.useCallback(
     (action: SelectDeselectAll) => {
-      if (!resources) {
+      if (!regionFilteredResources) {
         return;
       }
 
@@ -294,7 +321,7 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
         setSelectedResources([]);
       } else {
         // Select all
-        currentSelections = resources.map(({ id }) => id);
+        currentSelections = regionFilteredResources.map(({ id }) => id);
         setSelectedResources(currentSelections);
       }
 
@@ -302,7 +329,7 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
         handleResourcesSelection(currentSelections); // publish the resources selected
       }
     },
-    [handleResourcesSelection, resources]
+    [handleResourcesSelection, regionFilteredResources]
   );
 
   const titleRef = React.useRef<HTMLDivElement>(null); // Reference to the component title, used for scrolling to the title when the table's page size or page number changes.
@@ -352,7 +379,6 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
     maxSelectionCount && selectedResources
       ? Math.max(0, maxSelectionCount - selectedResources.length)
       : undefined;
-
   return (
     <Stack gap={2}>
       {!hideLabel && (
@@ -401,11 +427,14 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
                   filterKey,
                   handleFilterChange,
                   handleFilteredRegionsChange,
+                  endpointOptions,
                   regionOptions,
                   tagOptions: Array.from(
                     new Set(
-                      resources
-                        ? resources.flatMap(({ tags }) => tags ?? [])
+                      regionFilteredResources
+                        ? regionFilteredResources.flatMap(
+                            ({ tags }) => tags ?? []
+                          )
                         : []
                     )
                   ),
@@ -454,15 +483,15 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
         )}
         {isSelectionsNeeded &&
           !isDataLoadingError &&
-          resources &&
-          resources.length > 0 && (
+          regionFilteredResources &&
+          regionFilteredResources.length > 0 && (
             <GridLegacy item xs={12}>
               <AlertSelectedInfoNotice
                 handleSelectionChange={handleAllSelection}
                 maxSelectionCount={maxSelectionCount}
                 property="entities"
                 selectedCount={selectedResources.length}
-                totalCount={resources?.length ?? 0}
+                totalCount={regionFilteredResources?.length ?? 0}
               />
             </GridLegacy>
           )}
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResourcesFilterRenderer.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResourcesFilterRenderer.test.tsx
index da5e25f5252..04aba67464a 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResourcesFilterRenderer.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResourcesFilterRenderer.test.tsx
@@ -1,3 +1,4 @@
+import { screen } from '@testing-library/react';
 import React from 'react';
 
 import { renderWithTheme } from 'src/utilities/testHelpers';
@@ -8,12 +9,14 @@ import { serviceToFiltersMap } from './constants';
 
 describe('AlertsResourcesFilterRenderer', () => {
   const filters = serviceToFiltersMap['dbaas'] ?? []; // Get filters for dbaas service type
+  const objectStorageFilters = serviceToFiltersMap['objectstorage'] ?? [];
   it('renders the correct filter components based on properties passed', () => {
     const handleFilterChangeMock = vi.fn();
     const engineProps = getAlertResourceFilterProps({
       filterKey: 'engineType',
       handleFilterChange: handleFilterChangeMock,
       handleFilteredRegionsChange: handleFilterChangeMock,
+      endpointOptions: [],
       regionOptions: [],
       tagOptions: [],
     });
@@ -36,6 +39,7 @@ describe('AlertsResourcesFilterRenderer', () => {
       filterKey: 'region',
       handleFilterChange: handleFilterChangeMock,
       handleFilteredRegionsChange: handleFilterChangeMock,
+      endpointOptions: [],
       regionOptions: [],
       tagOptions: [],
     });
@@ -52,5 +56,27 @@ describe('AlertsResourcesFilterRenderer', () => {
     );
 
     expect(getByPlaceholderText('Select Regions')).toBeInTheDocument();
+
+    const endpointProps = getAlertResourceFilterProps({
+      filterKey: 'endpoint',
+      handleFilterChange: handleFilterChangeMock,
+      handleFilteredRegionsChange: handleFilterChangeMock,
+      endpointOptions: [],
+      regionOptions: [],
+      tagOptions: [],
+    });
+    const endpointPropKeys = Object.keys(endpointProps);
+    expect(endpointPropKeys.includes('handleFilterChange')).toBeTruthy();
+    expect(endpointPropKeys.includes('handleSelectionChange')).toBeFalsy();
+
+    // Check for region filter
+    renderWithTheme(
+      <AlertResourcesFilterRenderer
+        component={objectStorageFilters[1].component}
+        componentProps={endpointProps}
+      />
+    );
+
+    expect(screen.getByPlaceholderText('Select Endpoints')).toBeVisible();
   });
 });
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/DisplayAlertResources.tsx b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/DisplayAlertResources.tsx
index a08e62cdda0..3bffebb91c4 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/DisplayAlertResources.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/DisplayAlertResources.tsx
@@ -24,6 +24,10 @@ export interface AlertInstance {
    * Indicates if the instance is selected or not
    */
   checked?: boolean;
+  /**
+   * The endpoint associated with the object storage instance
+   */
+  endpoint?: string;
   /**
    * The region associated with the instance
    */
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/constants.ts b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/constants.ts
index f28c28d1475..4c6cabef159 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/constants.ts
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import { engineTypeMap } from '../constants';
+import { AlertsEndpointFilter } from './AlertsEndpointFilter';
 import { AlertsEngineTypeFilter } from './AlertsEngineTypeFilter';
 import { AlertsRegionFilter } from './AlertsRegionFilter';
 import { AlertsTagFilter } from './AlertsTagsFilter';
@@ -86,6 +87,23 @@ export const serviceTypeBasedColumns: ServiceColumns<AlertInstance> = {
       sortingKey: 'tags',
     },
   ],
+  objectstorage: [
+    {
+      accessor: ({ label }) => label,
+      label: 'Entity',
+      sortingKey: 'label',
+    },
+    {
+      accessor: ({ region }) => region,
+      label: 'Region',
+      sortingKey: 'region',
+    },
+    {
+      accessor: ({ endpoint }) => endpoint,
+      label: 'Endpoint',
+      sortingKey: 'endpoint',
+    },
+  ],
 };
 
 export const serviceToFiltersMap: Partial<
@@ -103,16 +121,22 @@ export const serviceToFiltersMap: Partial<
     { component: AlertsRegionFilter, filterKey: 'region' },
     { component: AlertsTagFilter, filterKey: 'tags' },
   ],
+  objectstorage: [
+    { component: AlertsRegionFilter, filterKey: 'region' },
+    { component: AlertsEndpointFilter, filterKey: 'endpoint' },
+  ],
 };
 export const applicableAdditionalFilterKeys: AlertAdditionalFilterKey[] = [
   'engineType', // Extendable in future for filter keys like 'tags', 'plan', etc.
   'tags',
+  'endpoint',
 ];
 
 export const alertAdditionalFilterKeyMap: Record<
   AlertAdditionalFilterKey,
   keyof AlertInstance
 > = {
+  endpoint: 'endpoint',
   engineType: 'engineType', // engineType filter selected here, will map to engineType property on AlertInstance
   tags: 'tags',
 };
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/types.ts b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/types.ts
index 5a0764e0766..39dcec3f170 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/types.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/types.ts
@@ -1,5 +1,6 @@
 import type { MemoExoticComponent } from 'react';
 
+import type { AlertsEndpointFilterProps } from './AlertsEndpointFilter';
 import type { AlertsEngineOptionProps } from './AlertsEngineTypeFilter';
 import type { AlertsRegionProps } from './AlertsRegionFilter';
 import type { AlertsTagFilterProps } from './AlertsTagsFilter';
@@ -46,7 +47,7 @@ export type ServiceColumns<T> = Partial<
  * Defines the available filter keys that can be used to filter alerts.
  * This type will be extended in the future to include other attributes like tags, plan, etc.
  */
-export type AlertFilterKey = 'engineType' | 'region' | 'tags'; // will be extended to have tags, plan etc.,
+export type AlertFilterKey = 'endpoint' | 'engineType' | 'region' | 'tags'; // will be extended to have tags, plan etc.,
 
 /**
  * Represents the possible types for alert filter values.
@@ -58,9 +59,10 @@ export type AlertFilterType = boolean | number | string | string[] | undefined;
  * Defines additional filter keys that can be used beyond the primary ones.
  * Future Extensions: Additional attributes like 'tags' and 'plan' can be added here.
  */
-export type AlertAdditionalFilterKey = 'engineType' | 'tags'; // will be extended to have tags, plan etc.,
+export type AlertAdditionalFilterKey = 'endpoint' | 'engineType' | 'tags'; // will be extended to have tags, plan etc.,
 
 export type AlertResourceFiltersProps =
+  | AlertsEndpointFilterProps
   | AlertsEngineOptionProps
   | AlertsRegionProps
   | AlertsTagFilterProps;
diff --git a/packages/manager/src/features/CloudPulse/Alerts/ContextualView/AlertInformationActionTable.tsx b/packages/manager/src/features/CloudPulse/Alerts/ContextualView/AlertInformationActionTable.tsx
index 6bf2a79e408..a457d7d79ab 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/ContextualView/AlertInformationActionTable.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/ContextualView/AlertInformationActionTable.tsx
@@ -1,6 +1,7 @@
 import { type Alert, type APIError } from '@linode/api-v4';
 import { Box, Button, TooltipIcon } from '@linode/ui';
 import { Grid, TableBody, TableHead } from '@mui/material';
+import { useQueryClient } from '@tanstack/react-query';
 import { useSnackbar } from 'notistack';
 import React from 'react';
 
@@ -13,14 +14,18 @@ import { TableContentWrapper } from 'src/components/TableContentWrapper/TableCon
 import { TableRow } from 'src/components/TableRow';
 import { TableSortCell } from 'src/components/TableSortCell';
 import { ALERTS_BETA_PROMPT } from 'src/features/Linodes/constants';
-import { useServiceAlertsMutation } from 'src/queries/cloudpulse/alerts';
+import {
+  invalidateAclpAlerts,
+  servicePayloadTransformerMap,
+  useAlertsMutation,
+} from 'src/queries/cloudpulse/useAlertsMutation';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 
-import { compareArrays } from '../../Utils/FilterBuilder';
 import { useContextualAlertsState } from '../../Utils/utils';
 import { AlertConfirmationDialog } from '../AlertsLanding/AlertConfirmationDialog';
 import { ALERT_SCOPE_TOOLTIP_CONTEXTUAL } from '../constants';
 import { scrollToElement } from '../Utils/AlertResourceUtils';
+import { arraysEqual } from '../Utils/utils';
 import { AlertInformationActionRow } from './AlertInformationActionRow';
 
 import type {
@@ -142,6 +147,8 @@ export const AlertInformationActionTable = (
 
   const isEditMode = !!entityId;
   const isCreateMode = !isEditMode;
+  const payloadAlertType = (alert: Alert) =>
+    alert.type === 'system' ? 'system_alerts' : 'user_alerts';
 
   const {
     enabledAlerts,
@@ -151,10 +158,8 @@ export const AlertInformationActionTable = (
     resetToInitialState,
   } = useContextualAlertsState(alerts, entityId);
 
-  const { mutateAsync: updateAlerts } = useServiceAlertsMutation(
-    serviceType,
-    entityId ?? ''
-  );
+  // Mutation to update alerts as per service type
+  const updateAlerts = useAlertsMutation(serviceType, entityId ?? '');
 
   React.useEffect(() => {
     // To send initial state of alerts through toggle handler function (For Create Flow)
@@ -174,19 +179,26 @@ export const AlertInformationActionTable = (
     setIsDialogOpen(false);
   };
 
+  const queryClient = useQueryClient();
+
   const handleConfirm = React.useCallback(
     (alertIds: CloudPulseAlertsPayload) => {
       setIsLoading(true);
-      updateAlerts({
-        user: alertIds.user,
-        system: alertIds.system,
-      })
+      const payload: CloudPulseAlertsPayload = {
+        user_alerts: alertIds.user_alerts,
+        system_alerts: alertIds.system_alerts,
+      };
+      // call updateAlerts mutation with the transformed payload based on the service type
+      updateAlerts(
+        servicePayloadTransformerMap[serviceType]?.(payload) ?? payload
+      )
         .then(() => {
           enqueueSnackbar('Your settings for alerts have been saved.', {
             variant: 'success',
           });
           // Reset the state to sync with the updated alerts from API
           resetToInitialState();
+          invalidateAclpAlerts(queryClient, serviceType, entityId, payload);
         })
         .catch(() => {
           enqueueSnackbar('Alerts changes were not saved, please try again.', {
@@ -205,11 +217,11 @@ export const AlertInformationActionTable = (
     (alert: Alert) => {
       setEnabledAlerts((prev: CloudPulseAlertsPayload) => {
         const newPayload = {
-          system: [...(prev.system ?? [])],
-          user: [...(prev.user ?? [])],
+          system_alerts: [...(prev.system_alerts ?? [])],
+          user_alerts: [...(prev.user_alerts ?? [])],
         };
 
-        const alertIds = newPayload[alert.type];
+        const alertIds = newPayload[payloadAlertType(alert)];
         const isCurrentlyEnabled = alertIds.includes(alert.id);
 
         if (isCurrentlyEnabled) {
@@ -222,8 +234,8 @@ export const AlertInformationActionTable = (
         }
 
         const hasNewUnsavedChanges =
-          !compareArrays(newPayload.system ?? [], initialState.system ?? []) ||
-          !compareArrays(newPayload.user ?? [], initialState.user ?? []);
+          !arraysEqual(newPayload.system_alerts, initialState.system_alerts) ||
+          !arraysEqual(newPayload.user_alerts, initialState.user_alerts);
 
         // Call onToggleAlert in both create and edit flow
         if (onToggleAlert) {
@@ -314,10 +326,9 @@ export const AlertInformationActionTable = (
                           if (!(isEditMode || isCreateMode)) {
                             return null;
                           }
-
-                          const status = enabledAlerts[alert.type]?.includes(
-                            alert.id
-                          );
+                          const status = enabledAlerts[
+                            payloadAlertType(alert)
+                          ]?.includes(alert.id);
 
                           return (
                             <AlertInformationActionRow
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/CreateAlertDefinition.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/CreateAlertDefinition.test.tsx
index da1b0d8249b..71dc62de48f 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/CreateAlertDefinition.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/CreateAlertDefinition.test.tsx
@@ -184,12 +184,8 @@ describe('AlertDefinition Create', () => {
 
     const submitButton = container.getByText('Submit');
 
-    await user.click(
-      container.getByRole('button', { name: 'Add dimension filter' })
-    );
-
     await user.click(submitButton!);
-    expect(container.getAllByText(errorMessage).length).toBe(12);
+    expect(container.getAllByText(errorMessage).length).toBe(9);
     container.getAllByText(errorMessage).forEach((element) => {
       expect(element).toBeVisible();
     });
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilter.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilter.tsx
index 469de3cea93..64668cc2900 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilter.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/DimensionFilter.tsx
@@ -32,6 +32,7 @@ export const DimensionFilters = (props: DimensionFilterProps) => {
   });
 
   const dimensionFilterWatcher = useWatch({ control, name });
+  const serviceTypeWatcher = useWatch({ control, name: 'serviceType' });
   return (
     <Box display="flex" flexDirection="column" gap={1}>
       <Typography variant="h3">
@@ -54,7 +55,10 @@ export const DimensionFilters = (props: DimensionFilterProps) => {
       <Button
         compactX
         data-qa-buttons="true"
-        disabled={dimensionFilterWatcher && dimensionFilterWatcher.length === 5}
+        disabled={
+          serviceTypeWatcher === null ||
+          (dimensionFilterWatcher && dimensionFilterWatcher.length === 5)
+        }
         onClick={() =>
           append({
             dimension_label: null,
diff --git a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/MetricCriteria.tsx b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/MetricCriteria.tsx
index f41bf6426d3..0f3845c0f44 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/MetricCriteria.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Criteria/MetricCriteria.tsx
@@ -107,7 +107,9 @@ export const MetricCriteriaField = (props: MetricCriteriaProps) => {
           </Stack>
           <Button
             buttonType="outlined"
-            disabled={metricCriteriaWatcher.length === 5}
+            disabled={
+              serviceType === null || metricCriteriaWatcher.length === 5
+            }
             onClick={() =>
               append({
                 aggregate_function: null,
diff --git a/packages/manager/src/features/CloudPulse/Alerts/Utils/AlertResourceUtils.test.ts b/packages/manager/src/features/CloudPulse/Alerts/Utils/AlertResourceUtils.test.ts
index d3064ecbfea..9d542b0a451 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/Utils/AlertResourceUtils.test.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/Utils/AlertResourceUtils.test.ts
@@ -1,7 +1,9 @@
 import { regionFactory } from '@linode/utilities';
 
 import {
+  getEndpointOptions,
   getFilteredResources,
+  getOfflineRegionFilteredResources,
   getRegionOptions,
   getRegionsIdRegionMap,
   getSupportedRegionIds,
@@ -196,3 +198,65 @@ describe('getSupportedRegionIds', () => {
     expect(result).toHaveLength(0);
   });
 });
+
+describe('getEndpointOptions', () => {
+  const mockResources: CloudPulseResources[] = [
+    { id: '1', endpoint: 'endpoint-a', region: 'us-east', label: 'r1' },
+    { id: '2', endpoint: 'endpoint-b', region: 'us-east', label: 'r2' },
+    { id: '3', endpoint: 'endpoint-a', region: 'us-west', label: 'r3' },
+    { id: '4', endpoint: undefined, region: 'us-west', label: 'r4' },
+  ];
+
+  it('returns all unique endpoints when isAdditionOrDeletionNeeded = true', () => {
+    const result = getEndpointOptions(mockResources, true);
+    expect(result).toEqual(['endpoint-a', 'endpoint-b']);
+  });
+
+  it('returns endpoints only for matching resourceIds when flag = false', () => {
+    const result = getEndpointOptions(mockResources, false, ['2', '4']);
+    expect(result).toEqual(['endpoint-b']);
+  });
+
+  it('returns empty array when no data provided', () => {
+    const result = getEndpointOptions(undefined, true);
+    expect(result).toEqual([]);
+  });
+
+  it('returns empty array when no resourceIds and flag = false', () => {
+    const result = getEndpointOptions(mockResources, false, []);
+    expect(result).toEqual([]);
+  });
+});
+
+describe('getOfflineRegionFilteredResources', () => {
+  const mockResources: CloudPulseResources[] = [
+    { id: '1', region: 'us-east', label: 'r1' },
+    { id: '2', region: 'us-west', label: 'r2' },
+    { id: '3', region: '', label: 'r3' },
+  ];
+
+  it('filters resources based on supportedRegionIds', () => {
+    const result = getOfflineRegionFilteredResources(mockResources, [
+      'us-east',
+    ]);
+    expect(result).toEqual([{ id: '1', region: 'us-east', label: 'r1' }]);
+  });
+
+  it('returns empty array if no supported regions match', () => {
+    const result = getOfflineRegionFilteredResources(mockResources, [
+      'eu-central',
+    ]);
+    expect(result).toEqual([]);
+  });
+
+  it('excludes resources with undefined region', () => {
+    const result = getOfflineRegionFilteredResources(mockResources, [
+      'us-east',
+      'us-west',
+    ]);
+    expect(result).toEqual([
+      { id: '1', region: 'us-east', label: 'r1' },
+      { id: '2', region: 'us-west', label: 'r2' },
+    ]);
+  });
+});
diff --git a/packages/manager/src/features/CloudPulse/Alerts/Utils/AlertResourceUtils.ts b/packages/manager/src/features/CloudPulse/Alerts/Utils/AlertResourceUtils.ts
index ddcdae208a3..c0a202a7c07 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/Utils/AlertResourceUtils.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/Utils/AlertResourceUtils.ts
@@ -62,6 +62,10 @@ interface FilterResourceProps {
 }
 
 interface FilterRendererProps {
+  /**
+   * The endpoints to be displayed according the resources associated with alerts
+   */
+  endpointOptions: string[];
   /**
    * The filter to which the props needs to built for
    */
@@ -136,6 +140,32 @@ export const getRegionOptions = (
   });
   return Array.from(uniqueRegions);
 };
+/**
+ * Builds a list of unique endpoint strings from CloudPulse resources.
+ *
+ * @param data - List of CloudPulse resources to extract endpoints from.
+ * @param isAdditionOrDeletionNeeded - Flag to include all resources regardless of `resourceIds`.
+ * @param resourceIds - Optional list of resource IDs to filter which endpoints are included.
+ * @returns A unique list of endpoint strings. Returns an empty array if no valid data.
+ */
+export const getEndpointOptions = (
+  data?: CloudPulseResources[],
+  isAdditionOrDeletionNeeded?: boolean,
+  resourceIds?: string[]
+): string[] => {
+  const isEmpty =
+    !data || (!isAdditionOrDeletionNeeded && !resourceIds?.length);
+
+  if (isEmpty) return [];
+
+  const uniqueEndpoints = new Set<string>();
+  data.forEach(({ id, endpoint }) => {
+    if (isAdditionOrDeletionNeeded || resourceIds?.includes(String(id))) {
+      if (endpoint) uniqueEndpoints.add(endpoint);
+    }
+  });
+  return Array.from(uniqueEndpoints);
+};
 
 /**
  * Filters regions based on service type and returns their IDs.
@@ -242,6 +272,10 @@ const applyAdditionalFilter = (
       return value.some((obj) => resourceValue.includes(obj));
     }
 
+    // to cover the endpoint scenario where resourceValue is string and value can be string[]
+    if (Array.isArray(value) && typeof resourceValue === 'string') {
+      return resourceValue && value.includes(resourceValue);
+    }
     return resourceValue === value;
   });
 };
@@ -319,10 +353,13 @@ export const getAlertResourceFilterProps = ({
   filterKey,
   handleFilterChange,
   handleFilteredRegionsChange: handleSelectionChange,
+  endpointOptions,
   regionOptions,
   tagOptions,
 }: FilterRendererProps): AlertResourceFiltersProps => {
   switch (filterKey) {
+    case 'endpoint':
+      return { handleFilterChange, endpointOptions };
     case 'engineType':
       return { handleFilterChange };
     case 'region':
@@ -333,3 +370,19 @@ export const getAlertResourceFilterProps = ({
       return { handleFilterChange };
   }
 };
+
+/**
+ * Filters CloudPulse resources to include only those whose region
+ * is present in the given list of ACLP supported region IDs.
+ * @param resources - The unfiltered list of CloudPulse resources.
+ * @param supportedRegionIds - Region IDs that have ACLP support and required capabilities.
+ * @returns A filtered list of CloudPulse resources located in supported regions.
+ */
+export const getOfflineRegionFilteredResources = (
+  resources: CloudPulseResources[],
+  supportedRegionIds: string[]
+): CloudPulseResources[] => {
+  return resources.filter(
+    ({ region }) => region && supportedRegionIds.includes(region)
+  );
+};
diff --git a/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.test.ts b/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.test.ts
index e0ac2714a1b..870ac5adbd4 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.test.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.test.ts
@@ -7,6 +7,7 @@ import { useContextualAlertsState } from '../../Utils/utils';
 import { alertDefinitionFormSchema } from '../CreateAlert/schemas';
 import {
   alertsFromEnabledServices,
+  arraysEqual,
   convertAlertDefinitionValues,
   convertAlertsToTypeSet,
   convertSecondsToMinutes,
@@ -251,7 +252,10 @@ describe('useContextualAlertsState', () => {
   it('should return empty initial state when no entityId provided', () => {
     const alerts = alertFactory.buildList(3);
     const { result } = renderHook(() => useContextualAlertsState(alerts));
-    expect(result.current.initialState).toEqual({ system: [], user: [] });
+    expect(result.current.initialState).toEqual({
+      system_alerts: [],
+      user_alerts: [],
+    });
   });
 
   it('should include alerts that match entityId or account/region level alerts in initial states', () => {
@@ -284,9 +288,9 @@ describe('useContextualAlertsState', () => {
       useContextualAlertsState(alerts, entityId)
     );
 
-    expect(result.current.initialState.system).toContain(1);
-    expect(result.current.initialState.system).toContain(3);
-    expect(result.current.initialState.user).toContain(2);
+    expect(result.current.initialState.system_alerts).toContain(1);
+    expect(result.current.initialState.system_alerts).toContain(3);
+    expect(result.current.initialState.user_alerts).toContain(2);
   });
 
   it('should detect unsaved changes when alerts are modified', () => {
@@ -309,7 +313,7 @@ describe('useContextualAlertsState', () => {
     act(() => {
       result.current.setEnabledAlerts((prev) => ({
         ...prev,
-        system: [...(prev.system ?? []), 999],
+        system_alerts: [...(prev.system_alerts ?? []), 999],
       }));
     });
 
@@ -494,3 +498,27 @@ describe('transformDimensionValue', () => {
     ).toBe('Test_value');
   });
 });
+
+describe('arraysEqual', () => {
+  it('should return true when both arrays are empty', () => {
+    expect(arraysEqual([], [])).toBe(true);
+  });
+  it('should return false when one array is empty and the other is not', () => {
+    expect(arraysEqual([], [1, 2, 3])).toBe(false);
+  });
+  it('should return true when arrays are undefined', () => {
+    expect(arraysEqual(undefined, undefined)).toBe(true);
+  });
+  it('should return false when one of the arrays is undefined', () => {
+    expect(arraysEqual(undefined, [1, 2, 3])).toBe(false);
+  });
+  it('should return true when arrays are equal', () => {
+    expect(arraysEqual([1, 2, 3], [1, 2, 3])).toBe(true);
+  });
+  it('should return false when arrays are not equal', () => {
+    expect(arraysEqual([1, 2, 3], [1, 2, 3, 4])).toBe(false);
+  });
+  it('should return true when arrays have same elements but in different order', () => {
+    expect(arraysEqual([1, 2, 3], [3, 2, 1])).toBe(true);
+  });
+});
diff --git a/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts b/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts
index f8b9e9b993e..e756d6831e5 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/Utils/utils.ts
@@ -17,6 +17,7 @@ import {
   DIMENSION_TRANSFORM_CONFIG,
   TRANSFORMS,
 } from '../../shared/DimensionTransform';
+import { compareArrays } from '../../Utils/FilterBuilder';
 import { aggregationTypeMap, metricOperatorTypeMap } from '../constants';
 
 import type { CloudPulseResources } from '../../shared/CloudPulseResourcesSelect';
@@ -618,3 +619,23 @@ export const transformDimensionValue = (
     )?.(value) ?? TRANSFORMS.capitalize(value)
   );
 };
+
+/**
+ * Checks if two arrays are equal, ignores the order of the elements
+ * @param a The first array
+ * @param b The second array
+ * @returns True if the arrays are equal, false otherwise
+ */
+export const arraysEqual = (
+  a: number[] | undefined,
+  b: number[] | undefined
+) => {
+  if (a === undefined && b === undefined) return true;
+  if (a === undefined || b === undefined) return false;
+  if (a.length !== b.length) return false;
+
+  return compareArrays(
+    [...a].sort((x, y) => x - y),
+    [...b].sort((x, y) => x - y)
+  );
+};
diff --git a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx
index 36dcf2c988b..3403f984a8a 100644
--- a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx
+++ b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboard.tsx
@@ -17,7 +17,11 @@ import {
 } from '../Widget/CloudPulseWidgetRenderer';
 
 import type { CloudPulseMetricsAdditionalFilters } from '../Widget/CloudPulseWidget';
-import type { DateTimeWithPreset, JWETokenPayLoad } from '@linode/api-v4';
+import type {
+  CloudPulseServiceType,
+  DateTimeWithPreset,
+  JWETokenPayLoad,
+} from '@linode/api-v4';
 
 export interface DashboardProperties {
   /**
@@ -35,6 +39,11 @@ export interface DashboardProperties {
    */
   duration: DateTimeWithPreset;
 
+  /**
+   * list of fields to group the metrics data by
+   */
+  groupBy: string[];
+
   /**
    * Selected linode region for the dashboard
    */
@@ -60,6 +69,11 @@ export interface DashboardProperties {
    */
   savePref?: boolean;
 
+  /**
+   * Selected service type for the dashboard
+   */
+  serviceType: CloudPulseServiceType;
+
   /**
    * Selected tags for the dashboard
    */
@@ -74,12 +88,18 @@ export const CloudPulseDashboard = (props: DashboardProperties) => {
     manualRefreshTimeStamp,
     resources,
     savePref,
+    serviceType,
+    groupBy,
     linodeRegion,
+    region,
   } = props;
 
   const { preferences } = useAclpPreference();
 
   const getJweTokenPayload = (): JWETokenPayLoad => {
+    if (serviceType === 'objectstorage') {
+      return {};
+    }
     return {
       entity_ids: resources?.map((resource) => Number(resource)) ?? [],
     };
@@ -152,18 +172,19 @@ export const CloudPulseDashboard = (props: DashboardProperties) => {
       'No visualizations are available at this moment. Create Dashboards to list here.'
     );
   }
-
   return (
     <RenderWidgets
       additionalFilters={additionalFilters}
       dashboard={dashboard}
       duration={duration}
+      groupBy={groupBy}
       isJweTokenFetching={isJweTokenFetching}
       jweToken={jweToken}
       linodeRegion={linodeRegion}
       manualRefreshTimeStamp={manualRefreshTimeStamp}
       metricDefinitions={metricDefinitions}
       preferences={preferences}
+      region={region}
       resourceList={resourceList}
       resources={resources}
       savePref={savePref}
diff --git a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardLanding.tsx b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardLanding.tsx
index 0f7ef75ea14..62f8769bdba 100644
--- a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardLanding.tsx
+++ b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardLanding.tsx
@@ -24,6 +24,7 @@ export interface CloudPulseMetricsFilter {
 export interface DashboardProp {
   dashboard?: Dashboard;
   filterValue: CloudPulseMetricsFilter;
+  groupBy: string[];
   timeDuration?: DateTimeWithPreset;
 }
 
@@ -33,6 +34,8 @@ export const CloudPulseDashboardLanding = () => {
     label: {},
   });
 
+  const [groupBy, setGroupBy] = React.useState<string[]>([]);
+
   const [timeDuration, setTimeDuration] = React.useState<
     DateTimeWithPreset | undefined
   >();
@@ -46,6 +49,10 @@ export const CloudPulseDashboardLanding = () => {
     setShowAppliedFilters(isVisible);
   };
 
+  const onGroupByChange = React.useCallback((selectedValues: string[]) => {
+    setGroupBy(selectedValues);
+  }, []);
+
   const onFilterChange = React.useCallback(
     (filterKey: string, filterValue: FilterValueType, labels: string[]) => {
       setFilterData((prev: FilterData) => {
@@ -92,6 +99,7 @@ export const CloudPulseDashboardLanding = () => {
               <GlobalFilters
                 handleAnyFilterChange={onFilterChange}
                 handleDashboardChange={onDashboardChange}
+                handleGroupByChange={onGroupByChange}
                 handleTimeDurationChange={onTimeDurationChange}
                 handleToggleAppliedFilter={toggleAppliedFilter}
               />
@@ -107,6 +115,7 @@ export const CloudPulseDashboardLanding = () => {
         <CloudPulseDashboardRenderer
           dashboard={dashboard}
           filterValue={filterData.id}
+          groupBy={groupBy}
           timeDuration={timeDuration}
         />
       </GridLegacy>
diff --git a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardRenderer.tsx b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardRenderer.tsx
index c1f0d881df9..5474c73dcce 100644
--- a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardRenderer.tsx
+++ b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardRenderer.tsx
@@ -19,8 +19,7 @@ import type { DashboardProp } from './CloudPulseDashboardLanding';
 
 export const CloudPulseDashboardRenderer = React.memo(
   (props: DashboardProp) => {
-    const { dashboard, filterValue, timeDuration } = props;
-
+    const { dashboard, filterValue, timeDuration, groupBy } = props;
     const selectDashboardAndFilterMessage =
       'Select a dashboard and apply filters to visualize metrics.';
 
@@ -63,6 +62,7 @@ export const CloudPulseDashboardRenderer = React.memo(
         additionalFilters={getMetricsCall}
         dashboardId={dashboard.id}
         duration={timeDuration}
+        groupBy={groupBy}
         linodeRegion={
           filterValue[LINODE_REGION] &&
           typeof filterValue[LINODE_REGION] === 'string'
@@ -85,6 +85,7 @@ export const CloudPulseDashboardRenderer = React.memo(
             : []
         }
         savePref={true}
+        serviceType={dashboard.service_type}
         tags={
           filterValue[TAGS] && Array.isArray(filterValue[TAGS])
             ? (filterValue[TAGS] as string[])
diff --git a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardWithFilters.tsx b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardWithFilters.tsx
index 1cfdc379444..e5dbc76f886 100644
--- a/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardWithFilters.tsx
+++ b/packages/manager/src/features/CloudPulse/Dashboard/CloudPulseDashboardWithFilters.tsx
@@ -4,6 +4,7 @@ import React from 'react';
 
 import { useCloudPulseDashboardByIdQuery } from 'src/queries/cloudpulse/dashboards';
 
+import { GlobalFilterGroupByRenderer } from '../GroupBy/GlobalFilterGroupByRenderer';
 import { CloudPulseAppliedFilterRenderer } from '../shared/CloudPulseAppliedFilterRenderer';
 import { CloudPulseDashboardFilterBuilder } from '../shared/CloudPulseDashboardFilterBuilder';
 import { CloudPulseDashboardSelect } from '../shared/CloudPulseDashboardSelect';
@@ -27,15 +28,19 @@ export interface CloudPulseDashboardWithFiltersProp {
    * The id of the dashboard that needs to be rendered
    */
   dashboardId: number;
+  /**
+   * The region for which the metrics will be listed
+   */
+  region?: string;
   /**
    * The resource id for which the metrics will be listed
    */
-  resource: number;
+  resource: number | string;
 }
 
 export const CloudPulseDashboardWithFilters = React.memo(
   (props: CloudPulseDashboardWithFiltersProp) => {
-    const { dashboardId, resource } = props;
+    const { dashboardId, resource, region } = props;
     const { data: dashboard, isError } =
       useCloudPulseDashboardByIdQuery(dashboardId);
     const [filterData, setFilterData] = React.useState<FilterData>({
@@ -43,6 +48,8 @@ export const CloudPulseDashboardWithFilters = React.memo(
       label: {},
     });
 
+    const [groupBy, setGroupBy] = React.useState<string[]>([]);
+
     const [timeDuration, setTimeDuration] =
       React.useState<DateTimeWithPreset>();
 
@@ -71,6 +78,10 @@ export const CloudPulseDashboardWithFilters = React.memo(
       []
     );
 
+    const handleGroupByChange = React.useCallback((groupBy: string[]) => {
+      setGroupBy(groupBy);
+    }, []);
+
     const handleTimeRangeChange = React.useCallback(
       (timeDuration: DateTimeWithPreset) => {
         setTimeDuration({
@@ -115,7 +126,9 @@ export const CloudPulseDashboardWithFilters = React.memo(
       dashboardObj: dashboard,
       filterValue: filterData.id,
       resource,
+      region,
       timeDuration,
+      groupBy,
     });
 
     return (
@@ -139,11 +152,21 @@ export const CloudPulseDashboardWithFilters = React.memo(
                   defaultValue={dashboardId}
                   isServiceIntegration
                 />
-
-                <CloudPulseDateTimeRangePicker
-                  handleStatsChange={handleTimeRangeChange}
-                  savePreferences
-                />
+                <Box
+                  display="flex"
+                  flexDirection={{ md: 'row', xs: 'column' }}
+                  flexWrap="wrap"
+                  gap={2}
+                >
+                  <CloudPulseDateTimeRangePicker
+                    handleStatsChange={handleTimeRangeChange}
+                    savePreferences
+                  />
+                  <GlobalFilterGroupByRenderer
+                    handleChange={handleGroupByChange}
+                    selectedDashboard={dashboard}
+                  />
+                </Box>
               </Box>
             </GridLegacy>
 
@@ -162,7 +185,13 @@ export const CloudPulseDashboardWithFilters = React.memo(
                 emitFilterChange={onFilterChange}
                 handleToggleAppliedFilter={toggleAppliedFilter}
                 isServiceAnalyticsIntegration
-                resource_ids={[resource]}
+                resource_ids={
+                  dashboard.service_type !== 'objectstorage'
+                    ? typeof resource === 'number'
+                      ? [resource]
+                      : undefined
+                    : undefined
+                }
               />
             )}
             <GridLegacy
@@ -188,7 +217,9 @@ export const CloudPulseDashboardWithFilters = React.memo(
               dashboardObj: dashboard,
               filterValue: filterData.id,
               resource,
+              region,
               timeDuration,
+              groupBy,
             })}
             linodeRegion={
               filterData.id[LINODE_REGION]
diff --git a/packages/manager/src/features/CloudPulse/GroupBy/CloudPulseGroupByDrawer.tsx b/packages/manager/src/features/CloudPulse/GroupBy/CloudPulseGroupByDrawer.tsx
index 13a8694df9e..30907f5a7a3 100644
--- a/packages/manager/src/features/CloudPulse/GroupBy/CloudPulseGroupByDrawer.tsx
+++ b/packages/manager/src/features/CloudPulse/GroupBy/CloudPulseGroupByDrawer.tsx
@@ -76,7 +76,7 @@ export const CloudPulseGroupByDrawer = React.memo(
     const [selectedValue, setSelectedValue] = React.useState<GroupByOption[]>(
       defaultValue.slice(
         0,
-        Math.min(defaultValue.length ?? 0, GROUP_BY_SELECTION_LIMIT)
+        Math.min(defaultValue.length, GROUP_BY_SELECTION_LIMIT)
       )
     );
     const previousValueRef = React.useRef<GroupByOption[]>(
@@ -94,7 +94,7 @@ export const CloudPulseGroupByDrawer = React.memo(
     React.useEffect(() => {
       const value = defaultValue.slice(
         0,
-        Math.min(defaultValue.length ?? 0, GROUP_BY_SELECTION_LIMIT)
+        Math.min(defaultValue.length, GROUP_BY_SELECTION_LIMIT)
       );
       onApply(value);
       setSelectedValue(value);
diff --git a/packages/manager/src/features/CloudPulse/GroupBy/GlobalFilterGroupByRenderer.tsx b/packages/manager/src/features/CloudPulse/GroupBy/GlobalFilterGroupByRenderer.tsx
index 193ee4480f6..836cb2a0dee 100644
--- a/packages/manager/src/features/CloudPulse/GroupBy/GlobalFilterGroupByRenderer.tsx
+++ b/packages/manager/src/features/CloudPulse/GroupBy/GlobalFilterGroupByRenderer.tsx
@@ -65,7 +65,9 @@ export const GlobalFilterGroupByRenderer = (
           sx={(theme) => ({
             marginBlockEnd: 'auto',
             marginTop: { md: theme.spacingFunction(28) },
-            color: isSelected ? theme.color.buttonPrimaryHover : 'inherit',
+            color: isSelected
+              ? theme.tokens.component.Button.Primary.Hover.Background
+              : 'inherit',
           })}
         >
           <GroupByIcon height="24px" width="24px" />
diff --git a/packages/manager/src/features/CloudPulse/Overview/GlobalFilters.test.tsx b/packages/manager/src/features/CloudPulse/Overview/GlobalFilters.test.tsx
index 79a911c5c22..b3539af8a8f 100644
--- a/packages/manager/src/features/CloudPulse/Overview/GlobalFilters.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Overview/GlobalFilters.test.tsx
@@ -10,11 +10,13 @@ const mockHandleAnyFilterChange = vi.fn();
 const mockHandleDashboardChange = vi.fn();
 const mockHandleTimeDurationChange = vi.fn();
 const mockHandleToggleAppliedFilter = vi.fn();
+const mockHandleGroupByChange = vi.fn();
 const setup = () => {
   renderWithTheme(
     <GlobalFilters
       handleAnyFilterChange={mockHandleAnyFilterChange}
       handleDashboardChange={mockHandleDashboardChange}
+      handleGroupByChange={mockHandleGroupByChange}
       handleTimeDurationChange={mockHandleTimeDurationChange}
       handleToggleAppliedFilter={mockHandleToggleAppliedFilter}
     />
diff --git a/packages/manager/src/features/CloudPulse/Overview/GlobalFilters.tsx b/packages/manager/src/features/CloudPulse/Overview/GlobalFilters.tsx
index 69663ae83a4..6d66ec243ec 100644
--- a/packages/manager/src/features/CloudPulse/Overview/GlobalFilters.tsx
+++ b/packages/manager/src/features/CloudPulse/Overview/GlobalFilters.tsx
@@ -6,6 +6,7 @@ import * as React from 'react';
 import Reload from 'src/assets/icons/refresh.svg';
 import { useResourcesQuery } from 'src/queries/cloudpulse/resources';
 
+import { GlobalFilterGroupByRenderer } from '../GroupBy/GlobalFilterGroupByRenderer';
 import { CloudPulseDashboardFilterBuilder } from '../shared/CloudPulseDashboardFilterBuilder';
 import { CloudPulseDashboardSelect } from '../shared/CloudPulseDashboardSelect';
 import { CloudPulseDateTimeRangePicker } from '../shared/CloudPulseDateTimeRangePicker';
@@ -29,6 +30,7 @@ export interface GlobalFilterProperties {
     labels: string[]
   ): void;
   handleDashboardChange(dashboard: Dashboard | undefined): void;
+  handleGroupByChange: (selectedValues: string[]) => void;
   handleTimeDurationChange(timeDuration: DateTimeWithPreset): void;
   handleToggleAppliedFilter(isVisible: boolean): void;
 }
@@ -39,6 +41,7 @@ export const GlobalFilters = React.memo((props: GlobalFilterProperties) => {
     handleDashboardChange,
     handleTimeDurationChange,
     handleToggleAppliedFilter,
+    handleGroupByChange,
   } = props;
 
   const { preferences, updateGlobalFilterPreference: updatePreferences } =
@@ -129,6 +132,7 @@ export const GlobalFilters = React.memo((props: GlobalFilterProperties) => {
               handleStatsChange={handleTimeRangeChange}
               savePreferences
             />
+
             <CloudPulseTooltip placement="bottom-end" title="Refresh">
               <IconButton
                 aria-label="Refresh Dashboard Metrics"
@@ -145,6 +149,10 @@ export const GlobalFilters = React.memo((props: GlobalFilterProperties) => {
                 <Reload height="24px" width="24px" />
               </IconButton>
             </CloudPulseTooltip>
+            <GlobalFilterGroupByRenderer
+              handleChange={handleGroupByChange}
+              selectedDashboard={selectedDashboard}
+            />
           </Box>
         </Box>
       </GridLegacy>
diff --git a/packages/manager/src/features/CloudPulse/Utils/CloudPulseDateTimePickerUtils.ts b/packages/manager/src/features/CloudPulse/Utils/CloudPulseDateTimePickerUtils.ts
index 4b7033363ec..75fb3dbfff2 100644
--- a/packages/manager/src/features/CloudPulse/Utils/CloudPulseDateTimePickerUtils.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/CloudPulseDateTimePickerUtils.ts
@@ -1,7 +1,17 @@
+/**
+ * Utility functions for handling date and time operations for CloudPulse.
+ */
+
 import { DateTime } from 'luxon';
 
 import type { DateTimeWithPreset } from '@linode/api-v4';
 
+/**
+ * Returns the default time duration, which is the last 30 minutes from the current time.
+ *
+ * @param timezone Optional timezone to use. If not provided, the local timezone is used.
+ * @returns An object containing start time, end time, preset, and timezone.
+ */
 export const defaultTimeDuration = (timezone?: string): DateTimeWithPreset => {
   const date = DateTime.now()
     .set({ second: 0 })
@@ -9,12 +19,19 @@ export const defaultTimeDuration = (timezone?: string): DateTimeWithPreset => {
 
   return {
     end: date.toISO() ?? '',
-    preset: 'last 30 minutes',
-    start: date.minus({ minutes: 30 }).toISO() ?? '',
+    preset: 'last hour',
+    start: date.minus({ hours: 1 }).toISO() ?? '',
     timeZone: timezone,
   };
 };
 
+/**
+ * Converts a date string to GMT timezone.
+ *
+ * @param date ISO date string to convert
+ * @param timeZone Optional timezone of the input date. If not provided, the local timezone is used.
+ * @returns ISO date string in GMT timezone (with 'Z' suffix)
+ */
 export const convertToGmt = (date: string, timeZone?: string): string => {
   const dateObject = DateTime.fromISO(date).setZone(
     timeZone ?? DateTime.local().zoneName
@@ -23,3 +40,68 @@ export const convertToGmt = (date: string, timeZone?: string): string => {
 
   return updatedDate.toISO()?.split('.')[0] + 'Z';
 };
+
+/**
+ * Calculates the start and end times based on a preset time range.
+ *
+ * @param currentValue The current date time range with preset
+ * @param timeZone The timezone to use for calculations
+ * @returns An object with updated start and end dates based on the preset
+ */
+export function getTimeFromPreset(
+  currentValue: DateTimeWithPreset,
+  timeZone: string
+): DateTimeWithPreset {
+  const today = DateTime.now().setZone(timeZone);
+  const { start, end, preset } = currentValue;
+  let selectedPreset = preset;
+  let startDate: string;
+  let endDate: string;
+  switch (preset) {
+    case 'last 7 days':
+      startDate = today.minus({ days: 7 }).toISO() ?? start;
+      endDate = today.toISO() ?? end;
+      break;
+
+    case 'last 12 hours':
+      startDate = today.minus({ hours: 12 }).toISO() ?? start;
+      endDate = today.toISO() ?? end;
+      break;
+    case 'last 30 days':
+      startDate = today.minus({ days: 30 }).toISO() ?? start;
+      endDate = today.toISO() ?? end;
+      break;
+    case 'last 30 minutes':
+      startDate = today.minus({ minutes: 30 }).toISO() ?? start;
+      endDate = today.toISO() ?? end;
+      break;
+    case 'last day':
+      startDate = today.minus({ days: 1 }).toISO() ?? start;
+      endDate = today.toISO() ?? end;
+      break;
+    case 'last hour':
+      startDate = today.minus({ hours: 1 }).toISO() ?? start;
+      endDate = today.toISO() ?? end;
+      break;
+    case 'last month':
+      startDate = today.minus({ months: 1 }).startOf('month').toISO() ?? start;
+      endDate = today.minus({ months: 1 }).endOf('month').toISO() ?? end;
+      break;
+    case 'this month':
+      startDate = today.startOf('month').toISO() ?? start;
+      endDate = today.toISO() ?? end;
+      break;
+    default:
+      // Reset to provided values or empty strings if none provided
+      startDate = start;
+      endDate = end;
+      selectedPreset = 'reset';
+  }
+
+  return {
+    start: startDate,
+    end: endDate,
+    preset: selectedPreset,
+    timeZone,
+  };
+}
diff --git a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.test.ts b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.test.ts
index aba673b33a6..dfb98e4d340 100644
--- a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.test.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.test.ts
@@ -1,9 +1,12 @@
 import { formatPercentage } from '@linode/utilities';
 
+import { widgetFactory } from 'src/factories';
+
 import {
   generateGraphData,
   generateMaxUnit,
   getDimensionName,
+  getEntityIds,
   getLabelName,
   getTimeDurationFromPreset,
   mapResourceIdToName,
@@ -261,4 +264,26 @@ describe('getTimeDurationFromPreset method', () => {
     const result = getTimeDurationFromPreset('15min');
     expect(result).toBe(undefined);
   });
+
+  describe('getEntityIds method', () => {
+    it('should return entity ids for linode service type', () => {
+      const result = getEntityIds(
+        [{ id: '123', label: 'linode-1' }],
+        ['123'],
+        widgetFactory.build(),
+        'linode'
+      );
+      expect(result).toEqual([123]);
+    });
+
+    it('should return entity ids for objectstorage service type', () => {
+      const result = getEntityIds(
+        [{ id: 'bucket-1', label: 'bucket-name-1' }],
+        ['bucket-1'],
+        widgetFactory.build(),
+        'objectstorage'
+      );
+      expect(result).toEqual(['bucket-1']);
+    });
+  });
 });
diff --git a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts
index 125da415326..ee373ad8cc2 100644
--- a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts
@@ -32,8 +32,7 @@ export interface LabelNameOptionsProps {
   /**
    * array of group by fields
    */
-  groupBy: string[];
-
+  groupBy?: string[];
   /**
    * Boolean to check if metric name should be hidden
    */
@@ -49,6 +48,11 @@ export interface LabelNameOptionsProps {
    */
   metric: { [label: string]: string };
 
+  /**
+   * label for the current metric
+   */
+  metricLabel?: string;
+
   /**
    * list of CloudPulseResources available
    */
@@ -69,13 +73,17 @@ interface GraphDataOptionsProps {
   /**
    * array of group by fields
    */
-  groupBy: string[];
-
+  groupBy?: string[];
   /**
    * label for the graph title
    */
   label: string;
 
+  /**
+   * label for the current metric
+   */
+  metricLabel?: string;
+
   /**
    * data that will be displayed on graph
    */
@@ -113,16 +121,28 @@ interface MetricRequestProps {
    */
   entityIds: string[];
 
+  groupBy?: string[];
+
   /**
    * selected linode region for the widget
    */
   linodeRegion?: string;
 
+  /**
+   * selected region for the widget
+   */
+  region?: string;
+
   /**
    * list of CloudPulse resources available
    */
   resources: CloudPulseResources[];
 
+  /**
+   * service type of the widget
+   */
+  serviceType: CloudPulseServiceType;
+
   /**
    * widget filters for metrics data
    */
@@ -133,16 +153,19 @@ export interface DimensionNameProperties {
   /**
    * array of group by fields
    */
-  groupBy: string[];
+  groupBy?: string[];
   /**
    * Boolean to check if metric name should be hidden
    */
   hideMetricName?: boolean;
-
   /**
    * metric key-value to generate dimension name
    */
   metric: { [label: string]: string };
+  /**
+   * label for the current metric
+   */
+  metricLabel?: string;
 
   /**
    * resources list of CloudPulseResources available
@@ -182,8 +205,16 @@ interface GraphData {
  * @returns parameters which will be necessary to populate graph & legends
  */
 export const generateGraphData = (props: GraphDataOptionsProps): GraphData => {
-  const { label, metricsList, resources, serviceType, status, unit, groupBy } =
-    props;
+  const {
+    label,
+    metricsList,
+    resources,
+    serviceType,
+    status,
+    unit,
+    groupBy,
+    metricLabel,
+  } = props;
   const legendRowsData: MetricsDisplayRow[] = [];
   const dimension: { [timestamp: number]: { [label: string]: number } } = {};
   const areas: AreaProps[] = [];
@@ -221,6 +252,7 @@ export const generateGraphData = (props: GraphDataOptionsProps): GraphData => {
           hideMetricName,
           serviceType,
           groupBy,
+          metricLabel,
         };
         const labelName = getLabelName(labelOptions);
         const data = seriesDataFormatter(transformedData.values, start, end);
@@ -304,20 +336,27 @@ export const generateMaxUnit = (
 export const getCloudPulseMetricRequest = (
   props: MetricRequestProps
 ): CloudPulseMetricsRequest => {
-  const { duration, entityIds, resources, widget, linodeRegion } = props;
+  const {
+    duration,
+    entityIds,
+    resources,
+    widget,
+    groupBy,
+    linodeRegion,
+    region,
+    serviceType,
+  } = props;
   const preset = duration.preset;
-
+  const presetDuration = getTimeDurationFromPreset(preset);
   return {
     absolute_time_duration:
-      preset !== 'reset' && preset !== 'this month' && preset !== 'last month'
-        ? undefined
-        : { end: duration.end, start: duration.start },
-    entity_ids: resources
-      ? entityIds.map((id) => parseInt(id, 10))
-      : widget.entity_ids.map((id) => parseInt(id, 10)),
+      presetDuration === undefined
+        ? { end: duration.end, start: duration.start }
+        : undefined,
+    entity_ids: getEntityIds(resources, entityIds, widget, serviceType),
     filters: undefined,
-    group_by: widget.group_by,
-    relative_time_duration: getTimeDurationFromPreset(preset),
+    group_by: !groupBy?.length ? undefined : groupBy,
+    relative_time_duration: presetDuration,
     metrics: [
       {
         aggregate_function: widget.aggregate_function,
@@ -332,9 +371,31 @@ export const getCloudPulseMetricRequest = (
             value: widget.time_granularity.value,
           },
     associated_entity_region: linodeRegion,
+    entity_region: serviceType === 'objectstorage' ? region : undefined,
   };
 };
 
+/**
+ *
+ * @param resources list of CloudPulse resources
+ * @param entityIds list of entity ids
+ * @param widget widget
+ * @returns transformed entity ids
+ */
+export const getEntityIds = (
+  resources: CloudPulseResources[],
+  entityIds: string[],
+  widget: Widgets,
+  serviceType: CloudPulseServiceType
+) => {
+  if (serviceType === 'objectstorage') {
+    return entityIds;
+  }
+  return resources
+    ? entityIds.map((id) => parseInt(id, 10))
+    : widget.entity_ids.map((id) => parseInt(id, 10));
+};
+
 /**
  *
  * @returns generated label name for graph dimension
@@ -348,6 +409,7 @@ export const getLabelName = (props: LabelNameOptionsProps): string => {
     hideMetricName = false,
     serviceType,
     groupBy,
+    metricLabel,
   } = props;
   // aggregated metric, where metric keys will be 0
   if (!Object.keys(metric).length) {
@@ -361,6 +423,7 @@ export const getLabelName = (props: LabelNameOptionsProps): string => {
     hideMetricName,
     serviceType,
     groupBy,
+    metricLabel,
   });
 };
 
@@ -375,7 +438,8 @@ export const getDimensionName = (props: DimensionNameProperties): string => {
     resources,
     hideMetricName = false,
     serviceType,
-    groupBy,
+    groupBy = [],
+    metricLabel = '',
   } = props;
   const labels: string[] = new Array(groupBy.length).fill('');
   Object.entries(metric).forEach(([key, value]) => {
@@ -416,7 +480,8 @@ export const getDimensionName = (props: DimensionNameProperties): string => {
       labels.push(dimensionValue);
     }
   });
-  return labels.filter(Boolean).join(' | ');
+  const label = labels.filter(Boolean).join(' | ');
+  return label || metricLabel;
 };
 
 /**
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts
index 217a73b1222..c4fcb62af9a 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.test.ts
@@ -1,13 +1,19 @@
 import { databaseQueries } from '@linode/queries';
 import { DateTime } from 'luxon';
 
-import { dashboardFactory, databaseInstanceFactory } from 'src/factories';
+import {
+  dashboardFactory,
+  databaseInstanceFactory,
+  objectStorageEndpointsFactory,
+} from 'src/factories';
 
 import { RESOURCE_ID, RESOURCES } from './constants';
 import {
   deepEqual,
   filterBasedOnConfig,
+  filterEndpointsUsingRegion,
   filterUsingDependentFilters,
+  getEndpointsProperties,
   getFilters,
   getTextFilterProperties,
 } from './FilterBuilder';
@@ -25,6 +31,7 @@ import {
 import { FILTER_CONFIG } from './FilterConfig';
 import { CloudPulseAvailableViews, CloudPulseSelectTypes } from './models';
 
+import type { CloudPulseEndpoints } from '../shared/CloudPulseEndpointsSelect';
 import type { CloudPulseResources } from '../shared/CloudPulseResourcesSelect';
 import type { CloudPulseServiceTypeFilters } from './models';
 
@@ -40,6 +47,13 @@ const firewallConfig = FILTER_CONFIG.get(4);
 
 const dbaasDashboard = dashboardFactory.build({ service_type: 'dbaas', id: 1 });
 
+const objectStorageBucketDashboard = dashboardFactory.build({
+  service_type: 'objectstorage',
+  id: 6,
+});
+
+const objectStorageBucketConfig = FILTER_CONFIG.get(6);
+
 it('test getRegionProperties method', () => {
   const regionConfig = linodeConfig?.filters.find(
     (filterObj) => filterObj.name === 'Region'
@@ -402,6 +416,46 @@ it('test getTextFilterProperties method for interface_id', () => {
   }
 });
 
+it('test getEndpointsProperties method', () => {
+  const endpointsConfig = objectStorageBucketConfig?.filters.find(
+    (filterObj) => filterObj.name === 'Endpoints'
+  );
+
+  expect(endpointsConfig).toBeDefined();
+
+  if (endpointsConfig) {
+    const endpointsProperties = getEndpointsProperties(
+      {
+        config: endpointsConfig,
+        dashboard: objectStorageBucketDashboard,
+        dependentFilters: { region: 'us-east' },
+        isServiceAnalyticsIntegration: false,
+      },
+      vi.fn()
+    );
+    const {
+      label,
+      serviceType,
+      disabled,
+      savePreferences,
+      handleEndpointsSelection,
+      defaultValue,
+      region,
+      xFilter,
+    } = endpointsProperties;
+
+    expect(endpointsProperties).toBeDefined();
+    expect(label).toEqual(endpointsConfig.configuration.name);
+    expect(serviceType).toEqual('objectstorage');
+    expect(savePreferences).toEqual(true);
+    expect(disabled).toEqual(false);
+    expect(handleEndpointsSelection).toBeDefined();
+    expect(defaultValue).toEqual(undefined);
+    expect(region).toEqual('us-east');
+    expect(xFilter).toEqual({ region: 'us-east' });
+  }
+});
+
 it('test getFiltersForMetricsCallFromCustomSelect method', () => {
   const result = getMetricsCallCustomFilters(
     {
@@ -556,6 +610,32 @@ describe('filterUsingDependentFilters', () => {
   });
 });
 
+describe('filterEndpointsUsingRegion', () => {
+  const mockData: CloudPulseEndpoints[] = [
+    {
+      ...objectStorageEndpointsFactory.build({ region: 'us-east' }),
+      label: 'us-east-1.linodeobjects.com',
+    },
+    {
+      ...objectStorageEndpointsFactory.build({ region: 'us-west' }),
+      label: 'us-west-1.linodeobjects.com',
+    },
+  ];
+  it('should return data as is if data is undefined', () => {
+    expect(
+      filterEndpointsUsingRegion(undefined, { region: 'us-east' })
+    ).toEqual(undefined);
+  });
+  it('should return undefined if region filter is undefined', () => {
+    expect(filterEndpointsUsingRegion(mockData, undefined)).toEqual(undefined);
+  });
+  it('should return endpoints based on region if region filter is provided', () => {
+    expect(filterEndpointsUsingRegion(mockData, { region: 'us-east' })).toEqual(
+      [mockData[0]]
+    );
+  });
+});
+
 describe('filterBasedOnConfig', () => {
   const config: CloudPulseServiceTypeFilters = {
     configuration: {
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts
index 0998166afc6..a875dec9481 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterBuilder.ts
@@ -14,6 +14,8 @@ import type {
   FilterValueType,
 } from '../Dashboard/CloudPulseDashboardLanding';
 import type { CloudPulseCustomSelectProps } from '../shared/CloudPulseCustomSelect';
+import type { CloudPulseEndpointsSelectProps } from '../shared/CloudPulseEndpointsSelect';
+import type { CloudPulseEndpoints } from '../shared/CloudPulseEndpointsSelect';
 import type { CloudPulseNodeTypeFilterProps } from '../shared/CloudPulseNodeTypeFilter';
 import type { CloudPulseRegionSelectProps } from '../shared/CloudPulseRegionSelect';
 import type {
@@ -359,6 +361,48 @@ export const getTextFilterProperties = (
   };
 };
 
+/**
+ * This function helps in building the properties needed for endpoints selection component
+ *
+ * @param config - accepts a CloudPulseServiceTypeFilters of endpoints key
+ * @param handleEndpointsChange - the callback when we select new endpoints
+ * @param dashboard - the actual selected dashboard
+ * @param isServiceAnalyticsIntegration - only if this is false, we need to save preferences , else no need
+ * @returns CloudPulseEndpointsSelectProps
+ */
+export const getEndpointsProperties = (
+  props: CloudPulseFilterProperties,
+  handleEndpointsChange: (endpoints: string[], savePref?: boolean) => void
+): CloudPulseEndpointsSelectProps => {
+  const { filterKey, name: label, placeholder } = props.config.configuration;
+  const {
+    config,
+    dashboard,
+    dependentFilters,
+    isServiceAnalyticsIntegration,
+    preferences,
+    shouldDisable,
+  } = props;
+  return {
+    defaultValue: preferences?.[config.configuration.filterKey],
+    disabled:
+      shouldDisable ||
+      shouldDisableFilterByFilterKey(
+        filterKey,
+        dependentFilters ?? {},
+        dashboard,
+        preferences
+      ),
+    handleEndpointsSelection: handleEndpointsChange,
+    label,
+    placeholder,
+    serviceType: dashboard.service_type,
+    region: dependentFilters?.[REGION],
+    savePreferences: !isServiceAnalyticsIntegration,
+    xFilter: filterBasedOnConfig(config, dependentFilters ?? {}),
+  };
+};
+
 /**
  * This function helps in builder the xFilter needed to passed in a apiV4 call
  *
@@ -665,11 +709,37 @@ export const filterUsingDependentFilters = (
 
       if (Array.isArray(resourceValue) && Array.isArray(filterValue)) {
         return filterValue.some((val) => resourceValue.includes(String(val)));
-      } else if (Array.isArray(resourceValue)) {
+      }
+      if (Array.isArray(resourceValue)) {
         return resourceValue.includes(String(filterValue));
-      } else {
-        return resourceValue === filterValue;
       }
+      if (Array.isArray(filterValue)) {
+        return (filterValue as string[]).includes(String(resourceValue));
+      }
+      return resourceValue === filterValue;
     });
   });
+}
+
+/**
+ * @param data The endpoints for which the filter needs to be applied
+ * @param regionFilter The selected region filter that will be used to filter the endpoints
+ * @returns The filtered endpoints
+ */
+export const filterEndpointsUsingRegion = (
+  data?: CloudPulseEndpoints[],
+  regionFilter?: CloudPulseMetricsFilter
+): CloudPulseEndpoints[] | undefined => {
+  if (!data) {
+    return data;
+  }
+
+  const regionFromFilter = regionFilter?.region;
+
+  // If no region filter is provided, return undefined as region is mandatory filter
+  if (!regionFromFilter) {
+    return undefined;
+  }
+
+  return data.filter(({ region }) => region === regionFromFilter);
 };
diff --git a/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
index c93438a7e29..c152b66ab0d 100644
--- a/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/FilterConfig.ts
@@ -1,8 +1,10 @@
 import { capabilityServiceTypeMapping } from '@linode/api-v4';
 
 import {
+  ENDPOINT,
   INTERFACE_IDS_PLACEHOLDER_TEXT,
   LINODE_REGION,
+  REGION,
   RESOURCE_ID,
 } from './constants';
 import { CloudPulseAvailableViews, CloudPulseSelectTypes } from './models';
@@ -315,6 +317,55 @@ export const FIREWALL_CONFIG: Readonly<CloudPulseServiceTypeFilterMap> = {
   serviceType: 'firewall',
 };
 
+export const OBJECTSTORAGE_CONFIG_BUCKET: Readonly<CloudPulseServiceTypeFilterMap> =
+  {
+    capability: capabilityServiceTypeMapping['objectstorage'],
+    filters: [
+      {
+        configuration: {
+          filterKey: REGION,
+          filterType: 'string',
+          isFilterable: true,
+          isMetricsFilter: true,
+          name: 'Region',
+          priority: 1,
+          neededInViews: [CloudPulseAvailableViews.central],
+        },
+        name: 'Region',
+      },
+      {
+        configuration: {
+          dependency: [REGION],
+          filterKey: ENDPOINT,
+          filterType: 'string',
+          isFilterable: false,
+          isMetricsFilter: false,
+          isMultiSelect: true,
+          name: 'Endpoints',
+          priority: 2,
+          neededInViews: [CloudPulseAvailableViews.central],
+        },
+        name: 'Endpoints',
+      },
+      {
+        configuration: {
+          dependency: [REGION, ENDPOINT],
+          filterKey: RESOURCE_ID,
+          filterType: 'string',
+          isFilterable: true,
+          isMetricsFilter: true,
+          isMultiSelect: true,
+          name: 'Buckets',
+          neededInViews: [CloudPulseAvailableViews.central],
+          placeholder: 'Select Buckets',
+          priority: 3,
+        },
+        name: 'Buckets',
+      },
+    ],
+    serviceType: 'objectstorage',
+  };
+
 export const FILTER_CONFIG: Readonly<
   Map<number, CloudPulseServiceTypeFilterMap>
 > = new Map([
@@ -322,4 +373,5 @@ export const FILTER_CONFIG: Readonly<
   [2, LINODE_CONFIG],
   [3, NODEBALANCER_CONFIG],
   [4, FIREWALL_CONFIG],
+  [6, OBJECTSTORAGE_CONFIG_BUCKET],
 ]);
diff --git a/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.test.ts b/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.test.ts
index 71a9c75d244..1f68344cf67 100644
--- a/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.test.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.test.ts
@@ -19,11 +19,15 @@ it('test getDashboardProperties method', () => {
     dashboardObj: mockDashboard,
     filterValue: { region: 'us-east' },
     resource: 1,
+    groupBy: [],
+    region: 'us-east',
   });
 
   expect(result).toBeDefined();
   expect(result.dashboardId).toEqual(mockDashboard.id);
+  expect(result.serviceType).toEqual(mockDashboard.service_type);
   expect(result.resources).toEqual(['1']);
+  expect(result.region).toEqual('us-east');
 });
 
 it('test checkMandatoryFiltersSelected method for time duration and resource', () => {
@@ -31,6 +35,7 @@ it('test checkMandatoryFiltersSelected method for time duration and resource', (
     dashboardObj: mockDashboard,
     filterValue: { region: 'us-east' },
     resource: 0,
+    groupBy: [],
   });
   expect(result).toBe(false);
   result = checkMandatoryFiltersSelected({
@@ -42,6 +47,7 @@ it('test checkMandatoryFiltersSelected method for time duration and resource', (
       preset,
       start: start.toISO(),
     },
+    groupBy: [],
   });
 
   expect(result).toBe(true);
@@ -51,6 +57,7 @@ it('test checkMandatoryFiltersSelected method for time duration and resource', (
     filterValue: { region: 'us-east' },
     resource: 1,
     timeDuration: undefined, // here time duration is undefined, so it should return false
+    groupBy: [],
   });
 
   expect(result).toBe(false);
@@ -60,6 +67,7 @@ it('test checkMandatoryFiltersSelected method for time duration and resource', (
     filterValue: { region: 'us-east' },
     resource: 0, // here resource is 0, so it should return false
     timeDuration: { end: end.toISO(), preset, start: start.toISO() },
+    groupBy: [],
   });
 
   expect(result).toBe(false);
@@ -72,6 +80,7 @@ it('test checkMandatoryFiltersSelected method for role', () => {
     filterValue: { region: 'us-east' }, // here role is missing
     resource: 1,
     timeDuration: { end: end.toISO(), preset, start: start.toISO() },
+    groupBy: [],
   });
 
   expect(result).toBe(false);
@@ -81,17 +90,42 @@ it('test checkMandatoryFiltersSelected method for role', () => {
     filterValue: { node_type: 'primary', region: 'us-east' },
     resource: 1,
     timeDuration: { end: end.toISO(), preset, start: start.toISO() },
+    groupBy: [],
   });
 
   expect(result).toBe(true);
 });
 
+it('checkMandatoryFiltersSelected method should return false if no region is selected for objectstorage service type', () => {
+  const result = checkMandatoryFiltersSelected({
+    dashboardObj: { ...mockDashboard, service_type: 'objectstorage', id: 6 },
+    filterValue: {},
+    resource: 1,
+    timeDuration: { end: end.toISO(), preset, start: start.toISO() },
+    groupBy: [],
+  });
+  expect(result).toBe(false);
+});
+
+it('checkMandatoryFiltersSelected method should return true if region is selected for objectstorage service type', () => {
+  const result = checkMandatoryFiltersSelected({
+    dashboardObj: { ...mockDashboard, service_type: 'objectstorage', id: 6 },
+    filterValue: {},
+    resource: 1,
+    timeDuration: { end: end.toISO(), preset, start: start.toISO() },
+    groupBy: [],
+    region: 'ap-west',
+  });
+  expect(result).toBe(true);
+});
+
 it('test constructDimensionFilters method', () => {
   mockDashboard.service_type = 'dbaas';
   const result = constructDimensionFilters({
     dashboardObj: mockDashboard,
     filterValue: { node_type: 'primary' },
     resource: 1,
+    groupBy: [],
   });
 
   expect(result.length).toEqual(1);
diff --git a/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.ts b/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.ts
index 8c9d9181d9d..edce614f656 100644
--- a/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/ReusableDashboardFilterUtils.ts
@@ -19,10 +19,18 @@ interface ReusableDashboardFilterUtilProps {
    * The selected filter values
    */
   filterValue: CloudPulseMetricsFilter;
+  /**
+   * The selected grouping criteria
+   */
+  groupBy: string[];
+  /**
+   * The selected region
+   */
+  region?: string;
   /**
    * The selected resource id
    */
-  resource: number;
+  resource: number | string;
   /**
    * The selected time duration
    */
@@ -36,17 +44,22 @@ interface ReusableDashboardFilterUtilProps {
 export const getDashboardProperties = (
   props: ReusableDashboardFilterUtilProps
 ): DashboardProperties => {
-  const { dashboardObj, filterValue, resource, timeDuration } = props;
+  const { dashboardObj, filterValue, resource, timeDuration, groupBy, region } =
+    props;
   return {
     additionalFilters: constructDimensionFilters({
       dashboardObj,
       filterValue,
       resource,
+      groupBy,
     }),
     dashboardId: dashboardObj.id,
     duration: timeDuration ?? defaultTimeDuration(),
     resources: [String(resource)],
+    serviceType: dashboardObj.service_type,
     savePref: false,
+    groupBy,
+    region,
   };
 };
 
@@ -57,7 +70,7 @@ export const getDashboardProperties = (
 export const checkMandatoryFiltersSelected = (
   props: ReusableDashboardFilterUtilProps
 ): boolean => {
-  const { dashboardObj, filterValue, resource, timeDuration } = props;
+  const { dashboardObj, filterValue, resource, timeDuration, region } = props;
   const serviceTypeConfig = FILTER_CONFIG.get(dashboardObj.id);
 
   if (!serviceTypeConfig) {
@@ -68,6 +81,10 @@ export const checkMandatoryFiltersSelected = (
     return false;
   }
 
+  if (dashboardObj.service_type === 'objectstorage' && !region) {
+    return false;
+  }
+
   return serviceTypeConfig.filters.every(({ configuration }) => {
     const { filterKey, neededInViews } = configuration;
 
diff --git a/packages/manager/src/features/CloudPulse/Utils/constants.ts b/packages/manager/src/features/CloudPulse/Utils/constants.ts
index 786a4795805..64f98ddbbe4 100644
--- a/packages/manager/src/features/CloudPulse/Utils/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/constants.ts
@@ -8,6 +8,10 @@ export const SECONDARY_NODE = 'secondary';
 
 export const REGION = 'region';
 
+export const ENTITY_REGION = 'entity_region';
+
+export const ENDPOINT = 'endpoint';
+
 export const LINODE_REGION = 'associated_entity_region';
 
 export const RESOURCES = 'resources';
@@ -85,6 +89,7 @@ export const NO_REGION_MESSAGE: Record<string, string> = {
   linode: 'No Linodes configured in any regions.',
   nodebalancer: 'No NodeBalancers configured in any regions.',
   firewall: 'No firewalls configured in any Linode regions.',
+  objectstorage: 'No Object Storage buckets configured in any region.',
 };
 
 export const HELPER_TEXT: Record<string, string> = {
diff --git a/packages/manager/src/features/CloudPulse/Utils/utils.ts b/packages/manager/src/features/CloudPulse/Utils/utils.ts
index 8916d7fedce..7829f8de042 100644
--- a/packages/manager/src/features/CloudPulse/Utils/utils.ts
+++ b/packages/manager/src/features/CloudPulse/Utils/utils.ts
@@ -5,6 +5,7 @@ import React from 'react';
 import { convertData } from 'src/features/Longview/shared/formatters';
 import { useFlags } from 'src/hooks/useFlags';
 
+import { arraysEqual } from '../Alerts/Utils/utils';
 import {
   INTERFACE_ID,
   INTERFACE_IDS_CONSECUTIVE_COMMAS_ERROR_MESSAGE,
@@ -19,7 +20,6 @@ import {
   PORTS_LIMIT_ERROR_MESSAGE,
   PORTS_RANGE_ERROR_MESSAGE,
 } from './constants';
-import { compareArrays } from './FilterBuilder';
 
 import type {
   Alert,
@@ -93,8 +93,8 @@ export const useContextualAlertsState = (
   const calculateInitialState = React.useCallback(
     (alerts: Alert[], entityId?: string): CloudPulseAlertsPayload => {
       const initialStates: CloudPulseAlertsPayload = {
-        system: [],
-        user: [],
+        system_alerts: [],
+        user_alerts: [],
       };
 
       alerts.forEach((alert) => {
@@ -107,7 +107,9 @@ export const useContextualAlertsState = (
           : isAccountOrRegion;
 
         if (shouldInclude) {
-          initialStates[alert.type]?.push(alert.id);
+          const payloadAlertType =
+            alert.type === 'system' ? 'system_alerts' : 'user_alerts';
+          initialStates[payloadAlertType]?.push(alert.id);
         }
       });
 
@@ -131,8 +133,8 @@ export const useContextualAlertsState = (
   // Check if the enabled alerts have changed from the initial state
   const hasUnsavedChanges = React.useMemo(() => {
     return (
-      !compareArrays(enabledAlerts.system ?? [], initialState.system ?? []) ||
-      !compareArrays(enabledAlerts.user ?? [], initialState.user ?? [])
+      !arraysEqual(enabledAlerts.system_alerts, initialState.system_alerts) ||
+      !arraysEqual(enabledAlerts.user_alerts, initialState.user_alerts)
     );
   }, [enabledAlerts, initialState]);
 
diff --git a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.test.tsx b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.test.tsx
index 03f61e4c683..0a0309b07e0 100644
--- a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.test.tsx
@@ -27,6 +27,7 @@ const props: CloudPulseWidgetProperties = {
     scrape_interval: '2m',
     unit: 'percent',
   },
+  dashboardId: 1,
   duration: {
     end: DateTime.now().toISO(),
     preset: '30minutes',
diff --git a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx
index 43f00e898e8..c717a0b44d9 100644
--- a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidget.tsx
@@ -7,6 +7,7 @@ import React from 'react';
 import { useFlags } from 'src/hooks/useFlags';
 import { useCloudPulseMetricsQuery } from 'src/queries/cloudpulse/metrics';
 
+import { WidgetFilterGroupByRenderer } from '../GroupBy/WidgetFilterGroupByRenderer';
 import {
   generateGraphData,
   getCloudPulseMetricRequest,
@@ -60,6 +61,11 @@ export interface CloudPulseWidgetProperties {
    */
   availableMetrics: MetricDefinition | undefined;
 
+  /**
+   * ID of the selected dashboard
+   */
+  dashboardId: number;
+
   /**
    * time duration to fetch the metrics data in this widget
    */
@@ -85,6 +91,11 @@ export interface CloudPulseWidgetProperties {
    */
   linodeRegion?: string;
 
+  /**
+   * Selected region for the widget
+   */
+  region?: string;
+
   /**
    * List of resources available of selected service type
    */
@@ -114,7 +125,6 @@ export interface CloudPulseWidgetProperties {
    * color index to be selected from available them if not theme is provided by user
    */
   useColorIndex?: number;
-
   /**
    * this comes from dashboard, has inbuilt metrics, agg_func,group_by,filters,gridsize etc , also helpful in publishing any changes
    */
@@ -138,6 +148,7 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
   const { data: profile } = useProfile();
 
   const [widget, setWidget] = React.useState<Widgets>({ ...props.widget });
+  const [groupBy, setGroupBy] = React.useState<string[]>([]);
 
   const theme = useTheme();
 
@@ -156,6 +167,8 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
     unit,
     widget: widgetProp,
     linodeRegion,
+    dashboardId,
+    region,
   } = props;
 
   const timezone =
@@ -237,7 +250,9 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
     },
     []
   );
-
+  const handleGroupByChange = React.useCallback((selectedGroupBy: string[]) => {
+    setGroupBy(selectedGroupBy);
+  }, []);
   const {
     data: metricsList,
     error,
@@ -251,7 +266,10 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
         entityIds,
         resources,
         widget,
+        groupBy: [...(widgetProp.group_by ?? []), ...groupBy],
         linodeRegion,
+        region,
+        serviceType,
       }),
       filters, // any additional dimension filters will be constructed and passed here
     },
@@ -277,7 +295,8 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
       status,
       unit,
       serviceType,
-      groupBy: widgetProp.group_by,
+      groupBy: [...(widgetProp.group_by ?? []), ...groupBy],
+      metricLabel: availableMetrics?.label,
     });
 
     data = generatedData.dimensions;
@@ -352,7 +371,14 @@ export const CloudPulseWidget = (props: CloudPulseWidgetProperties) => {
                   onAggregateFuncChange={handleAggregateFunctionChange}
                 />
               )}
-              <Box sx={{ display: { lg: 'flex', xs: 'none' } }}>
+              <Box sx={{ display: 'flex', gap: 2 }}>
+                <WidgetFilterGroupByRenderer
+                  dashboardId={dashboardId}
+                  handleChange={handleGroupByChange}
+                  label={widget.label}
+                  metric={widget.metric}
+                  serviceType={serviceType}
+                />
                 <ZoomIcon
                   handleZoomToggle={handleZoomToggle}
                   zoomIn={widget?.size === 12}
diff --git a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidgetRenderer.tsx b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidgetRenderer.tsx
index 571b67c69e6..ee4d5c867b2 100644
--- a/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidgetRenderer.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/CloudPulseWidgetRenderer.tsx
@@ -30,12 +30,17 @@ interface WidgetProps {
   additionalFilters?: CloudPulseMetricsAdditionalFilters[];
   dashboard: Dashboard;
   duration: DateTimeWithPreset;
+  groupBy: string[];
   isJweTokenFetching: boolean;
   jweToken?: JWEToken | undefined;
   linodeRegion?: string;
   manualRefreshTimeStamp?: number;
   metricDefinitions: ResourcePage<MetricDefinition> | undefined;
   preferences?: AclpConfig;
+  /**
+   * Selected region for the widget
+   */
+  region?: string;
   resourceList: CloudPulseResources[] | undefined;
   resources: string[];
   savePref?: boolean;
@@ -65,7 +70,9 @@ export const RenderWidgets = React.memo(
       resourceList,
       resources,
       savePref,
+      groupBy,
       linodeRegion,
+      region,
     } = props;
 
     const getCloudPulseGraphProperties = (
@@ -84,7 +91,12 @@ export const RenderWidgets = React.memo(
         serviceType: dashboard.service_type,
         timeStamp: manualRefreshTimeStamp,
         unit: widget.unit ?? '%',
-        widget: { ...widget, time_granularity: autoIntervalOption },
+        dashboardId: dashboard.id,
+        widget: {
+          ...widget,
+          time_granularity: autoIntervalOption,
+          group_by: groupBy.length === 0 ? undefined : groupBy,
+        },
       };
       if (savePref) {
         graphProp.widget = setPreferredWidgetPlan(graphProp.widget);
@@ -169,6 +181,7 @@ export const RenderWidgets = React.memo(
                 availableMetrics={availMetrics}
                 isJweTokenFetching={isJweTokenFetching}
                 linodeRegion={linodeRegion}
+                region={region}
                 resources={resourceList!}
                 savePref={savePref}
               />
@@ -188,6 +201,7 @@ export const RenderWidgets = React.memo(
       'duration',
       'resources',
       'additionalFilters',
+      'groupBy',
     ];
 
     for (const key of keysToCompare) {
diff --git a/packages/manager/src/features/CloudPulse/Widget/components/Zoomer.tsx b/packages/manager/src/features/CloudPulse/Widget/components/Zoomer.tsx
index b18220c7149..f42f3938214 100644
--- a/packages/manager/src/features/CloudPulse/Widget/components/Zoomer.tsx
+++ b/packages/manager/src/features/CloudPulse/Widget/components/Zoomer.tsx
@@ -29,6 +29,7 @@ export const ZoomIcon = React.memo((props: ZoomIconProperties) => {
           onClick={() => handleZoomToggle(false)}
           sx={{
             padding: 0,
+            visibility: { lg: 'visible', xs: 'hidden' },
           }}
         >
           <ZoomOutMap />
@@ -50,6 +51,7 @@ export const ZoomIcon = React.memo((props: ZoomIconProperties) => {
         onClick={() => handleZoomToggle(true)}
         sx={{
           padding: 0,
+          visibility: { lg: 'visible', xs: 'hidden' },
         }}
       >
         <ZoomInMap />
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseComponentRenderer.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseComponentRenderer.tsx
index 220b36f03bb..75ab29be939 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseComponentRenderer.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseComponentRenderer.tsx
@@ -5,6 +5,7 @@ import NullComponent from 'src/components/NullComponent';
 
 import { CloudPulseCustomSelect } from './CloudPulseCustomSelect';
 import { CloudPulseDateTimeRangePicker } from './CloudPulseDateTimeRangePicker';
+import { CloudPulseEndpointsSelect } from './CloudPulseEndpointsSelect';
 import { CloudPulseNodeTypeFilter } from './CloudPulseNodeTypeFilter';
 import { CloudPulseRegionSelect } from './CloudPulseRegionSelect';
 import { CloudPulseResourcesSelect } from './CloudPulseResourcesSelect';
@@ -13,6 +14,7 @@ import { CloudPulseTextFilter } from './CloudPulseTextFilter';
 
 import type { CloudPulseCustomSelectProps } from './CloudPulseCustomSelect';
 import type { CloudPulseDateTimeRangePickerProps } from './CloudPulseDateTimeRangePicker';
+import type { CloudPulseEndpointsSelectProps } from './CloudPulseEndpointsSelect';
 import type { CloudPulseNodeTypeFilterProps } from './CloudPulseNodeTypeFilter';
 import type { CloudPulseRegionSelectProps } from './CloudPulseRegionSelect';
 import type { CloudPulseResourcesSelectProps } from './CloudPulseResourcesSelect';
@@ -24,6 +26,7 @@ export interface CloudPulseComponentRendererProps {
   componentProps:
     | CloudPulseCustomSelectProps
     | CloudPulseDateTimeRangePickerProps
+    | CloudPulseEndpointsSelectProps
     | CloudPulseNodeTypeFilterProps
     | CloudPulseRegionSelectProps
     | CloudPulseResourcesSelectProps
@@ -37,6 +40,7 @@ const Components: {
     React.ComponentType<
       | CloudPulseCustomSelectProps
       | CloudPulseDateTimeRangePickerProps
+      | CloudPulseEndpointsSelectProps
       | CloudPulseNodeTypeFilterProps
       | CloudPulseRegionSelectProps
       | CloudPulseResourcesSelectProps
@@ -54,6 +58,7 @@ const Components: {
   resource_id: CloudPulseResourcesSelect,
   tags: CloudPulseTagsSelect,
   associated_entity_region: CloudPulseRegionSelect,
+  endpoint: CloudPulseEndpointsSelect,
 };
 
 const buildComponent = (props: CloudPulseComponentRendererProps) => {
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseDashboardFilterBuilder.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseDashboardFilterBuilder.tsx
index 34e25625503..404af3c14b1 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseDashboardFilterBuilder.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseDashboardFilterBuilder.tsx
@@ -10,6 +10,7 @@ import NullComponent from 'src/components/NullComponent';
 import RenderComponent from '../shared/CloudPulseComponentRenderer';
 import {
   DASHBOARD_ID,
+  ENDPOINT,
   INTERFACE_ID,
   LINODE_REGION,
   NODE_TYPE,
@@ -21,6 +22,7 @@ import {
 } from '../Utils/constants';
 import {
   getCustomSelectProperties,
+  getEndpointsProperties,
   getFilters,
   getNodeTypeProperties,
   getRegionProperties,
@@ -214,6 +216,7 @@ export const CloudPulseDashboardFilterBuilder = React.memo(
           savePref,
           {
             [NODE_TYPE]: undefined,
+            [LINODE_REGION]: undefined,
             [RESOURCES]: resourceId.map((resource: { id: string }) =>
               String(resource.id)
             ),
@@ -234,6 +237,7 @@ export const CloudPulseDashboardFilterBuilder = React.memo(
           filterKey === REGION
             ? {
                 [filterKey]: region,
+                [ENDPOINT]: undefined,
                 [RESOURCES]: undefined,
                 [TAGS]: undefined,
               }
@@ -251,6 +255,16 @@ export const CloudPulseDashboardFilterBuilder = React.memo(
       [emitFilterChangeByFilterKey]
     );
 
+    const handleEndpointsChange = React.useCallback(
+      (endpoints: string[], savePref: boolean = false) => {
+        emitFilterChangeByFilterKey(ENDPOINT, endpoints, endpoints, savePref, {
+          [ENDPOINT]: endpoints,
+          [RESOURCE_ID]: undefined,
+        });
+      },
+      [emitFilterChangeByFilterKey]
+    );
+
     const handleCustomSelectChange = React.useCallback(
       (
         filterKey: string,
@@ -356,6 +370,18 @@ export const CloudPulseDashboardFilterBuilder = React.memo(
             },
             handleTextFilterChange
           );
+        } else if (config.configuration.filterKey === ENDPOINT) {
+          return getEndpointsProperties(
+            {
+              config,
+              dashboard,
+              dependentFilters: dependentFilterReference.current,
+              isServiceAnalyticsIntegration,
+              preferences,
+              shouldDisable: isError || isLoading,
+            },
+            handleEndpointsChange
+          );
         } else {
           return getCustomSelectProperties(
             {
@@ -379,6 +405,7 @@ export const CloudPulseDashboardFilterBuilder = React.memo(
         handleRegionChange,
         handleTextFilterChange,
         handleResourceChange,
+        handleEndpointsChange,
         handleCustomSelectChange,
         isServiceAnalyticsIntegration,
         preferences,
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseDateTimeRangePicker.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseDateTimeRangePicker.tsx
index d1616a870a4..f63645f5688 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseDateTimeRangePicker.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseDateTimeRangePicker.tsx
@@ -3,7 +3,10 @@ import { DateTimeRangePicker } from '@linode/ui';
 import { DateTime } from 'luxon';
 import React from 'react';
 
-import { defaultTimeDuration } from '../Utils/CloudPulseDateTimePickerUtils';
+import {
+  defaultTimeDuration,
+  getTimeFromPreset,
+} from '../Utils/CloudPulseDateTimePickerUtils';
 
 import type { DateTimeWithPreset, FilterValue } from '@linode/api-v4';
 
@@ -37,6 +40,8 @@ export const CloudPulseDateTimeRangePicker = React.memo(
 
     if (!defaultSelected) {
       defaultSelected = defaultTimeDuration(timezone);
+    } else {
+      defaultSelected = getTimeFromPreset(defaultSelected, timezone);
     }
 
     React.useEffect(() => {
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.test.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.test.tsx
new file mode 100644
index 00000000000..e38acc948bd
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.test.tsx
@@ -0,0 +1,228 @@
+import { screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import * as React from 'react';
+
+import { objectStorageBucketFactory } from 'src/factories';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { CloudPulseEndpointsSelect } from './CloudPulseEndpointsSelect';
+
+import type { CloudPulseResources } from './CloudPulseResourcesSelect';
+
+const queryMocks = vi.hoisted(() => ({
+  useResourcesQuery: vi.fn().mockReturnValue({}),
+}));
+
+vi.mock('src/queries/cloudpulse/resources', async () => {
+  const actual = await vi.importActual('src/queries/cloudpulse/resources');
+  return {
+    ...actual,
+    useResourcesQuery: queryMocks.useResourcesQuery,
+  };
+});
+
+const mockEndpointHandler = vi.fn();
+const SELECT_ALL = 'Select All';
+const ARIA_SELECTED = 'aria-selected';
+
+const mockBuckets: CloudPulseResources[] = [
+  {
+    id: 'obj-bucket-1.us-east-1.linodeobjects.com',
+    label: 'obj-bucket-1.us-east-1.linodeobjects.com',
+    region: 'us-east',
+    endpoint: 'us-east-1.linodeobjects.com',
+  },
+  {
+    id: 'obj-bucket-2.us-east-2.linodeobjects.com',
+    label: 'obj-bucket-2.us-east-2.linodeobjects.com',
+    region: 'us-east',
+    endpoint: 'us-east-2.linodeobjects.com',
+  },
+  {
+    id: 'obj-bucket-1.br-gru-1.linodeobjects.com',
+    label: 'obj-bucket-1.br-gru-1.linodeobjects.com',
+    region: 'us-east',
+    endpoint: 'br-gru-1.linodeobjects.com',
+  },
+];
+
+describe('CloudPulseEndpointsSelect component tests', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    objectStorageBucketFactory.resetSequenceNumber();
+  });
+
+  it('renders with the correct label and placeholder', () => {
+    renderWithTheme(
+      <CloudPulseEndpointsSelect
+        handleEndpointsSelection={mockEndpointHandler}
+        label="Endpoints"
+        region={'us-east'}
+        serviceType={'objectstorage'}
+      />
+    );
+
+    expect(screen.getByLabelText('Endpoints')).toBeVisible();
+    expect(screen.getByPlaceholderText('Select Endpoints')).toBeVisible();
+  });
+
+  it('should render disabled component if the props are undefined', () => {
+    renderWithTheme(
+      <CloudPulseEndpointsSelect
+        disabled
+        handleEndpointsSelection={mockEndpointHandler}
+        label="Endpoints"
+        region={undefined}
+        serviceType={undefined}
+      />
+    );
+
+    expect(screen.getByTestId('textfield-input')).toBeDisabled();
+  });
+
+  it('should render endpoints', async () => {
+    queryMocks.useResourcesQuery.mockReturnValue({
+      data: mockBuckets,
+      isError: false,
+      isLoading: false,
+      status: 'success',
+    });
+
+    renderWithTheme(
+      <CloudPulseEndpointsSelect
+        handleEndpointsSelection={mockEndpointHandler}
+        label="Endpoints"
+        region={'us-east'}
+        serviceType="objectstorage"
+        xFilter={{ region: 'us-east' }}
+      />
+    );
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Open' }));
+
+    expect(
+      await screen.findByRole('option', {
+        name: mockBuckets[0].endpoint,
+      })
+    ).toBeVisible();
+
+    expect(
+      await screen.findByRole('option', {
+        name: mockBuckets[1].endpoint,
+      })
+    ).toBeVisible();
+  });
+
+  it('should be able to deselect the selected endpoints', async () => {
+    queryMocks.useResourcesQuery.mockReturnValue({
+      data: mockBuckets,
+      isError: false,
+      isLoading: false,
+      status: 'success',
+    });
+
+    renderWithTheme(
+      <CloudPulseEndpointsSelect
+        handleEndpointsSelection={mockEndpointHandler}
+        label="Endpoints"
+        region={'us-east'}
+        serviceType={'objectstorage'}
+        xFilter={{ region: 'us-east' }}
+      />
+    );
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Open' }));
+    await userEvent.click(
+      await screen.findByRole('option', { name: SELECT_ALL })
+    );
+    await userEvent.click(
+      await screen.findByRole('option', { name: 'Deselect All' })
+    );
+
+    // Check that both endpoints are deselected
+    expect(
+      await screen.findByRole('option', {
+        name: mockBuckets[0].endpoint,
+      })
+    ).toHaveAttribute(ARIA_SELECTED, 'false');
+    expect(
+      await screen.findByRole('option', {
+        name: mockBuckets[1].endpoint,
+      })
+    ).toHaveAttribute(ARIA_SELECTED, 'false');
+  });
+
+  it('should select multiple endpoints', async () => {
+    queryMocks.useResourcesQuery.mockReturnValue({
+      data: mockBuckets,
+      isError: false,
+      isLoading: false,
+      status: 'success',
+    });
+
+    renderWithTheme(
+      <CloudPulseEndpointsSelect
+        handleEndpointsSelection={mockEndpointHandler}
+        label="Endpoints"
+        region={'us-east'}
+        serviceType={'objectstorage'}
+        xFilter={{ region: 'us-east' }}
+      />
+    );
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Open' }));
+    await userEvent.click(
+      await screen.findByRole('option', {
+        name: mockBuckets[0].endpoint,
+      })
+    );
+    await userEvent.click(
+      await screen.findByRole('option', {
+        name: mockBuckets[1].endpoint,
+      })
+    );
+
+    // Check that the correct endpoints are selected/not selected
+    expect(
+      await screen.findByRole('option', {
+        name: mockBuckets[0].endpoint,
+      })
+    ).toHaveAttribute(ARIA_SELECTED, 'true');
+    expect(
+      await screen.findByRole('option', {
+        name: mockBuckets[1].endpoint,
+      })
+    ).toHaveAttribute(ARIA_SELECTED, 'true');
+    expect(
+      await screen.findByRole('option', {
+        name: mockBuckets[2].endpoint,
+      })
+    ).toHaveAttribute(ARIA_SELECTED, 'false');
+    expect(
+      await screen.findByRole('option', { name: SELECT_ALL })
+    ).toHaveAttribute(ARIA_SELECTED, 'false');
+  });
+
+  it('should show appropriate error message on endpoints call failure', async () => {
+    queryMocks.useResourcesQuery.mockReturnValue({
+      data: undefined,
+      isError: true,
+      isLoading: false,
+      status: 'error',
+    });
+
+    renderWithTheme(
+      <CloudPulseEndpointsSelect
+        handleEndpointsSelection={mockEndpointHandler}
+        label="Endpoints"
+        region={'us-east'}
+        serviceType={'objectstorage'}
+      />
+    );
+    expect(
+      await waitFor(() => {
+        return screen.findByText('Failed to fetch Endpoints.');
+      })
+    ).toBeVisible();
+  });
+});
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.tsx
new file mode 100644
index 00000000000..42cf343176e
--- /dev/null
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseEndpointsSelect.tsx
@@ -0,0 +1,249 @@
+import { Autocomplete, SelectedIcon, StyledListItem } from '@linode/ui';
+import { Box } from '@mui/material';
+import React, { useMemo } from 'react';
+
+import { useResourcesQuery } from 'src/queries/cloudpulse/resources';
+
+import { RESOURCE_FILTER_MAP } from '../Utils/constants';
+import { deepEqual, filterEndpointsUsingRegion } from '../Utils/FilterBuilder';
+
+import type {
+  CloudPulseMetricsFilter,
+  FilterValueType,
+} from '../Dashboard/CloudPulseDashboardLanding';
+import type { CloudPulseServiceType, FilterValue } from '@linode/api-v4';
+
+export interface CloudPulseEndpoints {
+  /**
+   * The label of the endpoint which is 's3_endpoint' in the response from the API
+   */
+  label: string;
+  /**
+   * The region of the endpoint
+   */
+  region: string;
+}
+
+export interface CloudPulseEndpointsSelectProps {
+  /**
+   * The default value of the endpoints filter
+   */
+  defaultValue?: Partial<FilterValue>;
+  /**
+   * Whether the endpoints filter is disabled
+   */
+  disabled?: boolean;
+  /**
+   * The function to handle the endpoints selection
+   */
+  handleEndpointsSelection: (endpoints: string[], savePref?: boolean) => void;
+  /**
+   * The label of the endpoints filter
+   */
+  label: string;
+  /**
+   * The placeholder of the endpoints filter
+   */
+  placeholder?: string;
+  /**
+   * The region of the endpoints
+   */
+  region?: FilterValueType;
+  /**
+   * Whether to save the preferences
+   */
+  savePreferences?: boolean;
+  /**
+   * The service type
+   */
+  serviceType: CloudPulseServiceType | undefined;
+  /**
+   * The dependent filters of the endpoints
+   */
+  xFilter?: CloudPulseMetricsFilter;
+}
+
+export const CloudPulseEndpointsSelect = React.memo(
+  (props: CloudPulseEndpointsSelectProps) => {
+    const {
+      defaultValue,
+      disabled,
+      handleEndpointsSelection,
+      label,
+      placeholder,
+      region,
+      serviceType,
+      savePreferences,
+      xFilter,
+    } = props;
+
+    const {
+      data: buckets,
+      isError,
+      isLoading,
+    } = useResourcesQuery(
+      disabled !== undefined ? !disabled : Boolean(region && serviceType),
+      serviceType,
+      {},
+
+      RESOURCE_FILTER_MAP[serviceType ?? ''] ?? {}
+    );
+
+    const validSortedEndpoints = useMemo(() => {
+      if (!buckets) return [];
+
+      const visitedEndpoints = new Set<string>();
+      const uniqueEndpoints: CloudPulseEndpoints[] = [];
+
+      buckets.forEach(({ endpoint, region }) => {
+        if (endpoint && region && !visitedEndpoints.has(endpoint)) {
+          visitedEndpoints.add(endpoint);
+          uniqueEndpoints.push({ label: endpoint, region });
+        }
+      });
+
+      uniqueEndpoints.sort((a, b) => a.label.localeCompare(b.label));
+      return uniqueEndpoints;
+    }, [buckets]);
+
+    const [selectedEndpoints, setSelectedEndpoints] =
+      React.useState<CloudPulseEndpoints[]>();
+
+    /**
+     * This is used to track the open state of the autocomplete and useRef optimizes the re-renders that this component goes through and it is used for below
+     * When the autocomplete is already closed, we should publish the resources on clear action and deselect action as well since onclose will not be triggered at that time
+     * When the autocomplete is open, we should publish any resources on clear action until the autocomplete is close
+     */
+    const isAutocompleteOpen = React.useRef(false); // Ref to track the open state of Autocomplete
+
+    const getEndpointsList = React.useMemo<CloudPulseEndpoints[]>(() => {
+      return filterEndpointsUsingRegion(validSortedEndpoints, xFilter) ?? [];
+    }, [validSortedEndpoints, xFilter]);
+
+    // Once the data is loaded, set the state variable with value stored in preferences
+    React.useEffect(() => {
+      if (disabled && !selectedEndpoints) {
+        return;
+      }
+      // To save default values, go through side effects if disabled is false
+      if (!buckets || !savePreferences || selectedEndpoints) {
+        if (selectedEndpoints) {
+          setSelectedEndpoints([]);
+          handleEndpointsSelection([]);
+        }
+      } else {
+        const defaultEndpoints =
+          defaultValue && Array.isArray(defaultValue)
+            ? defaultValue.map((endpoint) => String(endpoint))
+            : [];
+        const endpoints = getEndpointsList.filter((endpointObj) =>
+          defaultEndpoints.includes(endpointObj.label)
+        );
+
+        handleEndpointsSelection(endpoints.map((endpoint) => endpoint.label));
+        setSelectedEndpoints(endpoints);
+      }
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [buckets, region, xFilter, serviceType]);
+
+    return (
+      <Autocomplete
+        autoHighlight
+        clearOnBlur
+        data-testid="endpoint-select"
+        disabled={disabled}
+        errorText={isError ? `Failed to fetch ${label || 'Endpoints'}.` : ''}
+        isOptionEqualToValue={(option, value) => option.label === value.label}
+        label={label || 'Endpoints'}
+        limitTags={1}
+        loading={isLoading}
+        multiple
+        noMarginTop
+        onChange={(_e, endpointSelections) => {
+          setSelectedEndpoints(endpointSelections);
+
+          if (!isAutocompleteOpen.current) {
+            handleEndpointsSelection(
+              endpointSelections.map((endpoint) => endpoint.label),
+              savePreferences
+            );
+          }
+        }}
+        onClose={() => {
+          isAutocompleteOpen.current = false;
+          handleEndpointsSelection(
+            selectedEndpoints?.map((endpoint) => endpoint.label) ?? [],
+            savePreferences
+          );
+        }}
+        onOpen={() => {
+          isAutocompleteOpen.current = true;
+        }}
+        options={getEndpointsList}
+        placeholder={
+          selectedEndpoints?.length ? '' : placeholder || 'Select Endpoints'
+        }
+        renderOption={(props, option) => {
+          const { key, ...rest } = props;
+          const isEndpointSelected = selectedEndpoints?.some(
+            (item) => item.label === option.label
+          );
+
+          const isSelectAllORDeslectAllOption =
+            option.label === 'Select All ' || option.label === 'Deselect All ';
+
+          const ListItem = isSelectAllORDeslectAllOption
+            ? StyledListItem
+            : 'li';
+
+          return (
+            <ListItem {...rest} data-qa-option key={key}>
+              <>
+                <Box sx={{ flexGrow: 1 }}>{option.label}</Box>
+                <SelectedIcon visible={isEndpointSelected || false} />
+              </>
+            </ListItem>
+          );
+        }}
+        textFieldProps={{
+          InputProps: {
+            sx: {
+              '::-webkit-scrollbar': {
+                display: 'none',
+              },
+              maxHeight: '55px',
+              msOverflowStyle: 'none',
+              overflow: 'auto',
+              scrollbarWidth: 'none',
+            },
+          },
+        }}
+        value={selectedEndpoints ?? []}
+      />
+    );
+  },
+  compareProps
+);
+
+function compareProps(
+  prevProps: CloudPulseEndpointsSelectProps,
+  nextProps: CloudPulseEndpointsSelectProps
+): boolean {
+  // these properties can be extended going forward
+  const keysToCompare: (keyof CloudPulseEndpointsSelectProps)[] = [
+    'region',
+    'serviceType',
+  ];
+
+  for (const key of keysToCompare) {
+    if (prevProps[key] !== nextProps[key]) {
+      return false;
+    }
+  }
+  if (!deepEqual(prevProps.xFilter, nextProps.xFilter)) {
+    return false;
+  }
+
+  // Ignore function props in comparison
+  return true;
+}
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.tsx
index 5502aeeca54..3ab0b0bb58b 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseRegionSelect.tsx
@@ -123,7 +123,7 @@ export const CloudPulseRegionSelect = React.memo(
       xFilter,
     ]);
 
-    const dependencyKey = supportedLinodeRegions
+    const dependencyKey = supportedRegionsFromResources
       .map((region) => region.id)
       .sort()
       .join(',');
@@ -136,13 +136,15 @@ export const CloudPulseRegionSelect = React.memo(
       // and there's no selected region — attempt to preselect from defaultValue.
       if (
         !disabled &&
-        regions &&
+        supportedRegionsFromResources &&
         savePreferences &&
         selectedRegion === undefined
       ) {
         // Try to find the region corresponding to the saved default value
         const region = defaultValue
-          ? regions.find((regionObj) => regionObj.id === defaultValue)
+          ? supportedRegionsFromResources.find(
+              (regionObj) => regionObj.id === defaultValue
+            )
           : undefined;
         // Notify parent and set internal state
         handleRegionChange(filterKey, region?.id, region ? [region.label] : []);
@@ -159,9 +161,6 @@ export const CloudPulseRegionSelect = React.memo(
         handleRegionChange(filterKey, defaultRegionId, [defaultRegionLabel]);
         setSelectedRegion(defaultRegionId);
       } else {
-        if (!disabled && filterKey === LINODE_REGION && selectedRegion) {
-          return;
-        }
         if (selectedRegion !== undefined) {
           setSelectedRegion('');
         }
@@ -170,8 +169,7 @@ export const CloudPulseRegionSelect = React.memo(
       // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
       xFilter, // Reacts to filter changes (to reset region)
-      regions, // Function to call on change
-      dependencyKey, // Reacts to linode region changes
+      dependencyKey, // Reacts to region changes
     ]);
 
     return (
diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx
index c95f20d2236..cbf097c063b 100644
--- a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx
+++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx
@@ -13,6 +13,7 @@ import type { CloudPulseServiceType, FilterValue } from '@linode/api-v4';
 
 export interface CloudPulseResources {
   clusterSize?: number;
+  endpoint?: string;
   engineType?: string;
   entities?: Record<string, string>;
   id: string;
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/ConnectionDetailsHostRows.test.tsx b/packages/manager/src/features/Databases/DatabaseDetail/ConnectionDetailsHostRows.test.tsx
new file mode 100644
index 00000000000..712a21a2651
--- /dev/null
+++ b/packages/manager/src/features/Databases/DatabaseDetail/ConnectionDetailsHostRows.test.tsx
@@ -0,0 +1,186 @@
+import React from 'react';
+
+import { databaseFactory } from 'src/factories/databases';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { ConnectionDetailsHostRows } from './ConnectionDetailsHostRows';
+
+import type { Database } from '@linode/api-v4/lib/databases';
+
+const DEFAULT_PRIMARY = 'private-db-mysql-default-primary.net';
+const DEFAULT_STANDBY = 'db-mysql-default-standby.net';
+
+const LEGACY_PRIMARY = 'db-mysql-legacy-primary.net';
+const LEGACY_SECONDARY = 'db-mysql-legacy-secondary.net';
+
+describe('ConnectionDetailsHostRows', () => {
+  it('should display correctly for default database', () => {
+    const database = databaseFactory.build({
+      hosts: {
+        primary: DEFAULT_PRIMARY,
+        secondary: undefined,
+        standby: DEFAULT_STANDBY,
+      },
+      platform: 'rdbms-default',
+      private_network: null, // Added to test that Host field renders
+    }) as Database;
+
+    const { queryAllByText } = renderWithTheme(
+      <ConnectionDetailsHostRows database={database} />
+    );
+
+    expect(queryAllByText('Host')).toHaveLength(1);
+    expect(queryAllByText(DEFAULT_PRIMARY)).toHaveLength(1);
+
+    expect(queryAllByText('Read-only Host')).toHaveLength(1);
+  });
+
+  it('should display N/A for default DB with blank read-only Host field', () => {
+    const database = databaseFactory.build({
+      hosts: {
+        primary: DEFAULT_PRIMARY,
+        secondary: undefined,
+        standby: undefined,
+      },
+      platform: 'rdbms-default',
+    });
+
+    const { queryAllByText } = renderWithTheme(
+      <ConnectionDetailsHostRows database={database} />
+    );
+
+    expect(queryAllByText('N/A')).toHaveLength(1);
+  });
+
+  it('should display Host rows correctly for legacy db', () => {
+    const database = databaseFactory.build({
+      hosts: {
+        primary: LEGACY_PRIMARY,
+        secondary: LEGACY_SECONDARY,
+        standby: undefined,
+      },
+      id: 22,
+      platform: 'rdbms-legacy',
+      port: 3306,
+      ssl_connection: true,
+    }) as Database;
+
+    const { queryAllByText } = renderWithTheme(
+      <ConnectionDetailsHostRows database={database} />
+    );
+
+    expect(queryAllByText('Host')).toHaveLength(1);
+    expect(queryAllByText(LEGACY_PRIMARY)).toHaveLength(1);
+
+    expect(queryAllByText('Private Network Host')).toHaveLength(1);
+    expect(queryAllByText(LEGACY_SECONDARY)).toHaveLength(1);
+  });
+
+  it('should display provisioning text when hosts are not available', () => {
+    const database = databaseFactory.build({
+      hosts: undefined,
+      platform: 'rdbms-default',
+    }) as Database;
+
+    const { getByText } = renderWithTheme(
+      <ConnectionDetailsHostRows database={database} />
+    );
+
+    const hostNameProvisioningText = getByText(
+      'Your hostname will appear here once it is available.'
+    );
+
+    expect(hostNameProvisioningText).toBeInTheDocument();
+  });
+
+  it('should display Host when VPC is not configured', () => {
+    const privateStrIndex = DEFAULT_PRIMARY.indexOf('-');
+    const baseHostName = DEFAULT_PRIMARY.slice(privateStrIndex + 1);
+
+    const database = databaseFactory.build({
+      hosts: {
+        primary: baseHostName,
+      },
+      platform: 'rdbms-default',
+      private_network: null, // VPC not configured
+    }) as Database;
+
+    const { queryAllByText } = renderWithTheme(
+      <ConnectionDetailsHostRows database={database} />
+    );
+
+    expect(queryAllByText('Host')).toHaveLength(1);
+    expect(queryAllByText(baseHostName)).toHaveLength(1);
+  });
+
+  it('should display Private Host field when VPC is configured with public access as false', () => {
+    const database = databaseFactory.build({
+      hosts: {
+        primary: DEFAULT_PRIMARY,
+        secondary: undefined,
+        standby: undefined,
+      },
+      platform: 'rdbms-default',
+      private_network: {
+        public_access: false,
+        subnet_id: 1,
+        vpc_id: 123,
+      },
+    }) as Database;
+
+    const { queryAllByText } = renderWithTheme(
+      <ConnectionDetailsHostRows database={database} />
+    );
+    expect(queryAllByText('Private Host')).toHaveLength(1);
+    expect(queryAllByText(DEFAULT_PRIMARY)).toHaveLength(1);
+  });
+
+  it('should display both Private Host and Public Host fields when VPC is configured with public access as true', () => {
+    const database = databaseFactory.build({
+      hosts: {
+        primary: DEFAULT_PRIMARY,
+        secondary: undefined,
+        standby: undefined,
+      },
+      platform: 'rdbms-default',
+      private_network: {
+        public_access: true,
+        subnet_id: 1,
+        vpc_id: 123,
+      },
+    }) as Database;
+
+    const { queryAllByText } = renderWithTheme(
+      <ConnectionDetailsHostRows database={database} />
+    );
+    // Verify that both Private Host and Public Host fields are rendered
+    expect(queryAllByText('Private Host')).toHaveLength(1);
+    expect(queryAllByText('Public Host')).toHaveLength(1);
+
+    // Verify that the Private hostname is rendered correctly
+    expect(queryAllByText(DEFAULT_PRIMARY)).toHaveLength(1);
+    // Verify that the Public hostname is rendered correctly
+    const privateStrIndex = DEFAULT_PRIMARY.indexOf('-');
+    const baseHostName = DEFAULT_PRIMARY.slice(privateStrIndex + 1);
+    const expectedPublicHostname = `public-${baseHostName}`;
+    expect(queryAllByText(expectedPublicHostname)).toHaveLength(1);
+  });
+
+  it('should display Read-only Host when read-only host is available', () => {
+    const database = databaseFactory.build({
+      hosts: {
+        primary: DEFAULT_PRIMARY,
+        secondary: undefined,
+        standby: DEFAULT_STANDBY,
+      },
+      platform: 'rdbms-default',
+    }) as Database;
+
+    const { queryAllByText } = renderWithTheme(
+      <ConnectionDetailsHostRows database={database} />
+    );
+
+    expect(queryAllByText('Read-only Host')).toHaveLength(1);
+    expect(queryAllByText(DEFAULT_STANDBY)).toHaveLength(1);
+  });
+});
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/ConnectionDetailsHostRows.tsx b/packages/manager/src/features/Databases/DatabaseDetail/ConnectionDetailsHostRows.tsx
new file mode 100644
index 00000000000..ca9e7ed6298
--- /dev/null
+++ b/packages/manager/src/features/Databases/DatabaseDetail/ConnectionDetailsHostRows.tsx
@@ -0,0 +1,138 @@
+import { TooltipIcon, Typography } from '@linode/ui';
+import * as React from 'react';
+
+import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip';
+
+import {
+  SUMMARY_HOST_TOOLTIP_COPY,
+  SUMMARY_PRIVATE_HOST_COPY,
+  SUMMARY_PRIVATE_HOST_LEGACY_COPY,
+} from '../constants';
+import { getReadOnlyHost, isLegacyDatabase } from '../utilities';
+import { ConnectionDetailsRow } from './ConnectionDetailsRow';
+import { useStyles } from './DatabaseSummary/DatabaseSummaryConnectionDetails.style';
+
+import type { Database } from '@linode/api-v4/lib/databases/types';
+
+interface ConnectionDetailsHostRowsProps {
+  database: Database;
+}
+
+/**
+ * This component is responsible for conditionally rendering the Private Host, Public Host, and Read-only Host rows that get displayed in
+ * the Connection Details tables that appear in the Database Summary and Networking tabs */
+export const ConnectionDetailsHostRows = (
+  props: ConnectionDetailsHostRowsProps
+) => {
+  const { database } = props;
+  const { classes } = useStyles();
+
+  const sxTooltipIcon = {
+    marginLeft: '4px',
+    padding: '0px',
+  };
+
+  const hostTooltipComponentProps = {
+    tooltip: {
+      style: {
+        minWidth: 285,
+      },
+    },
+  };
+
+  const isLegacy = isLegacyDatabase(database);
+  const hasVPC = Boolean(database?.private_network?.vpc_id);
+  const hasPublicVPC = hasVPC && database?.private_network?.public_access;
+
+  const getHostContent = (
+    mode: 'default' | 'private' | 'public' = 'default'
+  ) => {
+    let primaryHostName = database.hosts?.primary;
+
+    if (mode === 'public' && primaryHostName) {
+      // Remove 'private-' substring at the beginning of the hostname and replace it with 'public-'
+      const privateStrIndex = database.hosts.primary.indexOf('-');
+      const baseHostName = database.hosts.primary.slice(privateStrIndex + 1);
+      primaryHostName = `public-${baseHostName}`;
+    }
+
+    if (primaryHostName) {
+      return (
+        <>
+          {primaryHostName}
+          <CopyTooltip
+            className={classes.inlineCopyToolTip}
+            text={primaryHostName}
+          />
+          {!isLegacy && (
+            <TooltipIcon
+              componentsProps={hostTooltipComponentProps}
+              status="info"
+              sxTooltipIcon={sxTooltipIcon}
+              text={
+                mode === 'private'
+                  ? SUMMARY_PRIVATE_HOST_COPY
+                  : SUMMARY_HOST_TOOLTIP_COPY
+              }
+            />
+          )}
+        </>
+      );
+    }
+
+    return (
+      <Typography>
+        <span className={classes.provisioningText}>
+          Your hostname will appear here once it is available.
+        </span>
+      </Typography>
+    );
+  };
+
+  const getReadOnlyHostContent = () => {
+    const defaultValue = isLegacy ? '-' : 'N/A';
+    const value = getReadOnlyHost(database) || defaultValue;
+    const hasHost = value !== '-' && value !== 'N/A';
+    return (
+      <>
+        {value}
+        {value && hasHost && (
+          <CopyTooltip className={classes.inlineCopyToolTip} text={value} />
+        )}
+        {isLegacy && (
+          <TooltipIcon
+            status="info"
+            sxTooltipIcon={sxTooltipIcon}
+            text={SUMMARY_PRIVATE_HOST_LEGACY_COPY}
+          />
+        )}
+        {!isLegacy && hasHost && (
+          <TooltipIcon
+            componentsProps={hostTooltipComponentProps}
+            status="info"
+            sxTooltipIcon={sxTooltipIcon}
+            text={SUMMARY_HOST_TOOLTIP_COPY}
+          />
+        )}
+      </>
+    );
+  };
+
+  return (
+    <>
+      <ConnectionDetailsRow label={hasVPC ? 'Private Host' : 'Host'}>
+        {getHostContent(hasVPC ? 'private' : 'default')}
+      </ConnectionDetailsRow>
+      {hasPublicVPC && (
+        <ConnectionDetailsRow label="Public Host">
+          {getHostContent('public')}
+        </ConnectionDetailsRow>
+      )}
+      <ConnectionDetailsRow
+        label={isLegacy ? 'Private Network Host' : 'Read-only Host'}
+      >
+        {getReadOnlyHostContent()}
+      </ConnectionDetailsRow>
+    </>
+  );
+};
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/ConnectionDetailsRow.test.tsx b/packages/manager/src/features/Databases/DatabaseDetail/ConnectionDetailsRow.test.tsx
new file mode 100644
index 00000000000..3fa87196cf3
--- /dev/null
+++ b/packages/manager/src/features/Databases/DatabaseDetail/ConnectionDetailsRow.test.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { ConnectionDetailsRow } from './ConnectionDetailsRow';
+
+describe('ConnectionDetailsRow', () => {
+  it('should render provided label and children', async () => {
+    const { getByText } = renderWithTheme(
+      <ConnectionDetailsRow label="Test Label">
+        <p>Test Children Prop</p>
+      </ConnectionDetailsRow>
+    );
+    const testLabel = getByText('Test Label');
+    const testChildrenProp = getByText('Test Children Prop');
+
+    expect(testLabel).toBeInTheDocument();
+    expect(testChildrenProp).toBeInTheDocument();
+  });
+});
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/ConnectionDetailsRow.tsx b/packages/manager/src/features/Databases/DatabaseDetail/ConnectionDetailsRow.tsx
new file mode 100644
index 00000000000..cebfd7593c7
--- /dev/null
+++ b/packages/manager/src/features/Databases/DatabaseDetail/ConnectionDetailsRow.tsx
@@ -0,0 +1,29 @@
+import { Grid } from '@mui/material';
+import * as React from 'react';
+
+import {
+  StyledLabelTypography,
+  StyledValueGrid,
+} from './DatabaseSummary/DatabaseSummaryClusterConfiguration.style';
+
+interface ConnectionDetailsRowProps {
+  children: React.ReactNode;
+  label: string;
+}
+
+export const ConnectionDetailsRow = (props: ConnectionDetailsRowProps) => {
+  const { children, label } = props;
+  return (
+    <>
+      <Grid
+        size={{
+          md: 4,
+          xs: 3,
+        }}
+      >
+        <StyledLabelTypography>{label}</StyledLabelTypography>
+      </Grid>
+      <StyledValueGrid size={{ md: 8, xs: 9 }}>{children}</StyledValueGrid>
+    </>
+  );
+};
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworking.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworking.tsx
index 624bef08e12..3e35fa76bbb 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworking.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseManageNetworking.tsx
@@ -6,7 +6,6 @@ import {
   ErrorState,
   Typography,
 } from '@linode/ui';
-import { Grid } from '@mui/material';
 import React from 'react';
 import { makeStyles } from 'tss-react/mui';
 
@@ -14,12 +13,9 @@ import { Link } from 'src/components/Link';
 import { useFlags } from 'src/hooks/useFlags';
 
 import { MANAGE_NETWORKING_LEARN_MORE_LINK } from '../../constants';
-import { getReadOnlyHost } from '../../utilities';
-import {
-  StyledGridContainer,
-  StyledLabelTypography,
-  StyledValueGrid,
-} from '../DatabaseSummary/DatabaseSummaryClusterConfiguration.style';
+import { ConnectionDetailsHostRows } from '../ConnectionDetailsHostRows';
+import { ConnectionDetailsRow } from '../ConnectionDetailsRow';
+import { StyledGridContainer } from '../DatabaseSummary/DatabaseSummaryClusterConfiguration.style';
 import DatabaseManageNetworkingDrawer from './DatabaseManageNetworkingDrawer';
 import { DatabaseNetworkingUnassignVPCDialog } from './DatabaseNetworkingUnassignVPCDialog';
 
@@ -64,10 +60,6 @@ export const DatabaseManageNetworking = ({ database }: Props) => {
         flexDirection: 'column',
       },
     },
-    provisioningText: {
-      font: theme.font.normal,
-      fontStyle: 'italic',
-    },
   }));
 
   const flags = useFlags();
@@ -80,8 +72,6 @@ export const DatabaseManageNetworking = ({ database }: Props) => {
   const vpcId = Number(database.private_network?.vpc_id);
   const hasVPCConfigured = Boolean(vpcId);
   const gridContainerSize = { lg: 7, md: 10 };
-  const gridValueSize = { md: 8, xs: 9 };
-  const gridLabelSize = { md: 4, xs: 3 };
 
   const {
     data: vpcs,
@@ -99,12 +89,6 @@ export const DatabaseManageNetworking = ({ database }: Props) => {
   );
   const hasVPCs = Boolean(vpcs && vpcs.length > 0);
 
-  const readOnlyHost = () => {
-    const defaultValue = 'N/A';
-    const value = getReadOnlyHost(database) || defaultValue;
-    return <span>{value}</span>;
-  };
-
   const onManageAccess = () => {
     setIsManageNetworkingDrawerOpen(true);
   };
@@ -158,54 +142,26 @@ export const DatabaseManageNetworking = ({ database }: Props) => {
       </div>
 
       <StyledGridContainer container size={gridContainerSize} spacing={0}>
-        <Grid size={gridLabelSize}>
-          <StyledLabelTypography>Connection Type</StyledLabelTypography>
-        </Grid>
-        <StyledValueGrid size={gridValueSize}>
+        <ConnectionDetailsRow label="Connection Type">
           {hasVPCConfigured ? 'VPC' : 'Public'}
-        </StyledValueGrid>
+        </ConnectionDetailsRow>
+
         {hasVPCConfigured && (
           <>
-            <Grid size={gridLabelSize}>
-              <StyledLabelTypography>VPC</StyledLabelTypography>
-            </Grid>
-            <StyledValueGrid size={gridValueSize}>
+            <ConnectionDetailsRow label="VPC">
               {currentVPC?.label}
-            </StyledValueGrid>
-            <Grid size={gridLabelSize}>
-              <StyledLabelTypography>Subnet</StyledLabelTypography>
-            </Grid>
-            <StyledValueGrid size={gridValueSize}>
+            </ConnectionDetailsRow>
+            <ConnectionDetailsRow label="Subnet">
               {`${currentSubnet?.label} (${currentSubnet?.ipv4})`}
-            </StyledValueGrid>
+            </ConnectionDetailsRow>
           </>
         )}
 
-        <Grid size={gridLabelSize}>
-          <StyledLabelTypography>Host</StyledLabelTypography>
-        </Grid>
-        <StyledValueGrid size={gridValueSize}>
-          {database.hosts?.primary ? (
-            database.hosts?.primary
-          ) : (
-            <span className={classes.provisioningText}>
-              Your hostname will appear here once it is available.
-            </span>
-          )}
-        </StyledValueGrid>
-        <Grid size={gridLabelSize}>
-          <StyledLabelTypography>Read-only Host</StyledLabelTypography>
-        </Grid>
-        <StyledValueGrid size={gridValueSize}>{readOnlyHost()}</StyledValueGrid>
+        <ConnectionDetailsHostRows database={database} />
         {hasVPCConfigured && (
-          <>
-            <Grid size={gridLabelSize}>
-              <StyledLabelTypography>Public Access</StyledLabelTypography>
-            </Grid>
-            <StyledValueGrid size={gridValueSize}>
-              {database?.private_network?.public_access ? 'Yes' : 'No'}
-            </StyledValueGrid>
-          </>
+          <ConnectionDetailsRow label="Public Access">
+            {database?.private_network?.public_access ? 'Yes' : 'No'}
+          </ConnectionDetailsRow>
         )}
       </StyledGridContainer>
 
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummaryConnectionDetails.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummaryConnectionDetails.tsx
index 89bc3c80c51..a725b87d4fc 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummaryConnectionDetails.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummaryConnectionDetails.tsx
@@ -2,7 +2,6 @@ import { getSSLFields } from '@linode/api-v4/lib/databases/databases';
 import { useDatabaseCredentialsQuery } from '@linode/queries';
 import { Box, CircleProgress, TooltipIcon, Typography } from '@linode/ui';
 import { downloadFile } from '@linode/utilities';
-import Grid from '@mui/material/Grid';
 import { Button } from 'akamai-cds-react-components';
 import { useSnackbar } from 'notistack';
 import * as React from 'react';
@@ -14,12 +13,10 @@ import { DB_ROOT_USERNAME } from 'src/constants';
 import { useFlags } from 'src/hooks/useFlags';
 import { getErrorStringOrDefault } from 'src/utilities/errorUtils';
 
-import { getReadOnlyHost, isDefaultDatabase } from '../../utilities';
-import {
-  StyledGridContainer,
-  StyledLabelTypography,
-  StyledValueGrid,
-} from './DatabaseSummaryClusterConfiguration.style';
+import { isDefaultDatabase } from '../../utilities';
+import { ConnectionDetailsHostRows } from '../ConnectionDetailsHostRows';
+import { ConnectionDetailsRow } from '../ConnectionDetailsRow';
+import { StyledGridContainer } from './DatabaseSummaryClusterConfiguration.style';
 import { useStyles } from './DatabaseSummaryConnectionDetails.style';
 
 import type { Database, SSLFields } from '@linode/api-v4/lib/databases/types';
@@ -34,15 +31,13 @@ const sxTooltipIcon = {
   padding: '0px',
 };
 
-const privateHostCopy =
-  'A private network host and a private IP can only be used to access a Database Cluster from Linodes in the same data center and will not incur transfer costs.';
-
 export const DatabaseSummaryConnectionDetails = (props: Props) => {
   const { database } = props;
   const { classes } = useStyles();
   const { enqueueSnackbar } = useSnackbar();
   const flags = useFlags();
   const isLegacy = database.platform !== 'rdbms-default';
+  const hasVPC = Boolean(database?.private_network?.vpc_id);
   const displayConnectionType =
     flags.databaseVpc && isDefaultDatabase(database);
 
@@ -67,16 +62,6 @@ export const DatabaseSummaryConnectionDetails = (props: Props) => {
   const password =
     showCredentials && credentials ? credentials?.password : '••••••••••';
 
-  const hostTooltipComponentProps = {
-    tooltip: {
-      style: {
-        minWidth: 285,
-      },
-    },
-  };
-  const HOST_TOOLTIP_COPY =
-    'Use the IPv6 address (AAAA record) for this hostname to avoid network transfer charges when connecting to this database from Linodes within the same region.';
-
   const handleShowPasswordClick = () => {
     setShowPassword((showCredentials) => !showCredentials);
   };
@@ -117,35 +102,6 @@ export const DatabaseSummaryConnectionDetails = (props: Props) => {
   const disableShowBtn = ['failed', 'provisioning'].includes(database.status);
   const disableDownloadCACertificateBtn = database.status === 'provisioning';
 
-  const readOnlyHost = () => {
-    const defaultValue = isLegacy ? '-' : 'N/A';
-    const value = getReadOnlyHost(database) || defaultValue;
-    const hasHost = value !== '-' && value !== 'N/A';
-    return (
-      <>
-        {value}
-        {value && hasHost && (
-          <CopyTooltip className={classes.inlineCopyToolTip} text={value} />
-        )}
-        {isLegacy && (
-          <TooltipIcon
-            status="info"
-            sxTooltipIcon={sxTooltipIcon}
-            text={privateHostCopy}
-          />
-        )}
-        {!isLegacy && hasHost && (
-          <TooltipIcon
-            componentsProps={hostTooltipComponentProps}
-            status="info"
-            sxTooltipIcon={sxTooltipIcon}
-            text={HOST_TOOLTIP_COPY}
-          />
-        )}
-      </>
-    );
-  };
-
   const credentialsBtn = (handleClick: () => void, btnText: string) => {
     return (
       <Button
@@ -185,170 +141,76 @@ export const DatabaseSummaryConnectionDetails = (props: Props) => {
     </>
   );
 
+  const CredentialsContent = (
+    <>
+      {password}
+      {showCredentials && credentialsLoading ? (
+        <div className={classes.progressCtn}>
+          <CircleProgress noPadding size="xs" />
+        </div>
+      ) : credentialsError ? (
+        <>
+          <span className={classes.error}>Error retrieving credentials.</span>
+          {credentialsBtn(() => getDatabaseCredentials(), 'Retry')}
+        </>
+      ) : (
+        credentialsBtn(
+          handleShowPasswordClick,
+          showCredentials && credentials ? 'Hide' : 'Show'
+        )
+      )}
+      {disableShowBtn && (
+        <TooltipIcon
+          status="info"
+          sxTooltipIcon={sxTooltipIcon}
+          text={
+            database.status === 'provisioning'
+              ? 'Your Database Cluster is currently provisioning.'
+              : 'Your root password is unavailable when your Database Cluster has failed.'
+          }
+        />
+      )}
+      {showCredentials && credentials && (
+        <CopyTooltip className={classes.inlineCopyToolTip} text={password} />
+      )}
+    </>
+  );
+
   return (
     <>
       <Typography className={classes.header} variant="h3">
         Connection Details
       </Typography>
       <StyledGridContainer container size={{ lg: 7, md: 10 }} spacing={0}>
-        <Grid
-          size={{
-            md: 4,
-            xs: 3,
-          }}
-        >
-          <StyledLabelTypography>Username</StyledLabelTypography>
-        </Grid>
-        <StyledValueGrid size={{ md: 8, xs: 9 }}>{username}</StyledValueGrid>
-        <Grid
-          size={{
-            md: 4,
-            xs: 3,
-          }}
-        >
-          <StyledLabelTypography>Password</StyledLabelTypography>
-        </Grid>
-        <StyledValueGrid size={{ md: 8, xs: 9 }}>
-          {password}
-          {showCredentials && credentialsLoading ? (
-            <div className={classes.progressCtn}>
-              <CircleProgress noPadding size="xs" />
-            </div>
-          ) : credentialsError ? (
-            <>
-              <span className={classes.error}>
-                Error retrieving credentials.
-              </span>
-              {credentialsBtn(() => getDatabaseCredentials(), 'Retry')}
-            </>
-          ) : (
-            credentialsBtn(
-              handleShowPasswordClick,
-              showCredentials && credentials ? 'Hide' : 'Show'
-            )
-          )}
-          {disableShowBtn && (
-            <TooltipIcon
-              status="info"
-              sxTooltipIcon={sxTooltipIcon}
-              text={
-                database.status === 'provisioning'
-                  ? 'Your Database Cluster is currently provisioning.'
-                  : 'Your root password is unavailable when your Database Cluster has failed.'
-              }
-            />
-          )}
-          {showCredentials && credentials && (
-            <CopyTooltip
-              className={classes.inlineCopyToolTip}
-              text={password}
-            />
-          )}
-        </StyledValueGrid>
-        <Grid
-          size={{
-            md: 4,
-            xs: 3,
-          }}
-        >
-          <StyledLabelTypography>Database name</StyledLabelTypography>
-        </Grid>
-        <StyledValueGrid size={{ md: 8, xs: 9 }}>
+        <ConnectionDetailsRow label="Username">{username}</ConnectionDetailsRow>
+        <ConnectionDetailsRow label="Password">
+          {CredentialsContent}
+        </ConnectionDetailsRow>
+        <ConnectionDetailsRow label="Database name">
           {isLegacy ? database.engine : 'defaultdb'}
-        </StyledValueGrid>
-        <Grid
-          size={{
-            md: 4,
-            xs: 3,
-          }}
-        >
-          <StyledLabelTypography>Host</StyledLabelTypography>
-        </Grid>
-        <StyledValueGrid size={{ md: 8, xs: 9 }}>
-          {database.hosts?.primary ? (
-            <>
-              {database.hosts?.primary}
-              <CopyTooltip
-                className={classes.inlineCopyToolTip}
-                text={database.hosts?.primary}
-              />
-              {!isLegacy && (
-                <TooltipIcon
-                  componentsProps={hostTooltipComponentProps}
-                  status="info"
-                  sxTooltipIcon={sxTooltipIcon}
-                  text={HOST_TOOLTIP_COPY}
-                />
-              )}
-            </>
-          ) : (
-            <Typography>
-              <span className={classes.provisioningText}>
-                Your hostname will appear here once it is available.
-              </span>
-            </Typography>
-          )}
-        </StyledValueGrid>
-        <Grid
-          size={{
-            md: 4,
-            xs: 3,
-          }}
-        >
-          <StyledLabelTypography>
-            {isLegacy ? 'Private Network Host' : 'Read-only Host'}
-          </StyledLabelTypography>
-        </Grid>
-        <StyledValueGrid size={{ md: 8, xs: 9 }}>
-          {readOnlyHost()}
-        </StyledValueGrid>
-        <Grid
-          size={{
-            md: 4,
-            xs: 3,
-          }}
-        >
-          <StyledLabelTypography>Port</StyledLabelTypography>
-        </Grid>
-        <StyledValueGrid size={{ md: 8, xs: 9 }}>
+        </ConnectionDetailsRow>
+        <ConnectionDetailsHostRows database={database} />
+        <ConnectionDetailsRow label="Port">
           {database.port}
-        </StyledValueGrid>
-        <Grid
-          size={{
-            md: 4,
-            xs: 3,
-          }}
-        >
-          <StyledLabelTypography>SSL</StyledLabelTypography>
-        </Grid>
-        <StyledValueGrid size={{ md: 8, xs: 9 }}>
+        </ConnectionDetailsRow>
+        <ConnectionDetailsRow label="SSL">
           {database.ssl_connection ? 'ENABLED' : 'DISABLED'}
-        </StyledValueGrid>
+        </ConnectionDetailsRow>
         {displayConnectionType && (
-          <>
-            <Grid
-              size={{
-                md: 4,
-                xs: 3,
-              }}
+          <ConnectionDetailsRow label="Connection Type">
+            <Box
+              sx={(theme: Theme) => ({
+                marginRight: theme.spacingFunction(20),
+              })}
+            >
+              {hasVPC ? 'VPC' : 'Public'}
+            </Box>
+            <Link
+              to={`/databases/${database?.engine}/${database?.id}/networking`}
             >
-              <StyledLabelTypography>Connection Type</StyledLabelTypography>
-            </Grid>
-            <StyledValueGrid size={{ md: 8, xs: 9 }}>
-              <Box
-                sx={(theme: Theme) => ({
-                  marginRight: theme.spacingFunction(20),
-                })}
-              >
-                {database?.private_network?.vpc_id ? 'VPC' : 'Public'}
-              </Box>
-              <Link
-                to={`/databases/${database?.engine}/${database?.id}/networking`}
-              >
-                View Details
-              </Link>
-            </StyledValueGrid>
-          </>
+              View Details
+            </Link>
+          </ConnectionDetailsRow>
         )}
       </StyledGridContainer>
       <div className={classes.actionBtnsCtn}>
diff --git a/packages/manager/src/features/Databases/constants.ts b/packages/manager/src/features/Databases/constants.ts
index f6b47b107d3..c09afb4d38c 100644
--- a/packages/manager/src/features/Databases/constants.ts
+++ b/packages/manager/src/features/Databases/constants.ts
@@ -53,6 +53,15 @@ export const BACKUPS_INVALID_TIME_VALIDATON_TEXT =
 export const BACKUPS_UNABLE_TO_RESTORE_TEXT =
   'You can restore a backup after the first backup is completed.';
 
+export const SUMMARY_HOST_TOOLTIP_COPY =
+  'Use the IPv6 address (AAAA record) for this hostname to avoid network transfer charges when connecting to this database from Linodes within the same region.';
+
+export const SUMMARY_PRIVATE_HOST_COPY =
+  "The private hostname resolves to an internal IP address and can only be used to access the database cluster from other Linode instances within the same VPC. This connection is secured and doesn't incur transfer costs.";
+
+export const SUMMARY_PRIVATE_HOST_LEGACY_COPY =
+  'A private network host and a private IP can only be used to access a Database Cluster from Linodes in the same data center and will not incur transfer costs.';
+
 // Links
 export const LEARN_MORE_LINK_LEGACY =
   'https://techdocs.akamai.com/cloud-computing/docs/manage-access-controls';
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.test.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.test.tsx
index 38ee59db256..65371c3eccf 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.test.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.test.tsx
@@ -1,5 +1,10 @@
 import { destinationType } from '@linode/api-v4';
-import { screen, waitFor } from '@testing-library/react';
+import { profileFactory } from '@linode/utilities';
+import {
+  screen,
+  waitFor,
+  waitForElementToBeRemoved,
+} from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { describe, expect } from 'vitest';
@@ -70,6 +75,47 @@ describe('DestinationCreate', () => {
     }
   );
 
+  it('should render Sample Destination Object Name and change its value according to Log Path Prefix input', async () => {
+    const profileUid = 123;
+    const [month, day, year] = new Date().toLocaleDateString().split('/');
+    server.use(
+      http.get('*/profile', () => {
+        return HttpResponse.json(profileFactory.build({ uid: profileUid }));
+      })
+    );
+
+    renderDestinationCreate();
+
+    const loadingElement = screen.queryByTestId('circle-progress');
+    await waitForElementToBeRemoved(loadingElement);
+
+    const samplePath = screen.getByText(
+      `/audit_logs/com.akamai.audit.login/${profileUid}/${year}/${month}/${day}/akamai_log-000166-1756015362-319597.gz`
+    );
+    expect(samplePath).toBeInTheDocument();
+
+    // Type the test value inside the input
+    const logPathPrefixInput = screen.getByLabelText('Log Path Prefix');
+
+    await userEvent.type(logPathPrefixInput, 'test');
+    // sample path should be created based on *log path* value
+    expect(samplePath.textContent).toEqual(
+      '/test/akamai_log-000166-1756015362-319597.gz'
+    );
+
+    await userEvent.clear(logPathPrefixInput);
+    await userEvent.type(logPathPrefixInput, '/test');
+    expect(samplePath.textContent).toEqual(
+      '/test/akamai_log-000166-1756015362-319597.gz'
+    );
+
+    await userEvent.clear(logPathPrefixInput);
+    await userEvent.type(logPathPrefixInput, '/');
+    expect(samplePath.textContent).toEqual(
+      '/akamai_log-000166-1756015362-319597.gz'
+    );
+  });
+
   describe('given Test Connection and Create Destination buttons', () => {
     const testConnectionButtonText = 'Test Connection';
     const createDestinationButtonText = 'Create Destination';
@@ -107,6 +153,9 @@ describe('DestinationCreate', () => {
           http.post('*/monitor/streams/destinations', () => {
             createDestinationSpy();
             return HttpResponse.json({});
+          }),
+          http.get('*/profile', () => {
+            return HttpResponse.json(profileFactory.build());
           })
         );
 
@@ -141,6 +190,9 @@ describe('DestinationCreate', () => {
           http.post('*/monitor/streams/destinations/verify', () => {
             verifyDestinationSpy();
             return HttpResponse.error();
+          }),
+          http.get('*/profile', () => {
+            return HttpResponse.json(profileFactory.build());
           })
         );
 
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.tsx
index 15b997bb0c1..dd0eb514589 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationCreate.tsx
@@ -1,7 +1,7 @@
 import { yupResolver } from '@hookform/resolvers/yup';
 import { destinationType } from '@linode/api-v4';
 import { useCreateDestinationMutation } from '@linode/queries';
-import { destinationSchema } from '@linode/validation';
+import { destinationFormSchema } from '@linode/validation';
 import { useNavigate } from '@tanstack/react-router';
 import { enqueueSnackbar } from 'notistack';
 import * as React from 'react';
@@ -9,8 +9,10 @@ import { FormProvider, useForm } from 'react-hook-form';
 
 import { DocumentTitleSegment } from 'src/components/DocumentTitle';
 import { LandingHeader } from 'src/components/LandingHeader';
+import { getDestinationPayloadDetails } from 'src/features/Delivery/deliveryUtils';
 import { DestinationForm } from 'src/features/Delivery/Destinations/DestinationForm/DestinationForm';
 
+import type { CreateDestinationPayload } from '@linode/api-v4';
 import type { LandingHeaderProps } from 'src/components/LandingHeader';
 import type { DestinationFormType } from 'src/features/Delivery/Shared/types';
 
@@ -39,14 +41,19 @@ export const DestinationCreate = () => {
       type: destinationType.LinodeObjectStorage,
       details: {
         region: '',
+        path: '',
       },
     },
     mode: 'onBlur',
-    resolver: yupResolver(destinationSchema),
+    resolver: yupResolver(destinationFormSchema),
   });
 
   const onSubmit = () => {
-    const destination = form.getValues();
+    const formValues = form.getValues();
+    const destination: CreateDestinationPayload = {
+      ...formValues,
+      details: getDestinationPayloadDetails(formValues.details),
+    };
 
     createDestination(destination)
       .then(() => {
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.tsx
index 17c777e4455..520d90093e4 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.tsx
@@ -4,8 +4,8 @@ import {
   useDestinationQuery,
   useUpdateDestinationMutation,
 } from '@linode/queries';
-import { Box, CircleProgress, ErrorState } from '@linode/ui';
-import { destinationSchema } from '@linode/validation';
+import { Box, CircleProgress, ErrorState, omitProps } from '@linode/ui';
+import { destinationFormSchema } from '@linode/validation';
 import { useNavigate, useParams } from '@tanstack/react-router';
 import { enqueueSnackbar } from 'notistack';
 import * as React from 'react';
@@ -17,6 +17,7 @@ import { LandingHeader } from 'src/components/LandingHeader';
 import { DestinationForm } from 'src/features/Delivery/Destinations/DestinationForm/DestinationForm';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 
+import type { UpdateDestinationPayloadWithId } from '@linode/api-v4';
 import type { LandingHeaderProps } from 'src/components/LandingHeader';
 import type { DestinationFormType } from 'src/features/Delivery/Shared/types';
 
@@ -53,24 +54,33 @@ export const DestinationEdit = () => {
       type: destinationType.LinodeObjectStorage,
       details: {
         region: '',
+        path: '',
       },
     },
     mode: 'onBlur',
-    resolver: yupResolver(destinationSchema),
+    resolver: yupResolver(destinationFormSchema),
   });
 
   useEffect(() => {
     if (destination) {
       form.reset({
         ...destination,
+        ...('path' in destination.details
+          ? {
+              details: {
+                ...destination.details,
+                path: destination.details.path || '',
+              },
+            }
+          : {}),
       });
     }
   }, [destination, form]);
 
   const onSubmit = () => {
-    const destination = {
+    const destination: UpdateDestinationPayloadWithId = {
       id: destinationId,
-      ...form.getValues(),
+      ...omitProps(form.getValues(), ['type']),
     };
 
     updateDestination(destination)
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.test.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.test.tsx
index cab58d9319e..da0c92e193d 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.test.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.test.tsx
@@ -1,18 +1,18 @@
-import { screen, waitForElementToBeRemoved } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 import { beforeEach, describe, expect } from 'vitest';
 
 import { destinationFactory } from 'src/factories/delivery';
 import { DestinationsLanding } from 'src/features/Delivery/Destinations/DestinationsLanding';
-import { makeResourcePage } from 'src/mocks/serverHandlers';
-import { http, HttpResponse, server } from 'src/mocks/testServer';
 import { mockMatchMedia, renderWithTheme } from 'src/utilities/testHelpers';
 
 const loadingTestId = 'circle-progress';
 
 const queryMocks = vi.hoisted(() => ({
   useNavigate: vi.fn(() => vi.fn()),
+  useSearch: vi.fn(),
+  useDestinationsQuery: vi.fn().mockReturnValue({}),
   useDeleteDestinationMutation: vi.fn().mockReturnValue({
     mutateAsync: vi.fn(),
   }),
@@ -23,6 +23,7 @@ vi.mock('@tanstack/react-router', async () => {
   return {
     ...actual,
     useNavigate: queryMocks.useNavigate,
+    useSearch: queryMocks.useSearch,
   };
 });
 
@@ -30,6 +31,7 @@ vi.mock('@linode/queries', async () => {
   const actual = await vi.importActual('@linode/queries');
   return {
     ...actual,
+    useDestinationsQuery: queryMocks.useDestinationsQuery,
     useDeleteDestinationMutation: queryMocks.useDeleteDestinationMutation,
   };
 });
@@ -38,27 +40,26 @@ const destination = destinationFactory.build({ id: 1 });
 const destinations = [destination, ...destinationFactory.buildList(30)];
 
 describe('Destinations Landing Table', () => {
-  const renderComponentAndWaitForLoadingComplete = async () => {
+  const renderComponent = () => {
     renderWithTheme(<DestinationsLanding />, {
       initialRoute: '/logs/delivery/destinations',
     });
-
-    const loadingElement = screen.queryByTestId(loadingTestId);
-    expect(loadingElement).toBeInTheDocument();
-    await waitForElementToBeRemoved(loadingElement);
   };
 
   beforeEach(() => {
     mockMatchMedia();
+    queryMocks.useSearch.mockReturnValue({});
   });
 
-  it('should render destinations landing tab header and table with items PaginationFooter', async () => {
-    server.use(
-      http.get('*/monitor/streams/destinations', () => {
-        return HttpResponse.json(makeResourcePage(destinations));
-      })
-    );
-    await renderComponentAndWaitForLoadingComplete();
+  it('should render destinations landing tab header and table with items PaginationFooter', () => {
+    queryMocks.useDestinationsQuery.mockReturnValue({
+      data: {
+        data: destinations,
+        results: 31,
+      },
+    });
+
+    renderComponent();
 
     // search text input
     screen.getByPlaceholderText('Search for a Destination');
@@ -80,20 +81,50 @@ describe('Destinations Landing Table', () => {
     expect(paginationFooterSelectPageSizeInput.value).toBe('Show 25');
   });
 
-  it('should render destinations landing empty state', async () => {
-    server.use(
-      http.get('*/monitor/streams/destinations', () => {
-        return HttpResponse.json(makeResourcePage([]));
-      })
-    );
+  it('should render destinations landing table with empty row when there are no search results', () => {
+    queryMocks.useDestinationsQuery.mockReturnValue({
+      data: {
+        data: [],
+        results: 0,
+      },
+    });
+
+    queryMocks.useSearch.mockReturnValue({
+      label: 'Same unknown label',
+    });
+
+    renderComponent();
 
-    await renderComponentAndWaitForLoadingComplete();
+    const emptyRow = screen.getByText('No items to display.');
+    expect(emptyRow).toBeInTheDocument();
+  });
+
+  it('should render destinations landing empty state', () => {
+    queryMocks.useDestinationsQuery.mockReturnValue({
+      data: {
+        data: [],
+        results: 0,
+      },
+    });
+
+    renderComponent();
 
     screen.getByText((text) =>
       text.includes('Create a destination for cloud logs')
     );
   });
 
+  it('should render loading state when fetching destinations', () => {
+    queryMocks.useDestinationsQuery.mockReturnValue({
+      isLoading: true,
+    });
+
+    renderComponent();
+
+    const loadingElement = screen.queryByTestId(loadingTestId);
+    expect(loadingElement).toBeInTheDocument();
+  });
+
   const clickOnActionMenu = async () => {
     const actionMenu = screen.getByLabelText(
       `Action menu for Destination ${destination.label}`
@@ -107,11 +138,12 @@ describe('Destinations Landing Table', () => {
 
   describe('given action menu', () => {
     beforeEach(() => {
-      server.use(
-        http.get('*/monitor/streams/destinations', () => {
-          return HttpResponse.json(makeResourcePage(destinations));
-        })
-      );
+      queryMocks.useDestinationsQuery.mockReturnValue({
+        data: {
+          data: destinations,
+          results: 31,
+        },
+      });
     });
 
     describe('when Edit clicked', () => {
@@ -119,7 +151,7 @@ describe('Destinations Landing Table', () => {
         const mockNavigate = vi.fn();
         queryMocks.useNavigate.mockReturnValue(mockNavigate);
 
-        await renderComponentAndWaitForLoadingComplete();
+        renderComponent();
 
         await clickOnActionMenu();
         await clickOnActionMenuItem('Edit');
@@ -137,7 +169,7 @@ describe('Destinations Landing Table', () => {
           mutateAsync: mockDeleteDestinationMutation,
         });
 
-        await renderComponentAndWaitForLoadingComplete();
+        renderComponent();
         await clickOnActionMenu();
         await clickOnActionMenuItem('Delete');
 
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.tsx
index fb42168268c..e7e0819165c 100644
--- a/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.tsx
+++ b/packages/manager/src/features/Delivery/Destinations/DestinationsLanding.tsx
@@ -11,6 +11,7 @@ import * as React from 'react';
 
 import { PaginationFooter } from 'src/components/PaginationFooter/PaginationFooter';
 import { TableCell } from 'src/components/TableCell';
+import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { TableSortCell } from 'src/components/TableSortCell';
 import {
   DESTINATIONS_TABLE_DEFAULT_ORDER,
@@ -87,17 +88,13 @@ export const DestinationsLanding = () => {
     navigate({ to: '/logs/delivery/destinations/create' });
   };
 
-  if (isLoading) {
-    return <CircleProgress />;
-  }
-
   if (error) {
     return (
       <ErrorState errorText="There was an error retrieving your destinations. Please reload and try again." />
     );
   }
 
-  if (!destinations?.data.length) {
+  if (destinations?.results === 0 && !search?.label) {
     return (
       <DestinationsLandingEmptyState navigateToCreate={navigateToCreate} />
     );
@@ -144,73 +141,80 @@ export const DestinationsLanding = () => {
         onSearch={onSearch}
         searchValue={search?.label ?? ''}
       />
-      <Table>
-        <TableHead>
-          <TableRow>
-            <TableSortCell
-              active={orderBy === 'label'}
-              direction={order}
-              handleClick={handleOrderChange}
-              label="label"
-              sx={{ width: '30%' }}
-            >
-              Name
-            </TableSortCell>
-            <TableSortCell
-              active={orderBy === 'type'}
-              direction={order}
-              handleClick={handleOrderChange}
-              label="type"
-            >
-              Type
-            </TableSortCell>
-            <TableSortCell
-              active={orderBy === 'id'}
-              direction={order}
-              handleClick={handleOrderChange}
-              label="id"
-            >
-              ID
-            </TableSortCell>
-            <Hidden smDown>
-              <TableSortCell
-                active={orderBy === 'created'}
-                direction={order}
-                handleClick={handleOrderChange}
-                label="created"
-              >
-                Creation Time
-              </TableSortCell>
-            </Hidden>
-            <TableSortCell
-              active={orderBy === 'updated'}
-              direction={order}
-              handleClick={handleOrderChange}
-              label="updated"
-            >
-              Last Modified
-            </TableSortCell>
-            <TableCell sx={{ width: '5%' }} />
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {destinations?.data.map((destination) => (
-            <DestinationTableRow
-              destination={destination}
-              key={destination.id}
-              {...handlers}
-            />
-          ))}
-        </TableBody>
-      </Table>
-      <PaginationFooter
-        count={destinations?.results || 0}
-        eventCategory="Destinations Table"
-        handlePageChange={pagination.handlePageChange}
-        handleSizeChange={pagination.handlePageSizeChange}
-        page={pagination.page}
-        pageSize={pagination.pageSize}
-      />
+      {isLoading ? (
+        <CircleProgress />
+      ) : (
+        <>
+          <Table>
+            <TableHead>
+              <TableRow>
+                <TableSortCell
+                  active={orderBy === 'label'}
+                  direction={order}
+                  handleClick={handleOrderChange}
+                  label="label"
+                  sx={{ width: '30%' }}
+                >
+                  Name
+                </TableSortCell>
+                <TableSortCell
+                  active={orderBy === 'type'}
+                  direction={order}
+                  handleClick={handleOrderChange}
+                  label="type"
+                >
+                  Type
+                </TableSortCell>
+                <TableSortCell
+                  active={orderBy === 'id'}
+                  direction={order}
+                  handleClick={handleOrderChange}
+                  label="id"
+                >
+                  ID
+                </TableSortCell>
+                <Hidden smDown>
+                  <TableSortCell
+                    active={orderBy === 'created'}
+                    direction={order}
+                    handleClick={handleOrderChange}
+                    label="created"
+                  >
+                    Creation Time
+                  </TableSortCell>
+                </Hidden>
+                <TableSortCell
+                  active={orderBy === 'updated'}
+                  direction={order}
+                  handleClick={handleOrderChange}
+                  label="updated"
+                >
+                  Last Modified
+                </TableSortCell>
+                <TableCell sx={{ width: '5%' }} />
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {destinations?.data.map((destination) => (
+                <DestinationTableRow
+                  destination={destination}
+                  key={destination.id}
+                  {...handlers}
+                />
+              ))}
+              {destinations?.results === 0 && <TableRowEmpty colSpan={6} />}
+            </TableBody>
+          </Table>
+          <PaginationFooter
+            count={destinations?.results || 0}
+            eventCategory="Destinations Table"
+            handlePageChange={pagination.handlePageChange}
+            handleSizeChange={pagination.handlePageSizeChange}
+            page={pagination.page}
+            pageSize={pagination.pageSize}
+          />
+        </>
+      )}
     </>
   );
 };
diff --git a/packages/manager/src/features/Delivery/Shared/DestinationLinodeObjectStorageDetailsForm.tsx b/packages/manager/src/features/Delivery/Shared/DestinationLinodeObjectStorageDetailsForm.tsx
index cf599ef9374..9f99b4f030f 100644
--- a/packages/manager/src/features/Delivery/Shared/DestinationLinodeObjectStorageDetailsForm.tsx
+++ b/packages/manager/src/features/Delivery/Shared/DestinationLinodeObjectStorageDetailsForm.tsx
@@ -2,7 +2,7 @@ import { useRegionsQuery } from '@linode/queries';
 import { useIsGeckoEnabled } from '@linode/shared';
 import { Box, Divider, TextField, Typography } from '@linode/ui';
 import React from 'react';
-import { Controller, useFormContext } from 'react-hook-form';
+import { Controller, useFormContext, useWatch } from 'react-hook-form';
 
 import { HideShowText } from 'src/components/PasswordInput/HideShowText';
 import { RegionSelect } from 'src/components/RegionSelect/RegionSelect';
@@ -36,6 +36,10 @@ export const DestinationLinodeObjectStorageDetailsForm = ({
   const { isGeckoLAEnabled } = useIsGeckoEnabled(gecko2?.enabled, gecko2?.la);
   const { data: regions } = useRegionsQuery();
   const { control } = useFormContext();
+  const path = useWatch({
+    control,
+    name: controlPaths?.path,
+  });
 
   return (
     <>
@@ -126,7 +130,13 @@ export const DestinationLinodeObjectStorageDetailsForm = ({
       />
       <Divider sx={{ my: 3 }} />
       <Typography variant="h2">Path</Typography>
-      <Box alignItems="end" display="flex" flexWrap="wrap" gap="16px">
+      <Box
+        alignItems="baseline"
+        display="flex"
+        flexWrap="wrap"
+        gap="16px"
+        sx={{ '> *': { width: '100%' } }}
+      >
         <Controller
           control={control}
           name={controlPaths.path}
@@ -138,14 +148,12 @@ export const DestinationLinodeObjectStorageDetailsForm = ({
               onBlur={field.onBlur}
               onChange={(value) => field.onChange(value)}
               placeholder="Log Path Prefix"
-              sx={{ width: 416 }}
+              sx={{ maxWidth: 416 }}
               value={field.value}
             />
           )}
         />
-        <PathSample
-          value="text-cloud/logs/audit/02/26/2026" // TODO: Generate sample path value in DPS-34666
-        />
+        <PathSample value={path} />
       </Box>
     </>
   );
diff --git a/packages/manager/src/features/Delivery/Shared/LabelValue.tsx b/packages/manager/src/features/Delivery/Shared/LabelValue.tsx
index 0104400dcf0..da41143ffc3 100644
--- a/packages/manager/src/features/Delivery/Shared/LabelValue.tsx
+++ b/packages/manager/src/features/Delivery/Shared/LabelValue.tsx
@@ -3,6 +3,7 @@ import { styled, useTheme } from '@mui/material/styles';
 import * as React from 'react';
 
 interface LabelValueProps {
+  children?: React.ReactNode;
   compact?: boolean;
   'data-testid'?: string;
   label: string;
@@ -10,7 +11,13 @@ interface LabelValueProps {
 }
 
 export const LabelValue = (props: LabelValueProps) => {
-  const { compact = false, label, value, 'data-testid': dataTestId } = props;
+  const {
+    compact = false,
+    label,
+    value,
+    'data-testid': dataTestId,
+    children,
+  } = props;
   const theme = useTheme();
 
   return (
@@ -29,6 +36,7 @@ export const LabelValue = (props: LabelValueProps) => {
         {label}:
       </Typography>
       <StyledValue data-testid={dataTestId}>{value}</StyledValue>
+      {children}
     </Box>
   );
 };
diff --git a/packages/manager/src/features/Delivery/Shared/PathSample.tsx b/packages/manager/src/features/Delivery/Shared/PathSample.tsx
index 15920c4a658..77ae2f2cac1 100644
--- a/packages/manager/src/features/Delivery/Shared/PathSample.tsx
+++ b/packages/manager/src/features/Delivery/Shared/PathSample.tsx
@@ -1,6 +1,23 @@
-import { Box, InputLabel } from '@linode/ui';
+import { streamType, type StreamType } from '@linode/api-v4';
+import { useProfile } from '@linode/queries';
+import { Box, InputLabel, Stack, TooltipIcon, Typography } from '@linode/ui';
 import { styled } from '@mui/material/styles';
 import * as React from 'react';
+import { useMemo } from 'react';
+import { useFormContext, useWatch } from 'react-hook-form';
+
+import { getStreamTypeOption } from 'src/features/Delivery/deliveryUtils';
+
+const sxTooltipIcon = {
+  marginLeft: '4px',
+  padding: '0px',
+  marginTop: '-2px',
+};
+
+const logType = {
+  [streamType.LKEAuditLogs]: 'com.akamai.audit.k8s',
+  [streamType.AuditLogs]: 'com.akamai.audit.login',
+};
 
 interface PathSampleProps {
   value: string;
@@ -8,18 +25,89 @@ interface PathSampleProps {
 
 export const PathSample = (props: PathSampleProps) => {
   const { value } = props;
+  const fileName = 'akamai_log-000166-1756015362-319597.gz';
+  const sampleClusterId = useMemo(
+    // eslint-disable-next-line sonarjs/pseudo-random
+    () => Math.floor(Math.random() * 90000) + 10000,
+    []
+  );
+
+  const { control } = useFormContext();
+  const streamTypeFormValue = useWatch({
+    control,
+    name: 'stream.type',
+  });
+
+  const clusterId = useWatch({
+    control,
+    name: 'stream.details.cluster_ids[0]',
+  });
+
+  const { data: profile } = useProfile();
+  const [month, day, year] = new Date().toLocaleDateString().split('/');
+
+  const setStreamType = (): StreamType => {
+    return streamTypeFormValue ?? streamType.AuditLogs;
+  };
+
+  const streamTypeValue = useMemo(setStreamType, [streamTypeFormValue]);
+
+  const createSamplePath = (): string => {
+    let partition = '';
+
+    if (streamTypeValue === streamType.LKEAuditLogs) {
+      partition = `${clusterId ?? sampleClusterId}/`;
+    }
+
+    return `/${streamTypeValue}/${logType[streamTypeValue]}/${profile?.uid}/${partition}${year}/${month}/${day}`;
+  };
+
+  const defaultPath = useMemo(createSamplePath, [
+    profile,
+    streamTypeValue,
+    clusterId,
+  ]);
+
+  const getPath = () => {
+    if (value === '/') {
+      return `/${fileName}`;
+    }
+
+    const path = `${value || defaultPath}/${fileName}`;
+
+    if (!path.startsWith('/')) {
+      return `/${path}`;
+    }
+
+    return path;
+  };
 
   return (
     <Box display="flex" flexDirection="column">
-      <InputLabel>Destination object name sample</InputLabel>
-      <StyledValue>{value}</StyledValue>
+      <InputLabel>
+        Sample Destination Object Name
+        <TooltipIcon
+          status="info"
+          sxTooltipIcon={sxTooltipIcon}
+          text={
+            <Stack spacing={2}>
+              <Typography>Default paths:</Typography>
+              <Typography>{`${getStreamTypeOption(streamType.LKEAuditLogs)?.label} - {stream_type}/{log_type}/ {account}/{partition}/ {%Y/%m/%d/}`}</Typography>
+              <Typography>{`${getStreamTypeOption(streamType.AuditLogs)?.label} - {stream_type}/{log_type}/ {account}/{%Y/%m/%d/}`}</Typography>
+            </Stack>
+          }
+        />
+      </InputLabel>
+      <StyledValue>{getPath()}</StyledValue>
     </Box>
   );
 };
 
 const StyledValue = styled('span', { label: 'StyledValue' })(({ theme }) => ({
   backgroundColor: theme.tokens.alias.Interaction.Background.Disabled,
-  height: 34,
-  width: theme.inputMaxWidth,
+  width: '100%',
+  maxWidth: 'max-content',
+  minHeight: 34,
   padding: theme.spacingFunction(8),
+  overflowWrap: 'anywhere',
 }));
diff --git a/packages/manager/src/features/Delivery/Shared/types.ts b/packages/manager/src/features/Delivery/Shared/types.ts
index 0730b676705..ceac897e5ce 100644
--- a/packages/manager/src/features/Delivery/Shared/types.ts
+++ b/packages/manager/src/features/Delivery/Shared/types.ts
@@ -2,7 +2,7 @@ import { destinationType, streamStatus, streamType } from '@linode/api-v4';
 
 import type {
   CreateDestinationPayload,
-  UpdateDestinationPayload,
+  DestinationDetails,
 } from '@linode/api-v4';
 
 export type FormMode = 'create' | 'edit';
@@ -46,6 +46,9 @@ export const streamStatusOptions: LabelValueOption[] = [
   },
 ];
 
-export type DestinationFormType =
-  | CreateDestinationPayload
-  | UpdateDestinationPayload;
+export interface DestinationForm
+  extends Omit<CreateDestinationPayload, 'details'> {
+  details: DestinationDetails;
+}
+
+export type DestinationFormType = DestinationForm;
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.tsx
index 745346f8a88..bb4ac9a2d11 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClusters.tsx
@@ -29,7 +29,7 @@ const controlPaths = {
 } as const;
 
 export const StreamFormClusters = () => {
-  const { control, setValue, formState } =
+  const { control, setValue, formState, trigger } =
     useFormContext<StreamAndDestinationFormType>();
 
   const [order, setOrder] = useState<'asc' | 'desc'>('asc');
@@ -55,7 +55,6 @@ export const StreamFormClusters = () => {
     error,
   } = useKubernetesClustersQuery({
     filter,
-    isUsingBetaEndpoint: true,
     params: {
       page,
       page_size: pageSize,
@@ -109,14 +108,14 @@ export const StreamFormClusters = () => {
             render={({ field }) => (
               <Checkbox
                 checked={field.value}
-                onBlur={field.onBlur}
-                onChange={(_, checked) => {
+                onChange={async (_, checked) => {
                   field.onChange(checked);
                   if (checked) {
                     setValue(controlPaths.clusterIds, idsWithLogsEnabled);
                   } else {
                     setValue(controlPaths.clusterIds, []);
                   }
+                  await trigger('stream.details');
                 }}
                 sxFormLabel={{ ml: -1 }}
                 text="Automatically include all existing and recently configured clusters."
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTable.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTable.tsx
index 4c4b5495448..8b3fa16c815 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTable.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Clusters/StreamFormClustersTable.tsx
@@ -43,8 +43,10 @@ export const StreamFormClusterTableContent = ({
     selectedIds.length === (idsWithLogsEnabled?.length ?? 0);
   const isIndeterminate = selectedIds.length > 0 && !isAllSelected;
 
-  const toggleAllClusters = () =>
+  const toggleAllClusters = () => {
     field.onChange(isAllSelected ? [] : idsWithLogsEnabled);
+    field.onBlur();
+  };
 
   const toggleCluster = (toggledId: number) => {
     const updatedClusterIds = selectedIds.includes(toggledId)
@@ -52,6 +54,7 @@ export const StreamFormClusterTableContent = ({
       : [...selectedIds, toggledId];
 
     field.onChange(updatedClusterIds);
+    field.onBlur();
   };
 
   return (
@@ -114,7 +117,6 @@ export const StreamFormClusterTableContent = ({
                     aria-label={`Toggle ${label} cluster`}
                     checked={selectedIds.includes(id)}
                     disabled={isAutoAddAllClustersEnabled || !logsEnabled}
-                    onBlur={field.onBlur}
                     onChange={() => toggleCluster(id)}
                   />
                 </TableCell>
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationLinodeObjectStorageDetailsSummary.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationLinodeObjectStorageDetailsSummary.test.tsx
index b66fe12a369..13a7e819123 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationLinodeObjectStorageDetailsSummary.test.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationLinodeObjectStorageDetailsSummary.test.tsx
@@ -1,6 +1,7 @@
 import { regionFactory } from '@linode/utilities';
 import { screen, waitFor } from '@testing-library/react';
 import React from 'react';
+import { expect } from 'vitest';
 
 import { makeResourcePage } from 'src/mocks/serverHandlers';
 import { http, HttpResponse, server } from 'src/mocks/testServer';
@@ -39,6 +40,7 @@ describe('DestinationLinodeObjectStorageDetailsSummary', () => {
     expect(screen.getByText('test bucket')).toBeVisible();
     // Log Path:
     expect(screen.getByText('test/path')).toBeVisible();
+    expect(screen.queryByTestId('tooltip-info-icon')).not.toBeInTheDocument();
     // Region:
     await waitFor(() => {
       expect(screen.getByText('US, Chicago, IL')).toBeVisible();
@@ -52,4 +54,30 @@ describe('DestinationLinodeObjectStorageDetailsSummary', () => {
       '*****************'
     );
   });
+
+  it('renders info icon next to path when it is empty', async () => {
+    server.use(
+      http.get('*/regions', () => {
+        const regions = regionFactory.buildList(1, {
+          id: 'us-ord',
+          label: 'Chicago, IL',
+        });
+        return HttpResponse.json(makeResourcePage(regions));
+      })
+    );
+
+    const details = {
+      bucket_name: 'test bucket',
+      host: 'test host',
+      path: '',
+      region: 'us-ord',
+    } as LinodeObjectStorageDetails;
+
+    renderWithTheme(
+      <DestinationLinodeObjectStorageDetailsSummary {...details} />
+    );
+
+    // Log Path info icon:
+    expect(screen.getByTestId('tooltip-info-icon')).toBeVisible();
+  });
 });
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationLinodeObjectStorageDetailsSummary.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationLinodeObjectStorageDetailsSummary.tsx
index fa578cc4da3..5da8052d576 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationLinodeObjectStorageDetailsSummary.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/DestinationLinodeObjectStorageDetailsSummary.tsx
@@ -1,10 +1,18 @@
+import { streamType } from '@linode/api-v4';
 import { useRegionsQuery } from '@linode/queries';
+import { Stack, TooltipIcon, Typography } from '@linode/ui';
 import React from 'react';
 
+import { getStreamTypeOption } from 'src/features/Delivery/deliveryUtils';
 import { LabelValue } from 'src/features/Delivery/Shared/LabelValue';
 
 import type { LinodeObjectStorageDetails } from '@linode/api-v4';
 
+const sxTooltipIcon = {
+  marginLeft: '4px',
+  padding: '0px',
+};
+
 export const DestinationLinodeObjectStorageDetailsSummary = (
   props: LinodeObjectStorageDetails
 ) => {
@@ -28,7 +36,21 @@ export const DestinationLinodeObjectStorageDetailsSummary = (
         label="Secret Access Key"
         value="*****************"
       />
-      <LabelValue label="Log Path" value={path} />
+      <LabelValue label="Log Path" value={path}>
+        {!path && (
+          <TooltipIcon
+            status="info"
+            sxTooltipIcon={sxTooltipIcon}
+            text={
+              <Stack spacing={2}>
+                <Typography>Default paths:</Typography>
+                <Typography>{`${getStreamTypeOption(streamType.LKEAuditLogs)?.label} - {stream_type}/{log_type}/ {account}/{partition}/ {%Y/%m/%d/}`}</Typography>
+                <Typography>{`${getStreamTypeOption(streamType.AuditLogs)?.label} - {stream_type}/{log_type}/ {account}/{%Y/%m/%d/}`}</Typography>
+              </Stack>
+            }
+          />
+        )}
+      </LabelValue>
     </>
   );
 };
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.test.tsx
index 45b5891553f..e7b78bebf3f 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.test.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.test.tsx
@@ -86,6 +86,9 @@ describe('StreamFormDelivery', () => {
             label: '',
             type: destinationType.LinodeObjectStorage,
           },
+          stream: {
+            destinations: [],
+          },
         },
       },
     });
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.tsx
index 15518bd479a..e2179724e3d 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.tsx
@@ -49,13 +49,13 @@ export const StreamFormDelivery = () => {
   const [creatingNewDestination, setCreatingNewDestination] =
     useState<boolean>(false);
 
-  const destinationNameOptions: DestinationName[] = (
-    destinations?.data || []
-  ).map(({ id, label, type }) => ({
-    id,
-    label,
-    type,
-  }));
+  const destinationNameOptions: DestinationName[] = (destinations || []).map(
+    ({ id, label, type }) => ({
+      id,
+      label,
+      type,
+    })
+  );
 
   const selectedDestinationType = useWatch({
     control,
@@ -67,10 +67,18 @@ export const StreamFormDelivery = () => {
     name: 'stream.destinations',
   });
 
-  const destinationNameFilterOptions = createFilterOptions<DestinationName>();
+  const destinationNameFilterOptions = createFilterOptions<DestinationName>({
+    stringify: (destination) => destination.label,
+  });
 
   const findDestination = (id: number) =>
-    destinations?.data?.find((destination) => destination.id === id);
+    destinations?.find((destination) => destination.id === id);
+
+  const restDestinationForm = () => {
+    Object.values(controlPaths).forEach((controlPath) =>
+      setValue(controlPath, '')
+    );
+  };
 
   const getDestinationForm = () => (
     <>
@@ -121,6 +129,10 @@ export const StreamFormDelivery = () => {
             onChange={(_, newValue) => {
               const id = newValue?.id;
 
+              if (id === undefined && selectedDestinations.length > 0) {
+                restDestinationForm();
+              }
+
               setValue('stream.destinations', id ? [id] : []);
               const selectedDestination = id ? findDestination(id) : undefined;
               if (selectedDestination) {
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.test.tsx
index 5f9739fdb38..183e1ffb692 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.test.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.test.tsx
@@ -28,6 +28,7 @@ describe('StreamCreate', () => {
             type: destinationType.LinodeObjectStorage,
             details: {
               region: '',
+              path: '',
             },
           },
         },
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.tsx
index f7728d87a35..590f72dd1ab 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.tsx
@@ -33,12 +33,14 @@ export const StreamCreate = () => {
     defaultValues: {
       stream: {
         type: streamType.AuditLogs,
-        details: {},
+        details: null,
+        destinations: [],
       },
       destination: {
         type: destinationType.LinodeObjectStorage,
         details: {
           region: '',
+          path: '',
         },
       },
     },
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.test.tsx
index 7520ac662b1..d85749da1b2 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.test.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.test.tsx
@@ -97,6 +97,26 @@ describe('StreamEdit', () => {
           { exact: false }
         );
         await userEvent.click(createNewTestDestination);
+        const hostInput = screen.getByLabelText('Host');
+        await waitFor(() => {
+          expect(hostInput).toBeDefined();
+        });
+        await userEvent.type(hostInput, 'Test');
+        const bucketInput = screen.getByLabelText('Bucket');
+        await userEvent.type(bucketInput, 'Test');
+        const regionAutocomplete = screen.getByLabelText('Region');
+        await userEvent.click(regionAutocomplete);
+        await userEvent.type(regionAutocomplete, 'US, Chi');
+        const chicagoRegion = await screen.findByText(
+          'US, Chicago, IL (us-ord)'
+        );
+        await userEvent.click(chicagoRegion);
+        const accessKeyIDInput = screen.getByLabelText('Access Key ID');
+        await userEvent.type(accessKeyIDInput, 'Test');
+        const secretAccessKeyInput = screen.getByLabelText('Secret Access Key');
+        await userEvent.type(secretAccessKeyInput, 'Test');
+        const logPathPrefixInput = screen.getByLabelText('Log Path Prefix');
+        await userEvent.type(logPathPrefixInput, 'Test');
       };
 
       describe('when form properly filled out and Test Connection button clicked and connection verified positively', () => {
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.tsx
index 6ede8ecf012..889280b9e48 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.tsx
@@ -51,12 +51,14 @@ export const StreamEdit = () => {
     defaultValues: {
       stream: {
         type: streamType.AuditLogs,
-        details: {},
+        details: null,
+        destinations: [],
       },
       destination: {
         type: destinationType.LinodeObjectStorage,
         details: {
           region: '',
+          path: '',
         },
       },
     },
@@ -65,26 +67,39 @@ export const StreamEdit = () => {
   });
 
   useEffect(() => {
-    if (stream) {
-      const details =
-        Object.keys(stream.details).length > 0
-          ? {
-              is_auto_add_all_clusters_enabled: false,
-              cluster_ids: [],
-              ...stream.details,
-            }
-          : {};
+    if (stream && destinations) {
+      const details = stream.details
+        ? {
+            is_auto_add_all_clusters_enabled: false,
+            cluster_ids: [],
+            ...stream.details,
+          }
+        : null;
 
       const streamsDestinationIds = stream.destinations.map(({ id }) => id);
+      const destination = destinations?.find(
+        ({ id }) => id === streamsDestinationIds[0]
+      );
+
       form.reset({
         stream: {
           ...stream,
           details,
           destinations: streamsDestinationIds,
         },
-        destination: destinations?.data?.find(
-          ({ id }) => id === streamsDestinationIds[0]
-        ),
+        destination: destination
+          ? {
+              ...destination,
+              ...('path' in destination.details
+                ? {
+                    details: {
+                      ...destination.details,
+                      path: destination.details.path || '',
+                    },
+                  }
+                : {}),
+            }
+          : undefined,
       });
     }
   }, [stream, destinations, form]);
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamForm.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamForm.tsx
index 00ae4fbe5ab..d6cf126a6f3 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamForm.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamForm.tsx
@@ -1,4 +1,8 @@
-import { type StreamStatus, streamType } from '@linode/api-v4';
+import {
+  type CreateDestinationPayload,
+  type StreamStatus,
+  streamType,
+} from '@linode/api-v4';
 import {
   useCreateDestinationMutation,
   useCreateStreamMutation,
@@ -12,7 +16,10 @@ import * as React from 'react';
 import { useEffect } from 'react';
 import { type SubmitHandler, useFormContext, useWatch } from 'react-hook-form';
 
-import { getStreamPayloadDetails } from 'src/features/Delivery/deliveryUtils';
+import {
+  getDestinationPayloadDetails,
+  getStreamPayloadDetails,
+} from 'src/features/Delivery/deliveryUtils';
 import { FormSubmitBar } from 'src/features/Delivery/Shared/FormSubmitBar/FormSubmitBar';
 import { useVerifyDestination } from 'src/features/Delivery/Shared/useVerifyDestination';
 import { StreamFormDelivery } from 'src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery';
@@ -79,7 +86,11 @@ export const StreamForm = (props: StreamFormProps) => {
     let destinationId = destinations?.[0];
     if (!destinationId) {
       try {
-        const { id } = await createDestination(destination);
+        const destinationPayload: CreateDestinationPayload = {
+          ...destination,
+          details: getDestinationPayloadDetails(destination.details),
+        };
+        const { id } = await createDestination(destinationPayload);
         destinationId = id;
         enqueueSnackbar(
           `Destination ${destination.label} created successfully`,
@@ -119,7 +130,6 @@ export const StreamForm = (props: StreamFormProps) => {
         await updateStream({
           id: streamId,
           label,
-          type,
           status: status as StreamStatus,
           destinations: [destinationId],
           details: payloadDetails,
@@ -172,7 +182,7 @@ export const StreamForm = (props: StreamFormProps) => {
           <FormSubmitBar
             blockSubmit={!selectedDestinations?.length}
             connectionTested={destinationVerified}
-            destinationType={destination.type}
+            destinationType={destination?.type}
             formType={'stream'}
             isSubmitting={isSubmitting}
             isTesting={isVerifyingDestination}
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx
index 21f85022a3c..2677bab0106 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx
@@ -26,7 +26,7 @@ export const StreamFormGeneralInfo = (props: StreamFormGeneralInfoProps) => {
     if (value === streamType.LKEAuditLogs) {
       setValue('stream.details.is_auto_add_all_clusters_enabled', false);
     } else {
-      setValue('stream.details', {});
+      setValue('stream.details', null);
     }
   };
 
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/types.ts b/packages/manager/src/features/Delivery/Streams/StreamForm/types.ts
index e205160f931..232d79b61f4 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamForm/types.ts
+++ b/packages/manager/src/features/Delivery/Streams/StreamForm/types.ts
@@ -1,7 +1,11 @@
-import type { CreateStreamPayload } from '@linode/api-v4';
+import type { CreateStreamPayload, StreamDetailsType } from '@linode/api-v4';
 import type { DestinationFormType } from 'src/features/Delivery/Shared/types';
 
+export interface StreamFromType extends Omit<CreateStreamPayload, 'details'> {
+  details: StreamDetailsType;
+}
+
 export interface StreamAndDestinationFormType {
   destination: DestinationFormType;
-  stream: CreateStreamPayload;
+  stream: StreamFromType;
 }
diff --git a/packages/manager/src/features/Delivery/Streams/StreamsLanding.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamsLanding.test.tsx
index b21e33cf5dc..dbf71d20663 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamsLanding.test.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamsLanding.test.tsx
@@ -1,22 +1,17 @@
-import {
-  screen,
-  waitForElementToBeRemoved,
-  within,
-} from '@testing-library/react';
+import { screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 import { beforeEach, describe, expect } from 'vitest';
 
 import { streamFactory } from 'src/factories/delivery';
 import { StreamsLanding } from 'src/features/Delivery/Streams/StreamsLanding';
-import { makeResourcePage } from 'src/mocks/serverHandlers';
-import { http, HttpResponse, server } from 'src/mocks/testServer';
 import { mockMatchMedia, renderWithTheme } from 'src/utilities/testHelpers';
 
 const loadingTestId = 'circle-progress';
-
 const queryMocks = vi.hoisted(() => ({
   useNavigate: vi.fn(() => vi.fn()),
+  useSearch: vi.fn(),
+  useStreamsQuery: vi.fn().mockReturnValue({}),
   useUpdateStreamMutation: vi.fn().mockReturnValue({
     mutateAsync: vi.fn(),
   }),
@@ -30,6 +25,7 @@ vi.mock('@tanstack/react-router', async () => {
   return {
     ...actual,
     useNavigate: queryMocks.useNavigate,
+    useSearch: queryMocks.useSearch,
   };
 });
 
@@ -37,6 +33,7 @@ vi.mock('@linode/queries', async () => {
   const actual = await vi.importActual('@linode/queries');
   return {
     ...actual,
+    useStreamsQuery: queryMocks.useStreamsQuery,
     useUpdateStreamMutation: queryMocks.useUpdateStreamMutation,
     useDeleteStreamMutation: queryMocks.useDeleteStreamMutation,
   };
@@ -46,28 +43,27 @@ const stream = streamFactory.build({ id: 1 });
 const streams = [stream, ...streamFactory.buildList(30)];
 
 describe('Streams Landing Table', () => {
-  const renderComponentAndWaitForLoadingComplete = async () => {
+  const renderComponent = () => {
     renderWithTheme(<StreamsLanding />, {
       initialRoute: '/logs/delivery/streams',
     });
-
-    const loadingElement = screen.queryByTestId(loadingTestId);
-    expect(loadingElement).toBeInTheDocument();
-    await waitForElementToBeRemoved(loadingElement);
   };
 
   beforeEach(() => {
     mockMatchMedia();
+    queryMocks.useSearch.mockReturnValue({});
   });
 
-  it('should render streams landing tab header and table with items PaginationFooter', async () => {
-    server.use(
-      http.get('*/monitor/streams', () => {
-        return HttpResponse.json(makeResourcePage(streams));
-      })
-    );
+  it('should render streams landing tab header and table with items PaginationFooter', () => {
+    queryMocks.useStreamsQuery.mockReturnValue({
+      data: {
+        data: streams,
+        results: 31,
+      },
+      isLoading: false,
+    });
 
-    await renderComponentAndWaitForLoadingComplete();
+    renderComponent();
 
     // search text input
     screen.getByPlaceholderText('Search for a Stream');
@@ -93,20 +89,50 @@ describe('Streams Landing Table', () => {
     expect(paginationFooterSelectPageSizeInput.value).toBe('Show 25');
   });
 
-  it('should render streams landing empty state', async () => {
-    server.use(
-      http.get('*/monitor/streams', () => {
-        return HttpResponse.json(makeResourcePage([]));
-      })
-    );
+  it('should render streams landing table with empty row when there are no search results', () => {
+    queryMocks.useStreamsQuery.mockReturnValue({
+      data: {
+        data: [],
+        results: 0,
+      },
+    });
+
+    queryMocks.useSearch.mockReturnValue({
+      label: 'Same unknown label',
+    });
+
+    renderComponent();
 
-    await renderComponentAndWaitForLoadingComplete();
+    const emptyRow = screen.getByText('No items to display.');
+    expect(emptyRow).toBeInTheDocument();
+  });
+
+  it('should render streams landing empty state', () => {
+    queryMocks.useStreamsQuery.mockReturnValue({
+      data: {
+        data: [],
+        results: 0,
+      },
+    });
+
+    renderComponent();
 
     screen.getByText((text) =>
       text.includes('Create a stream and configure delivery of cloud logs')
     );
   });
 
+  it('should render loading state when fetching streams', () => {
+    queryMocks.useStreamsQuery.mockReturnValue({
+      isLoading: true,
+    });
+
+    renderComponent();
+
+    const loadingElement = screen.queryByTestId(loadingTestId);
+    expect(loadingElement).toBeInTheDocument();
+  });
+
   const clickOnActionMenu = async () => {
     const actionMenu = screen.getByLabelText(
       `Action menu for Stream ${stream.label}`
@@ -120,11 +146,12 @@ describe('Streams Landing Table', () => {
 
   describe('given action menu', () => {
     beforeEach(() => {
-      server.use(
-        http.get('*/monitor/streams', () => {
-          return HttpResponse.json(makeResourcePage(streams));
-        })
-      );
+      queryMocks.useStreamsQuery.mockReturnValue({
+        data: {
+          data: streams,
+          results: 31,
+        },
+      });
     });
 
     describe('when Edit clicked', () => {
@@ -132,7 +159,7 @@ describe('Streams Landing Table', () => {
         const mockNavigate = vi.fn();
         queryMocks.useNavigate.mockReturnValue(mockNavigate);
 
-        await renderComponentAndWaitForLoadingComplete();
+        renderComponent();
 
         await clickOnActionMenu();
         await clickOnActionMenuItem('Edit');
@@ -150,7 +177,7 @@ describe('Streams Landing Table', () => {
           mutateAsync: mockUpdateStreamMutation,
         });
 
-        await renderComponentAndWaitForLoadingComplete();
+        renderComponent();
         await clickOnActionMenu();
         await clickOnActionMenuItem('Disable');
 
@@ -159,8 +186,7 @@ describe('Streams Landing Table', () => {
           status: 'inactive',
           label: 'Stream 1',
           destinations: [123],
-          details: {},
-          type: 'audit_logs',
+          details: null,
         });
       });
     });
@@ -173,7 +199,7 @@ describe('Streams Landing Table', () => {
         });
 
         stream.status = 'inactive';
-        await renderComponentAndWaitForLoadingComplete();
+        renderComponent();
         await clickOnActionMenu();
         await clickOnActionMenuItem('Enable');
 
@@ -182,8 +208,7 @@ describe('Streams Landing Table', () => {
           status: 'active',
           label: 'Stream 1',
           destinations: [123],
-          details: {},
-          type: 'audit_logs',
+          details: null,
         });
       });
     });
@@ -195,7 +220,7 @@ describe('Streams Landing Table', () => {
           mutateAsync: mockDeleteStreamMutation,
         });
 
-        await renderComponentAndWaitForLoadingComplete();
+        renderComponent();
         await clickOnActionMenu();
         await clickOnActionMenuItem('Delete');
 
diff --git a/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx b/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx
index de441286baf..1e27f0ccc67 100644
--- a/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx
+++ b/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx
@@ -12,6 +12,7 @@ import { enqueueSnackbar } from 'notistack';
 import * as React from 'react';
 
 import { PaginationFooter } from 'src/components/PaginationFooter/PaginationFooter';
+import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { TableSortCell } from 'src/components/TableSortCell';
 import { DeliveryTabHeader } from 'src/features/Delivery/Shared/DeliveryTabHeader/DeliveryTabHeader';
 import { streamStatusOptions } from 'src/features/Delivery/Shared/types';
@@ -31,7 +32,6 @@ import type { Stream } from '@linode/api-v4';
 
 export const StreamsLanding = () => {
   const navigate = useNavigate();
-
   const streamsUrl = '/logs/delivery/streams';
   const search = useSearch({
     from: '/logs/delivery/streams',
@@ -63,7 +63,7 @@ export const StreamsLanding = () => {
       label: { '+contains': search?.label },
     }),
     ...(search?.status !== undefined && {
-      status: { '+contains': search?.status },
+      status: search?.status,
     }),
   };
 
@@ -106,17 +106,13 @@ export const StreamsLanding = () => {
     navigate({ to: '/logs/delivery/streams/create' });
   };
 
-  if (isLoading) {
-    return <CircleProgress />;
-  }
-
   if (error) {
     return (
       <ErrorState errorText="There was an error retrieving your streams. Please reload and try again." />
     );
   }
 
-  if (!streams?.data.length) {
+  if (streams?.results === 0 && !search?.status && !search?.label) {
     return <StreamsLandingEmptyState navigateToCreate={navigateToCreate} />;
   }
 
@@ -151,7 +147,6 @@ export const StreamsLanding = () => {
     destinations,
     details,
     label,
-    type,
     status,
   }: Stream) => {
     updateStream({
@@ -159,7 +154,6 @@ export const StreamsLanding = () => {
       destinations: destinations.map(({ id: destinationId }) => destinationId),
       details,
       label,
-      type,
       status:
         status === streamStatus.Active
           ? streamStatus.Inactive
@@ -205,65 +199,73 @@ export const StreamsLanding = () => {
         selectList={streamStatusOptions}
         selectValue={search?.status}
       />
-      <Table>
-        <TableHead>
-          <TableRow>
-            <TableSortCell
-              active={orderBy === 'label'}
-              direction={order}
-              handleClick={handleOrderChange}
-              label="label"
-              sx={{ width: '30%' }}
-            >
-              Name
-            </TableSortCell>
-            <TableCell>Stream Type</TableCell>
-            <TableSortCell
-              active={orderBy === 'status'}
-              direction={order}
-              handleClick={handleOrderChange}
-              label="status"
-            >
-              Status
-            </TableSortCell>
-            <TableSortCell
-              active={orderBy === 'id'}
-              direction={order}
-              handleClick={handleOrderChange}
-              label="id"
-            >
-              ID
-            </TableSortCell>
-            <Hidden smDown>
-              <TableCell>Destination Type</TableCell>
-            </Hidden>
-            <Hidden lgDown>
-              <TableSortCell
-                active={orderBy === 'created'}
-                direction={order}
-                handleClick={handleOrderChange}
-                label="created"
-              >
-                Creation Time
-              </TableSortCell>
-            </Hidden>
-            <TableCell sx={{ width: '5%' }} />
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {streams?.data.map((stream) => (
-            <StreamTableRow key={stream.id} stream={stream} {...handlers} />
-          ))}
-        </TableBody>
-      </Table>
-      <PaginationFooter
-        count={streams?.results || 0}
-        eventCategory="Streams Table"
-        handlePageChange={pagination.handlePageChange}
-        handleSizeChange={pagination.handlePageSizeChange}
-        page={pagination.page}
-        pageSize={pagination.pageSize}
-      />
+
+      {isLoading ? (
+        <CircleProgress />
+      ) : (
+        <>
+          <Table>
+            <TableHead>
+              <TableRow>
+                <TableSortCell
+                  active={orderBy === 'label'}
+                  direction={order}
+                  handleClick={handleOrderChange}
+                  label="label"
+                  sx={{ width: '30%' }}
+                >
+                  Name
+                </TableSortCell>
+                <TableCell>Stream Type</TableCell>
+                <TableSortCell
+                  active={orderBy === 'status'}
+                  direction={order}
+                  handleClick={handleOrderChange}
+                  label="status"
+                >
+                  Status
+                </TableSortCell>
+                <TableSortCell
+                  active={orderBy === 'id'}
+                  direction={order}
+                  handleClick={handleOrderChange}
+                  label="id"
+                >
+                  ID
+                </TableSortCell>
+                <Hidden smDown>
+                  <TableCell>Destination Type</TableCell>
+                </Hidden>
+                <Hidden lgDown>
+                  <TableSortCell
+                    active={orderBy === 'created'}
+                    direction={order}
+                    handleClick={handleOrderChange}
+                    label="created"
+                  >
+                    Creation Time
+                  </TableSortCell>
+                </Hidden>
+                <TableCell sx={{ width: '5%' }} />
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {streams?.data.map((stream) => (
+                <StreamTableRow key={stream.id} stream={stream} {...handlers} />
+              ))}
+              {streams?.results === 0 && <TableRowEmpty colSpan={6} />}
+            </TableBody>
+          </Table>
+          <PaginationFooter
+            count={streams?.results || 0}
+            eventCategory="Streams Table"
+            handlePageChange={pagination.handlePageChange}
+            handleSizeChange={pagination.handlePageSizeChange}
+            page={pagination.page}
+            pageSize={pagination.pageSize}
+          />
+        </>
+      )}
     </>
   );
 };
diff --git a/packages/manager/src/features/Delivery/deliveryUtils.test.ts b/packages/manager/src/features/Delivery/deliveryUtils.test.ts
index aa255f8ecc2..3b2df03578a 100644
--- a/packages/manager/src/features/Delivery/deliveryUtils.test.ts
+++ b/packages/manager/src/features/Delivery/deliveryUtils.test.ts
@@ -1,9 +1,17 @@
 import { destinationType } from '@linode/api-v4';
 import { expect } from 'vitest';
 
-import { getDestinationTypeOption } from 'src/features/Delivery/deliveryUtils';
+import {
+  getDestinationPayloadDetails,
+  getDestinationTypeOption,
+} from 'src/features/Delivery/deliveryUtils';
 import { destinationTypeOptions } from 'src/features/Delivery/Shared/types';
 
+import type {
+  LinodeObjectStorageDetails,
+  LinodeObjectStorageDetailsPayload,
+} from '@linode/api-v4';
+
 describe('delivery utils functions', () => {
   describe('getDestinationTypeOption ', () => {
     it('should return option object matching provided value', () => {
@@ -18,4 +26,32 @@ describe('delivery utils functions', () => {
       expect(result).toEqual(undefined);
     });
   });
+
+  describe('getDestinationPayloadDetails ', () => {
+    const testDetails: LinodeObjectStorageDetails = {
+      path: 'testpath',
+      access_key_id: 'keyId',
+      access_key_secret: 'secret',
+      bucket_name: 'name',
+      host: 'host',
+      region: 'us-ord',
+    };
+
+    it('should return payload details with path', () => {
+      const result = getDestinationPayloadDetails(
+        testDetails
+      ) as LinodeObjectStorageDetailsPayload;
+
+      expect(result.path).toEqual(testDetails.path);
+    });
+
+    it('should return details without path property', () => {
+      const result = getDestinationPayloadDetails({
+        ...testDetails,
+        path: '',
+      }) as LinodeObjectStorageDetailsPayload;
+
+      expect(result.path).toEqual(undefined);
+    });
+  });
 });
diff --git a/packages/manager/src/features/Delivery/deliveryUtils.ts b/packages/manager/src/features/Delivery/deliveryUtils.ts
index 918cb0a2c96..6d11130a22d 100644
--- a/packages/manager/src/features/Delivery/deliveryUtils.ts
+++ b/packages/manager/src/features/Delivery/deliveryUtils.ts
@@ -1,7 +1,11 @@
 import {
   type Destination,
+  type DestinationDetails,
+  type DestinationDetailsPayload,
   isEmpty,
   type Stream,
+  type StreamDetailsType,
+  type StreamType,
   streamType,
 } from '@linode/api-v4';
 import { omitProps } from '@linode/ui';
@@ -11,7 +15,6 @@ import {
   streamTypeOptions,
 } from 'src/features/Delivery/Shared/types';
 
-import type { StreamDetails, StreamType } from '@linode/api-v4';
 import type {
   FormMode,
   LabelValueOption,
@@ -31,19 +34,31 @@ export const isFormInEditMode = (mode: FormMode) => mode === 'edit';
 
 export const getStreamPayloadDetails = (
   type: StreamType,
-  details: StreamDetails
-): StreamDetails => {
-  let payloadDetails: StreamDetails = {};
+  details: StreamDetailsType
+): StreamDetailsType => {
+  if (!details) {
+    return null;
+  }
 
   if (!isEmpty(details) && type === streamType.LKEAuditLogs) {
     if (details.is_auto_add_all_clusters_enabled) {
-      payloadDetails = omitProps(details, ['cluster_ids']);
+      return omitProps(details, ['cluster_ids']);
     } else {
-      payloadDetails = omitProps(details, ['is_auto_add_all_clusters_enabled']);
+      return omitProps(details, ['is_auto_add_all_clusters_enabled']);
     }
   }
 
-  return payloadDetails;
+  return null;
+};
+
+export const getDestinationPayloadDetails = (
+  details: DestinationDetails
+): DestinationDetailsPayload => {
+  if ('path' in details && details.path === '') {
+    return omitProps(details, ['path']);
+  }
+
+  return details;
 };
 
 export const getStreamDescription = (stream: Stream) => {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.test.tsx
index 65c58a3cd2f..c6143a282b6 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.test.tsx
@@ -1,5 +1,4 @@
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { waitFor } from '@testing-library/react';
 import * as React from 'react';
 
 import { renderWithTheme } from 'src/utilities/testHelpers';
@@ -13,19 +12,20 @@ const props = {
   helperText,
   onClose,
   open: true,
+  disabled: true,
 };
 
 const queryMocks = vi.hoisted(() => ({
   useParams: vi.fn().mockReturnValue({}),
-  userPermissions: vi.fn(() => ({
-    data: {
-      create_firewall_device: false,
-    },
-  })),
+  useQueryWithPermissions: vi.fn().mockReturnValue({
+    data: [],
+    isLoading: false,
+    isError: false,
+  }),
 }));
 
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
-  usePermissions: queryMocks.userPermissions,
+  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
 
 vi.mock('@tanstack/react-router', async () => {
@@ -62,20 +62,11 @@ describe('AddLinodeDrawer', () => {
   });
 
   it('should disable "Add" button if the user does not have create_firewall_device permission', async () => {
-    queryMocks.userPermissions.mockReturnValue({
-      data: {
-        create_firewall_device: false,
-      },
-    });
-
     const { getByRole } = renderWithTheme(<AddLinodeDrawer {...props} />);
 
-    const autocomplete = screen.getByRole('combobox');
-    await userEvent.click(autocomplete);
-    await userEvent.type(autocomplete, 'linode-5');
-
-    const option = await screen.findByText('linode-5');
-    await userEvent.click(option);
+    const select = getByRole('combobox');
+    expect(select).toBeInTheDocument();
+    expect(select).toBeDisabled();
 
     const addButton = getByRole('button', {
       name: 'Add',
@@ -85,25 +76,15 @@ describe('AddLinodeDrawer', () => {
   });
 
   it('should enable "Add" button if the user has create_firewall_device permission', async () => {
-    queryMocks.userPermissions.mockReturnValue({
-      data: {
-        create_firewall_device: true,
-      },
-    });
-
-    const { getByRole } = renderWithTheme(<AddLinodeDrawer {...props} />);
-
-    const autocomplete = screen.getByRole('combobox');
-    await userEvent.click(autocomplete);
-    await userEvent.type(autocomplete, 'linode-5');
+    const { getByRole } = renderWithTheme(
+      <AddLinodeDrawer {...props} disabled={false} />
+    );
 
-    const option = await screen.findByText('linode-5');
-    await userEvent.click(option);
+    const select = getByRole('combobox');
+    expect(select).toBeInTheDocument();
 
-    const addButton = getByRole('button', {
-      name: 'Add',
+    await waitFor(() => {
+      expect(select).toBeEnabled();
     });
-    expect(addButton).toBeInTheDocument();
-    expect(addButton).toBeEnabled();
   });
 });
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.tsx
index ff32e4c52c8..9f3be27bf35 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.tsx
@@ -3,8 +3,6 @@ import {
   useAddFirewallDeviceMutation,
   useAllFirewallsQuery,
   useAllLinodesQuery,
-  useGrants,
-  useProfile,
 } from '@linode/queries';
 import { LinodeSelect } from '@linode/shared';
 import {
@@ -14,7 +12,6 @@ import {
   Notice,
   Typography,
 } from '@linode/ui';
-import { getEntityIdsByPermission } from '@linode/utilities';
 import { useTheme } from '@mui/material';
 import { useQueries } from '@tanstack/react-query';
 import { useParams } from '@tanstack/react-router';
@@ -23,7 +20,8 @@ import * as React from 'react';
 
 import { Link } from 'src/components/Link';
 import { SupportLink } from 'src/components/SupportLink';
-import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
+import { getRestrictedResourceText } from 'src/features/Account/utils';
+import { useQueryWithPermissions } from 'src/features/IAM/hooks/usePermissions';
 import { getLinodeInterfaceType } from 'src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/utilities';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 import { useIsLinodeInterfacesEnabled } from 'src/utilities/linodes';
@@ -32,6 +30,7 @@ import { sanitizeHTML } from 'src/utilities/sanitizeHTML';
 import type { Linode, LinodeInterfaces } from '@linode/api-v4';
 
 interface Props {
+  disabled: boolean;
   helperText: string;
   onClose: () => void;
   open: boolean;
@@ -44,31 +43,28 @@ interface InterfaceDeviceInfo {
 }
 
 export const AddLinodeDrawer = (props: Props) => {
-  const { helperText, onClose, open } = props;
+  const { helperText, onClose, open, disabled } = props;
 
   const { id } = useParams({ strict: false });
 
   const { enqueueSnackbar } = useSnackbar();
 
-  const { data: grants } = useGrants();
-  const { data: profile } = useProfile();
   const { isLinodeInterfacesEnabled } = useIsLinodeInterfacesEnabled();
-  const isRestrictedUser = Boolean(profile?.restricted);
 
   const { data, error, isLoading } = useAllFirewallsQuery();
 
   const firewall = data?.find((firewall) => firewall.id === Number(id));
 
-  const { data: permissions } = usePermissions(
-    'firewall',
-    ['create_firewall_device'],
-    firewall?.id
-  );
-
-  const { data: allLinodes } = useAllLinodesQuery({}, {});
+  const { data: availableLinodes, isLoading: availableLinodesLoading } =
+    useQueryWithPermissions<Linode>(
+      useAllLinodesQuery({}, {}),
+      'linode',
+      ['update_linode'],
+      open
+    );
 
   const linodesUsingLinodeInterfaces =
-    allLinodes?.filter((l) => l.interface_generation === 'linode') ?? [];
+    availableLinodes?.filter((l) => l.interface_generation === 'linode') ?? [];
 
   const allFirewallEntities = React.useMemo(
     () => data?.map((firewall) => firewall.entities).flat() ?? [],
@@ -90,15 +86,6 @@ export const AddLinodeDrawer = (props: Props) => {
     [allFirewallEntities]
   );
 
-  // If a user is restricted, they can not add a read-only Linode to a firewall.
-  const readOnlyLinodeIds = React.useMemo(
-    () =>
-      isRestrictedUser
-        ? getEntityIdsByPermission(grants, 'linode', 'read_only')
-        : [],
-    [grants, isRestrictedUser]
-  );
-
   // Keeps track of Linode and its eligible Linode Interfaces if they exist (eligible = a non-vlan interface that isn't already assigned to a firewall)
   // Key is Linode ID. Value is an object containing the Linode object and the Linode's interfaces
   const linodesAndEligibleInterfaces = useQueries({
@@ -130,12 +117,7 @@ export const AddLinodeDrawer = (props: Props) => {
     },
   });
 
-  const linodeOptions = allLinodes?.filter((linode) => {
-    // Exclude read only Linodes
-    if (readOnlyLinodeIds.includes(linode.id)) {
-      return false;
-    }
-
+  const linodeOptions = availableLinodes?.filter((linode) => {
     // Exclude a Linode if it uses Linode Interfaces but has no eligible interfaces
     if (linode.interface_generation === 'linode') {
       return Boolean(linodesAndEligibleInterfaces[linode.id]);
@@ -366,10 +348,19 @@ export const AddLinodeDrawer = (props: Props) => {
           handleSubmit();
         }}
       >
+        {disabled && (
+          <Notice
+            text={getRestrictedResourceText({
+              resourceType: 'Firewalls',
+            })}
+            variant="error"
+          />
+        )}
         {localError ? errorNotice() : null}
         <LinodeSelect
-          disabled={isLoading}
+          disabled={isLoading || availableLinodesLoading || disabled}
           helperText={helperText}
+          loading={availableLinodesLoading}
           multiple
           onSelectionChange={(linodes) => onSelectionChange(linodes)}
           options={linodeOptions}
@@ -416,9 +407,7 @@ export const AddLinodeDrawer = (props: Props) => {
           })}
         <ActionsPanel
           primaryButtonProps={{
-            disabled:
-              selectedLinodes.length === 0 ||
-              !permissions.create_firewall_device,
+            disabled: selectedLinodes.length === 0 || disabled,
             label: 'Add',
             loading: addDeviceIsLoading,
             onClick: handleSubmit,
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.test.tsx
index da04b843c12..490cccd4ef7 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.test.tsx
@@ -1,3 +1,4 @@
+import { waitFor } from '@testing-library/react';
 import * as React from 'react';
 
 import { renderWithTheme } from 'src/utilities/testHelpers';
@@ -11,6 +12,7 @@ const props = {
   helperText,
   onClose,
   open: true,
+  disabled: false,
 };
 
 const queryMocks = vi.hoisted(() => ({
@@ -20,10 +22,16 @@ const queryMocks = vi.hoisted(() => ({
       create_firewall_device: true,
     },
   })),
+  useQueryWithPermissions: vi.fn().mockReturnValue({
+    data: [],
+    isLoading: false,
+    isError: false,
+  }),
 }));
 
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.userPermissions,
+  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
 
 vi.mock('@tanstack/react-router', async () => {
@@ -60,20 +68,30 @@ describe('AddNodeBalancerDrawer', () => {
     const { getByText } = renderWithTheme(<AddNodebalancerDrawer {...props} />);
     expect(getByText('Add')).toBeInTheDocument();
   });
+  it('should enable select if the user has create_firewall_device permission', async () => {
+    const { getByRole } = renderWithTheme(<AddNodebalancerDrawer {...props} />);
+
+    const select = getByRole('combobox');
+    expect(select).toBeInTheDocument();
 
-  it('should disable "Add" button if the user does not have create_firewall_device permission', async () => {
-    queryMocks.userPermissions.mockReturnValue({
-      data: {
-        create_firewall_device: false,
-      },
+    await waitFor(() => {
+      expect(select).toBeEnabled();
     });
+  });
 
-    const { getByRole } = renderWithTheme(<AddNodebalancerDrawer {...props} />);
+  it('should disable "Add" button and select if the user does not have create_firewall_device permission', async () => {
+    const { getByRole } = renderWithTheme(
+      <AddNodebalancerDrawer {...props} disabled={true} />
+    );
 
     const addButton = getByRole('button', {
       name: 'Add',
     });
     expect(addButton).toBeInTheDocument();
     expect(addButton).toBeDisabled();
+
+    const select = getByRole('combobox');
+    expect(select).toBeInTheDocument();
+    expect(select).toBeDisabled();
   });
 });
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.tsx
index f6c00ec48d3..bc22e48eba8 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.tsx
@@ -1,11 +1,8 @@
 import {
   useAddFirewallDeviceMutation,
   useAllFirewallsQuery,
-  useGrants,
-  useProfile,
 } from '@linode/queries';
 import { ActionsPanel, Drawer, Notice } from '@linode/ui';
-import { getEntityIdsByPermission } from '@linode/utilities';
 import { useTheme } from '@mui/material';
 import { useParams } from '@tanstack/react-router';
 import { useSnackbar } from 'notistack';
@@ -14,7 +11,7 @@ import * as React from 'react';
 import { Link } from 'src/components/Link';
 import { SupportLink } from 'src/components/SupportLink';
 import { FIREWALL_LIMITS_CONSIDERATIONS_LINK } from 'src/constants';
-import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
+import { getRestrictedResourceText } from 'src/features/Account/utils';
 import { NodeBalancerSelect } from 'src/features/NodeBalancers/NodeBalancerSelect';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 import { sanitizeHTML } from 'src/utilities/sanitizeHTML';
@@ -22,29 +19,21 @@ import { sanitizeHTML } from 'src/utilities/sanitizeHTML';
 import type { NodeBalancer } from '@linode/api-v4';
 
 interface Props {
+  disabled?: boolean;
   helperText: string;
   onClose: () => void;
   open: boolean;
 }
 
 export const AddNodebalancerDrawer = (props: Props) => {
-  const { helperText, onClose, open } = props;
+  const { helperText, onClose, open, disabled } = props;
   const { enqueueSnackbar } = useSnackbar();
   const { id } = useParams({ strict: false });
-  const { data: grants } = useGrants();
-  const { data: profile } = useProfile();
-  const isRestrictedUser = Boolean(profile?.restricted);
 
   const { data, error, isLoading } = useAllFirewallsQuery(open);
 
   const firewall = data?.find((firewall) => firewall.id === Number(id));
 
-  const { data: permissions } = usePermissions(
-    'firewall',
-    ['create_firewall_device'],
-    firewall?.id
-  );
-
   const theme = useTheme();
 
   const { isPending: addDeviceIsLoading, mutateAsync: addDevice } =
@@ -154,20 +143,14 @@ export const AddNodebalancerDrawer = (props: Props) => {
     }
   };
 
-  // If a user is restricted, they can not add a read-only Nodebalancer to a firewall.
-  const readOnlyNodebalancerIds = isRestrictedUser
-    ? getEntityIdsByPermission(grants, 'nodebalancer', 'read_only')
-    : [];
-
   const assignedNodeBalancers = data
     ?.map((firewall) => firewall.entities)
     .flat()
     ?.filter((service) => service.type === 'nodebalancer');
 
   const nodebalancerOptionsFilter = (nodebalancer: NodeBalancer) => {
-    return (
-      !readOnlyNodebalancerIds.includes(nodebalancer.id) &&
-      !assignedNodeBalancers?.some((service) => service.id === nodebalancer.id)
+    return !assignedNodeBalancers?.some(
+      (service) => service.id === nodebalancer.id
     );
   };
 
@@ -187,6 +170,14 @@ export const AddNodebalancerDrawer = (props: Props) => {
       open={open}
       title={`Add Nodebalancer to Firewall: ${firewall?.label}`}
     >
+      {disabled && (
+        <Notice
+          text={getRestrictedResourceText({
+            resourceType: 'Firewalls',
+          })}
+          variant="error"
+        />
+      )}
       <Notice variant={'warning'}>
         Only the Firewall's inbound rules apply to NodeBalancers. Any existing
         outbound rules won't be applied.{' '}
@@ -200,7 +191,7 @@ export const AddNodebalancerDrawer = (props: Props) => {
       >
         {localError ? errorNotice() : null}
         <NodeBalancerSelect
-          disabled={isLoading}
+          disabled={isLoading || disabled}
           helperText={helperText}
           multiple
           onSelectionChange={(nodebalancers) =>
@@ -211,9 +202,7 @@ export const AddNodebalancerDrawer = (props: Props) => {
         />
         <ActionsPanel
           primaryButtonProps={{
-            disabled:
-              selectedNodebalancers.length === 0 ||
-              !permissions.create_firewall_device,
+            disabled: selectedNodebalancers.length === 0 || disabled,
             label: 'Add',
             loading: addDeviceIsLoading,
             onClick: handleSubmit,
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceActionMenu.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceActionMenu.tsx
index bd80e4a2859..5cccbf61343 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceActionMenu.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceActionMenu.tsx
@@ -6,6 +6,8 @@ export interface ActionHandlers {
   handleRemoveDevice: (device: FirewallDevice) => void;
 }
 
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
+
 import type { FirewallDevice } from '@linode/api-v4';
 
 export interface FirewallDeviceActionMenuProps extends ActionHandlers {
@@ -17,12 +19,48 @@ export const FirewallDeviceActionMenu = React.memo(
   (props: FirewallDeviceActionMenuProps) => {
     const { device, disabled, handleRemoveDevice } = props;
 
+    const { type } = device.entity;
+
+    const { data: linodePermissions, isLoading: isLinodePermissionsLoading } =
+      usePermissions(
+        'linode',
+        ['update_linode'],
+        device?.entity.id,
+        type !== 'nodebalancer'
+      );
+
+    const {
+      data: nodebalancerPermissions,
+      isLoading: isNodebalancerPermissionsLoading,
+    } = usePermissions(
+      'nodebalancer',
+      ['update_nodebalancer'],
+      device?.entity.id,
+      type === 'nodebalancer'
+    );
+
+    const disabledDueToPermissions =
+      type === 'nodebalancer'
+        ? !nodebalancerPermissions?.update_nodebalancer
+        : !linodePermissions?.update_linode;
+
+    const isPermissionsLoading =
+      type === 'nodebalancer'
+        ? isNodebalancerPermissionsLoading
+        : isLinodePermissionsLoading;
+
     return (
       <InlineMenuAction
         actionText="Remove"
-        disabled={disabled}
+        disabled={disabled || disabledDueToPermissions}
         key="Remove"
+        loading={isPermissionsLoading}
         onClick={() => handleRemoveDevice(device)}
+        tooltip={
+          disabledDueToPermissions
+            ? `You do not have permission to modify this ${type === 'nodebalancer' ? 'NodeBalancer' : 'Linode'}.`
+            : undefined
+        }
       />
     );
   }
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceLanding.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceLanding.test.tsx
index 7ef14493bdd..0e8467c28da 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceLanding.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceLanding.test.tsx
@@ -23,6 +23,11 @@ const queryMocks = vi.hoisted(() => ({
       create_firewall_device: false,
     },
   })),
+  useQueryWithPermissions: vi.fn().mockReturnValue({
+    data: [],
+    isLoading: false,
+    isError: false,
+  }),
 }));
 
 vi.mock('@tanstack/react-router', async () => {
@@ -46,6 +51,7 @@ vi.mock('src/hooks/useOrderV2', async () => {
 
 vi.mock('src/features/IAM/hooks/usePermissions', () => ({
   usePermissions: queryMocks.usePermissions,
+  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
 }));
 
 const baseProps = (
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceLanding.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceLanding.tsx
index ba80f034d07..f42ca63ee13 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceLanding.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceLanding.tsx
@@ -1,4 +1,4 @@
-import { Button, Notice, Typography } from '@linode/ui';
+import { Button, CircleProgress, Notice, Typography } from '@linode/ui';
 import Grid from '@mui/material/Grid';
 import { styled, useTheme } from '@mui/material/styles';
 import { useLocation, useNavigate } from '@tanstack/react-router';
@@ -27,11 +27,12 @@ export const FirewallDeviceLanding = React.memo(
     const theme = useTheme();
     const navigate = useNavigate();
     const location = useLocation();
-    const { data: permissions } = usePermissions(
-      'firewall',
-      ['create_firewall_device', 'delete_firewall_device'],
-      firewallId
-    );
+    const { data: permissions, isLoading: isPermissionsLoading } =
+      usePermissions(
+        'firewall',
+        ['create_firewall_device', 'delete_firewall_device'],
+        firewallId
+      );
     const helperText =
       'Assign one or more services to this firewall. You can add services later if you want to customize your rules first.';
 
@@ -82,6 +83,10 @@ export const FirewallDeviceLanding = React.memo(
       }
     }, [device, location.pathname, firewallId, type, navigate]);
 
+    if (isPermissionsLoading) {
+      return <CircleProgress />;
+    }
+
     return (
       // TODO: Matching old behavior. Do we want separate messages for when the user can't create or remove devices?
       <>
@@ -154,12 +159,14 @@ export const FirewallDeviceLanding = React.memo(
         />
         {type === 'linode' ? (
           <AddLinodeDrawer
+            disabled={isCreateDeviceDisabled}
             helperText={helperText}
             onClose={handleClose}
             open={location.pathname.endsWith('add')}
           />
         ) : (
           <AddNodebalancerDrawer
+            disabled={isCreateDeviceDisabled}
             helperText={helperText}
             onClose={handleClose}
             open={location.pathname.endsWith('add')}
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceRow.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceRow.test.tsx
index fa0044ee478..8bdf964c135 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceRow.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceRow.test.tsx
@@ -9,6 +9,18 @@ import { FirewallDeviceRow } from './FirewallDeviceRow';
 
 import type { FirewallDeviceEntityType } from '@linode/api-v4';
 
+const queryMocks = vi.hoisted(() => ({
+  userPermissions: vi.fn(() => ({
+    data: {
+      update_linode: true,
+    },
+  })),
+}));
+
+vi.mock('src/features/IAM/hooks/usePermissions', () => ({
+  usePermissions: queryMocks.userPermissions,
+}));
+
 const props = {
   device: firewallDeviceFactory.build(),
   disabled: false,
diff --git a/packages/manager/src/features/Firewalls/FirewallLanding/CreateFirewallDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallLanding/CreateFirewallDrawer.tsx
index ecced57860c..ca8937cd963 100644
--- a/packages/manager/src/features/Firewalls/FirewallLanding/CreateFirewallDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallLanding/CreateFirewallDrawer.tsx
@@ -1,6 +1,7 @@
 import { useCreateFirewall } from '@linode/queries';
 import {
   ActionsPanel,
+  CircleProgress,
   Drawer,
   FormControlLabel,
   Notice,
@@ -62,7 +63,10 @@ export const CreateFirewallDrawer = (props: CreateFirewallDrawerProps) => {
 
   const { mutateAsync: createFirewall } = useCreateFirewall();
 
-  const { data: permissions } = usePermissions('account', ['create_firewall']);
+  const { data: permissions, isLoading: isPermissionsLoading } = usePermissions(
+    'account',
+    ['create_firewall']
+  );
 
   const { enqueueSnackbar } = useSnackbar();
 
@@ -134,6 +138,10 @@ export const CreateFirewallDrawer = (props: CreateFirewallDrawerProps) => {
     }
   };
 
+  if (isPermissionsLoading) {
+    return <CircleProgress />;
+  }
+
   return (
     <FormProvider {...form}>
       <Drawer
diff --git a/packages/manager/src/features/Firewalls/FirewallLanding/CustomFirewallFields.tsx b/packages/manager/src/features/Firewalls/FirewallLanding/CustomFirewallFields.tsx
index c0c218fa07a..2036ec834da 100644
--- a/packages/manager/src/features/Firewalls/FirewallLanding/CustomFirewallFields.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallLanding/CustomFirewallFields.tsx
@@ -1,19 +1,14 @@
-import {
-  useAllFirewallsQuery,
-  useAllLinodesQuery,
-  useGrants,
-  useProfile,
-} from '@linode/queries';
+import { useAllFirewallsQuery, useAllLinodesQuery } from '@linode/queries';
 import { LinodeSelect } from '@linode/shared';
 import {
   Box,
+  CircleProgress,
   FormControlLabel,
   Notice,
   Radio,
   RadioGroup,
   Typography,
 } from '@linode/ui';
-import { getEntityIdsByPermission } from '@linode/utilities';
 import * as React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 
@@ -61,26 +56,19 @@ export const CustomFirewallFields = (props: CustomFirewallProps) => {
 
   const { control } = useFormContext<CreateFirewallFormValues>();
 
-  const { data: grants } = useGrants();
   const { data: firewalls } = useAllFirewallsQuery(open);
-  const { data: profile } = useProfile();
-
-  const { data: permissableLinodes, hasFiltered: hasFilteredLinodes } =
-    useQueryWithPermissions<Linode>(useAllLinodesQuery(), 'linode', [
-      'apply_linode_firewalls',
-    ]);
-
-  const isRestrictedUser = profile?.restricted;
 
-  // If a user is restricted, they can not add a read-only NodeBalancer to a firewall.
-  const readOnlyNodebalancerIds = isRestrictedUser
-    ? getEntityIdsByPermission(grants, 'nodebalancer', 'read_only')
-    : [];
+  const {
+    data: permissableLinodes,
+    hasFiltered: hasFilteredLinodes,
+    isLoading: isLoadingLinodes,
+  } = useQueryWithPermissions<Linode>(useAllLinodesQuery(), 'linode', [
+    'apply_linode_firewalls',
+  ]);
 
-  const deviceSelectGuidance =
-    hasFilteredLinodes || readOnlyNodebalancerIds.length > 0
-      ? READ_ONLY_DEVICES_HIDDEN_MESSAGE
-      : undefined;
+  const deviceSelectGuidance = hasFilteredLinodes
+    ? READ_ONLY_DEVICES_HIDDEN_MESSAGE
+    : undefined;
 
   const assignedServices = firewalls
     ?.map((firewall) => firewall.entities)
@@ -101,9 +89,8 @@ export const CustomFirewallFields = (props: CustomFirewallProps) => {
   };
 
   const nodebalancerOptionsFilter = (nodebalancer: NodeBalancer) => {
-    return (
-      !readOnlyNodebalancerIds.includes(nodebalancer.id) &&
-      !assignedNodeBalancers?.some((service) => service.id === nodebalancer.id)
+    return !assignedNodeBalancers?.some(
+      (service) => service.id === nodebalancer.id
     );
   };
 
@@ -123,6 +110,10 @@ export const CustomFirewallFields = (props: CustomFirewallProps) => {
     </Link>
   );
 
+  if (isLoadingLinodes) {
+    return <CircleProgress />;
+  }
+
   return (
     <>
       <Typography style={{ marginTop: 24 }}>
diff --git a/packages/manager/src/features/Firewalls/shared.ts b/packages/manager/src/features/Firewalls/shared.ts
index beeaa834c50..754451074bd 100644
--- a/packages/manager/src/features/Firewalls/shared.ts
+++ b/packages/manager/src/features/Firewalls/shared.ts
@@ -2,7 +2,6 @@ import { truncateAndJoinList } from '@linode/utilities';
 import { capitalize } from '@linode/utilities';
 
 import type { PORT_PRESETS } from './FirewallDetail/Rules/shared';
-import type { Grants, Profile } from '@linode/api-v4';
 import type {
   Firewall,
   FirewallRuleProtocol,
@@ -249,18 +248,6 @@ export const generateAddressesLabel = (
   return 'None';
 };
 
-export const checkIfUserCanModifyFirewall = (
-  firewallId: number,
-  profile?: Profile,
-  grants?: Grants
-) => {
-  return (
-    !profile?.restricted ||
-    grants?.firewall?.find((firewall) => firewall.id === firewallId)
-      ?.permissions === 'read_write'
-  );
-};
-
 export const getFirewallDescription = (firewall: Firewall) => {
   const description = [
     `Status: ${capitalize(firewall.status)}`,
diff --git a/packages/manager/src/features/IAM/Roles/RolesTable/AssignSelectedRolesDrawer.tsx b/packages/manager/src/features/IAM/Roles/RolesTable/AssignSelectedRolesDrawer.tsx
index b803c17de0a..40fec42a1ea 100644
--- a/packages/manager/src/features/IAM/Roles/RolesTable/AssignSelectedRolesDrawer.tsx
+++ b/packages/manager/src/features/IAM/Roles/RolesTable/AssignSelectedRolesDrawer.tsx
@@ -143,11 +143,14 @@ export const AssignSelectedRolesDrawer = ({
 
   const handleScroll = (event: React.SyntheticEvent) => {
     const listboxNode = event.currentTarget;
-    if (
-      listboxNode.scrollTop + listboxNode.clientHeight >=
-        listboxNode.scrollHeight &&
-      hasNextPage
-    ) {
+    const isAtBottom =
+      Math.abs(
+        listboxNode.scrollHeight -
+          listboxNode.clientHeight -
+          listboxNode.scrollTop
+      ) < 1;
+
+    if (isAtBottom && hasNextPage) {
       fetchNextPage();
     }
   };
diff --git a/packages/manager/src/features/IAM/Shared/AssignedPermissionsPanel/AssignedPermissionsPanel.test.tsx b/packages/manager/src/features/IAM/Shared/AssignedPermissionsPanel/AssignedPermissionsPanel.test.tsx
index beecaadb47e..3f5a7e79ef8 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedPermissionsPanel/AssignedPermissionsPanel.test.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedPermissionsPanel/AssignedPermissionsPanel.test.tsx
@@ -2,7 +2,6 @@ import { fireEvent, screen } from '@testing-library/react';
 import React from 'react';
 
 import { accountEntityFactory } from 'src/factories/accountEntities';
-import { makeResourcePage } from 'src/mocks/serverHandlers';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { AssignedPermissionsPanel } from './AssignedPermissionsPanel';
@@ -10,14 +9,14 @@ import { AssignedPermissionsPanel } from './AssignedPermissionsPanel';
 import type { ExtendedRole } from '../utilities';
 
 const queryMocks = vi.hoisted(() => ({
-  useAccountEntities: vi.fn().mockReturnValue({}),
+  useAllAccountEntities: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('src/queries/entities/entities', async () => {
   const actual = await vi.importActual('src/queries/entities/entities');
   return {
     ...actual,
-    useAccountEntities: queryMocks.useAccountEntities,
+    useAllAccountEntities: queryMocks.useAllAccountEntities,
   };
 });
 
@@ -84,8 +83,8 @@ describe('AssignedPermissionsPanel', () => {
   });
 
   it('renders with the correct context when the access is an entity', () => {
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
     renderWithTheme(
       <AssignedPermissionsPanel role={mockEntitiesAcceessRole} />
@@ -107,8 +106,8 @@ describe('AssignedPermissionsPanel', () => {
   });
 
   it('renders the Autocomplete when the access is an entity', () => {
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
     renderWithTheme(
       <AssignedPermissionsPanel role={mockEntitiesAcceessRole} />
diff --git a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.test.tsx b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.test.tsx
index 4bcdc69e072..ecd6448b229 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.test.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.test.tsx
@@ -5,13 +5,12 @@ import React from 'react';
 import { accountEntityFactory } from 'src/factories/accountEntities';
 import { accountRolesFactory } from 'src/factories/accountRoles';
 import { userRolesFactory } from 'src/factories/userRoles';
-import { makeResourcePage } from 'src/mocks/serverHandlers';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { AssignedRolesTable } from './AssignedRolesTable';
 
 const queryMocks = vi.hoisted(() => ({
-  useAccountEntities: vi.fn().mockReturnValue({}),
+  useAllAccountEntities: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
   useAccountRoles: vi.fn().mockReturnValue({}),
   useUserRoles: vi.fn().mockReturnValue({}),
@@ -30,7 +29,7 @@ vi.mock('src/queries/entities/entities', async () => {
   const actual = await vi.importActual<any>('src/queries/entities/entities');
   return {
     ...actual,
-    useAccountEntities: queryMocks.useAccountEntities,
+    useAllAccountEntities: queryMocks.useAllAccountEntities,
   };
 });
 
@@ -80,8 +79,8 @@ describe('AssignedRolesTable', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<AssignedRolesTable />);
@@ -108,8 +107,8 @@ describe('AssignedRolesTable', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<AssignedRolesTable />);
@@ -131,8 +130,8 @@ describe('AssignedRolesTable', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<AssignedRolesTable />);
@@ -154,8 +153,8 @@ describe('AssignedRolesTable', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<AssignedRolesTable />);
diff --git a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.tsx b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.tsx
index e94b43a3c1a..cb20cbaac04 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/AssignedRolesTable.tsx
@@ -15,7 +15,7 @@ import { TableRow } from 'src/components/TableRow';
 import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { TableSortCell } from 'src/components/TableSortCell/TableSortCell';
 import { usePaginationV2 } from 'src/hooks/usePaginationV2';
-import { useAccountEntities } from 'src/queries/entities/entities';
+import { useAllAccountEntities } from 'src/queries/entities/entities';
 
 import { usePermissions } from '../../hooks/usePermissions';
 import { AssignedEntities } from '../../Users/UserRoles/AssignedEntities';
@@ -135,11 +135,13 @@ export const AssignedRolesTable = () => {
 
   const { data: accountRoles, isLoading: accountPermissionsLoading } =
     useAccountRoles();
-  const { data: entities, isLoading: entitiesLoading } = useAccountEntities();
+  const { data: entities, isLoading: entitiesLoading } = useAllAccountEntities(
+    {}
+  );
+
   const { data: assignedRoles, isLoading: assignedRolesLoading } = useUserRoles(
     username ?? ''
   );
-
   const { filterableOptions, roles } = React.useMemo(() => {
     if (!assignedRoles || !accountRoles) {
       return { filterableOptions: [], roles: [] };
@@ -154,7 +156,7 @@ export const AssignedRolesTable = () => {
     ];
 
     if (entities) {
-      const transformedEntities = groupAccountEntitiesByType(entities.data);
+      const transformedEntities = groupAccountEntitiesByType(entities);
 
       roles = addEntitiesNamesToRoles(roles, transformedEntities);
     }
@@ -256,6 +258,7 @@ export const AssignedRolesTable = () => {
             <Typography
               sx={{
                 font: theme.tokens.alias.Typography.Label.Bold.S,
+                marginBottom: theme.tokens.spacing.S4,
               }}
             >
               Description
diff --git a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/ChangeRoleDrawer.test.tsx b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/ChangeRoleDrawer.test.tsx
index f78689acdd7..548c4a0d63a 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/ChangeRoleDrawer.test.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/ChangeRoleDrawer.test.tsx
@@ -196,4 +196,32 @@ describe('ChangeRoleDrawer', () => {
       mockAccountAccessRole.name
     );
   });
+
+  it('should not list roles that the user already has', async () => {
+    queryMocks.useUserRoles.mockReturnValue({
+      data: {
+        account_access: ['account_linode_admin', 'account_viewer'],
+        entity_access: [],
+      },
+    });
+
+    queryMocks.useAccountRoles.mockReturnValue({
+      data: accountRolesFactory.build(),
+    });
+
+    renderWithTheme(<ChangeRoleDrawer {...props} mode="change-role" />);
+
+    const autocomplete = screen.getByRole('combobox');
+
+    await userEvent.click(autocomplete);
+
+    // expect select not to have the current role as one of the options
+    const options = screen.getAllByRole('option');
+    expect(options.map((option) => option.textContent)).not.toContain(
+      'account_linode_admin'
+    );
+    expect(options.map((option) => option.textContent)).not.toContain(
+      'account_viewer'
+    );
+  });
 });
diff --git a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/ChangeRoleDrawer.tsx b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/ChangeRoleDrawer.tsx
index acf271a1fb0..41bd9b69874 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/ChangeRoleDrawer.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/ChangeRoleDrawer.tsx
@@ -24,6 +24,8 @@ import {
   getAllRoles,
   getErrorMessage,
   getRoleByName,
+  isAccountRole,
+  isEntityRole,
 } from '../utilities';
 
 import type { DrawerModes, EntitiesOption, ExtendedRoleView } from '../types';
@@ -63,14 +65,29 @@ export const ChangeRoleDrawer = ({ mode, onClose, open, role }: Props) => {
     if (!accountRoles) {
       return [];
     }
-
-    return getAllRoles(accountRoles).filter(
-      (el) =>
+    return getAllRoles(accountRoles).filter((el) => {
+      const matchesRoleContext =
         el.entity_type === role?.entity_type &&
         el.access === role?.access &&
-        el.value !== role?.name
-    );
-  }, [accountRoles, role]);
+        el.value !== role?.name;
+      // Exclude account roles already assigned to the user
+      if (isAccountRole(el)) {
+        return (
+          !assignedRoles?.account_access.includes(el.value) &&
+          matchesRoleContext
+        );
+      }
+      // Exclude entity roles already assigned to the user
+      if (isEntityRole(el)) {
+        return (
+          !assignedRoles?.entity_access.some((entity) =>
+            entity.roles.includes(el.value)
+          ) && matchesRoleContext
+        );
+      }
+      return true;
+    });
+  }, [accountRoles, assignedRoles, role]);
 
   const {
     control,
diff --git a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/UpdateEntitiesDrawer.test.tsx b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/UpdateEntitiesDrawer.test.tsx
index 43657751ec8..ecbcf169880 100644
--- a/packages/manager/src/features/IAM/Shared/AssignedRolesTable/UpdateEntitiesDrawer.test.tsx
+++ b/packages/manager/src/features/IAM/Shared/AssignedRolesTable/UpdateEntitiesDrawer.test.tsx
@@ -3,7 +3,6 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import { accountEntityFactory } from 'src/factories/accountEntities';
-import { makeResourcePage } from 'src/mocks/serverHandlers';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { UpdateEntitiesDrawer } from './UpdateEntitiesDrawer';
@@ -11,7 +10,7 @@ import { UpdateEntitiesDrawer } from './UpdateEntitiesDrawer';
 import type { ExtendedRoleView } from '../types';
 
 const queryMocks = vi.hoisted(() => ({
-  useAccountEntities: vi.fn().mockReturnValue({}),
+  useAllAccountEntities: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
   useAccountRoles: vi.fn().mockReturnValue({}),
   useUserRoles: vi.fn().mockReturnValue({}),
@@ -51,7 +50,7 @@ vi.mock('src/queries/entities/entities', async () => {
   const actual = await vi.importActual('src/queries/entities/entities');
   return {
     ...actual,
-    useAccountEntities: queryMocks.useAccountEntities,
+    useAllAccountEntities: queryMocks.useAllAccountEntities,
   };
 });
 
@@ -113,8 +112,8 @@ describe('UpdateEntitiesDrawer', () => {
   });
 
   it('should allow updating entities', async () => {
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
     queryMocks.useUserRoles.mockReturnValue({
       data: {
diff --git a/packages/manager/src/features/IAM/Shared/Entities/Entities.test.tsx b/packages/manager/src/features/IAM/Shared/Entities/Entities.test.tsx
index c27a4f682cd..abb88d4ea26 100644
--- a/packages/manager/src/features/IAM/Shared/Entities/Entities.test.tsx
+++ b/packages/manager/src/features/IAM/Shared/Entities/Entities.test.tsx
@@ -3,7 +3,6 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import { accountEntityFactory } from 'src/factories/accountEntities';
-import { makeResourcePage } from 'src/mocks/serverHandlers';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { Entities } from './Entities';
@@ -11,14 +10,14 @@ import { Entities } from './Entities';
 import type { EntitiesOption } from '../types';
 
 const queryMocks = vi.hoisted(() => ({
-  useAccountEntities: vi.fn().mockReturnValue({}),
+  useAllAccountEntities: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('src/queries/entities/entities', async () => {
   const actual = await vi.importActual('src/queries/entities/entities');
   return {
     ...actual,
-    useAccountEntities: queryMocks.useAccountEntities,
+    useAllAccountEntities: queryMocks.useAllAccountEntities,
   };
 });
 
@@ -82,8 +81,8 @@ describe('Entities', () => {
   });
 
   it('renders correct data when it is an entity access', () => {
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(
@@ -108,8 +107,8 @@ describe('Entities', () => {
   });
 
   it('renders correct data when it is an entity access', () => {
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(
@@ -134,8 +133,8 @@ describe('Entities', () => {
   });
 
   it('renders correct options in Autocomplete dropdown when it is an entity access', async () => {
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(
@@ -156,8 +155,8 @@ describe('Entities', () => {
   });
 
   it('updates selected options when Autocomplete value changes when it is an entity access', async () => {
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(
diff --git a/packages/manager/src/features/IAM/Shared/Entities/Entities.tsx b/packages/manager/src/features/IAM/Shared/Entities/Entities.tsx
index 50db9a551e5..bea517a7611 100644
--- a/packages/manager/src/features/IAM/Shared/Entities/Entities.tsx
+++ b/packages/manager/src/features/IAM/Shared/Entities/Entities.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 
 import { FormLabel } from 'src/components/FormLabel';
 import { Link } from 'src/components/Link';
-import { useAccountEntities } from 'src/queries/entities/entities';
+import { useAllAccountEntities } from 'src/queries/entities/entities';
 
 import { getFormattedEntityType } from '../utilities';
 import {
@@ -34,14 +34,15 @@ export const Entities = ({
   type,
   value,
 }: Props) => {
-  const { data: entities } = useAccountEntities();
+  const { data: entities } = useAllAccountEntities({});
   const theme = useTheme();
 
   const memoizedEntities = React.useMemo(() => {
     if (access !== 'entity_access' || !entities) {
       return [];
     }
-    const typeEntities = getEntitiesByType(type, entities.data);
+    const typeEntities = getEntitiesByType(type, entities);
+
     return typeEntities ? mapEntitiesToOptions(typeEntities) : [];
   }, [entities, access, type]);
 
diff --git a/packages/manager/src/features/IAM/Shared/Permissions/Permissions.style.ts b/packages/manager/src/features/IAM/Shared/Permissions/Permissions.style.ts
index 31af9d1d319..1958819a40f 100644
--- a/packages/manager/src/features/IAM/Shared/Permissions/Permissions.style.ts
+++ b/packages/manager/src/features/IAM/Shared/Permissions/Permissions.style.ts
@@ -1,43 +1,16 @@
-import { Box, Typography } from '@linode/ui';
+import { Typography } from '@linode/ui';
 import { styled } from '@mui/material/styles';
 
 export const StyledTitle = styled(Typography, { label: 'StyledTitle' })(
   ({ theme }) => ({
     font: theme.tokens.alias.Typography.Label.Bold.S,
-    marginBottom: theme.tokens.spacing.S8,
+    marginBottom: theme.tokens.spacing.S4,
   })
 );
 
-export const StyledPermissionItem = styled(Typography, {
+export const StyledPermissionItem = styled('span', {
   label: 'StyledPermissionItem',
 })(({ theme }) => ({
-  borderRight: `1px solid ${theme.tokens.alias.Border.Normal}`,
   display: 'inline-block',
   padding: `0px ${theme.tokens.spacing.S6} ${theme.tokens.spacing.S2}`,
 }));
-
-export const StyledContainer = styled('div', {
-  label: 'StyledContainer',
-})(() => ({
-  marginLeft: -6,
-  position: 'relative',
-}));
-
-export const StyledClampedContent = styled('div', {
-  label: 'StyledClampedContent',
-})<{ showAll?: boolean }>(({ showAll }) => ({
-  '& p:last-child': {
-    borderRight: 0,
-  },
-  WebkitBoxOrient: 'vertical',
-  WebkitLineClamp: showAll ? 'unset' : 2,
-  display: '-webkit-box',
-  overflow: 'hidden',
-}));
-
-export const StyledBox = styled(Box, {
-  label: 'StyledBox',
-})(({ theme }) => ({
-  font: theme.tokens.alias.Typography.Label.Semibold.Xs,
-  paddingLeft: theme.tokens.spacing.S6,
-}));
diff --git a/packages/manager/src/features/IAM/Shared/Permissions/Permissions.test.tsx b/packages/manager/src/features/IAM/Shared/Permissions/Permissions.test.tsx
index 93da531ebc0..a98d7d4d9e7 100644
--- a/packages/manager/src/features/IAM/Shared/Permissions/Permissions.test.tsx
+++ b/packages/manager/src/features/IAM/Shared/Permissions/Permissions.test.tsx
@@ -1,5 +1,4 @@
-import { screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/react';
 import React from 'react';
 
 import { renderWithTheme } from 'src/utilities/testHelpers';
@@ -20,23 +19,6 @@ const mockPermissionsLong: PermissionType[] = [
   'view_billing_payment',
 ];
 
-const mockPermissionsLongExpand: PermissionType[] = [
-  'list_linode_firewalls',
-  'list_firewall_devices',
-  'view_linode_disk',
-  'view_linode_monthly_network_transfer_stats',
-  'view_linode_network_transfer',
-  'view_linode_stats',
-  'view_linode_backup',
-  'list_linode_volumes',
-  'view_linode',
-  'list_linode_nodebalancers',
-  'view_linode_monthly_stats',
-  'view_linode_config_profile',
-  'list_firewall_rules',
-  'view_linode_config_profile_interface',
-];
-
 describe('Permissions', () => {
   it('renders the correct number of permission chips', () => {
     const { getAllByTestId, getByText } = renderWithTheme(
@@ -74,85 +56,3 @@ describe('Permissions', () => {
     );
   });
 });
-
-describe('useCalculateHiddenItems', () => {
-  beforeEach(() => {
-    Object.defineProperty(HTMLElement.prototype, 'offsetHeight', {
-      configurable: true,
-      get() {
-        if (this.dataset?.testid === 'container') return 40;
-        return 10;
-      },
-    });
-    let permissionIndex = 0;
-    HTMLElement.prototype.getBoundingClientRect = function () {
-      const testId = this.dataset?.testid;
-      if (testId === 'container') {
-        return { top: 0, bottom: 42, height: 42 } as DOMRect;
-      }
-
-      if (testId === 'permission') {
-        const top = Math.floor(permissionIndex / 13) * 20;
-        permissionIndex++;
-        return {
-          top,
-          bottom: top + 10,
-          height: 10,
-        } as DOMRect;
-      }
-      return { top: 0, bottom: 10, height: 10 } as DOMRect;
-    };
-
-    window.requestAnimationFrame = (cb) => {
-      cb(Date.now());
-      return 0;
-    };
-    window.cancelAnimationFrame = () => {};
-  });
-
-  it('shows correct number of hidden permissions', async () => {
-    renderWithTheme(<Permissions permissions={mockPermissionsLongExpand} />);
-
-    const hiddenCount = await screen.findByText('Expand', { exact: false });
-
-    await waitFor(() => {
-      expect(hiddenCount).toHaveTextContent('+1');
-    });
-  });
-
-  it('shows all permissions when expanded', async () => {
-    renderWithTheme(<Permissions permissions={mockPermissionsLongExpand} />);
-
-    const expandButton = await screen.findByText('Expand', { exact: false });
-    await userEvent.click(expandButton);
-
-    await waitFor(() => {
-      const allPermissions = screen.getAllByTestId('permission');
-      expect(allPermissions).toHaveLength(mockPermissionsLongExpand.length);
-    });
-  });
-  it('toggles between expand and hide', async () => {
-    renderWithTheme(<Permissions permissions={mockPermissionsLongExpand} />);
-
-    const expandButton = await screen.findByText('Expand', { exact: false });
-    await userEvent.click(expandButton);
-
-    await waitFor(() => {
-      const hideButton = screen.getByText(/hide/i);
-      expect(hideButton).toBeInTheDocument();
-    });
-
-    await userEvent.click(screen.getByText(/hide/i));
-
-    await waitFor(() => {
-      const expandButton = screen.getByText('Expand', { exact: false });
-      expect(expandButton).toBeInTheDocument();
-    });
-  });
-  it('not shows expand button when permissions fit', async () => {
-    renderWithTheme(<Permissions permissions={mockPermissions} />);
-
-    const expandButton = screen.queryByText('Expand', { exact: false });
-    expect(expandButton).not.toBeInTheDocument();
-  });
-});
diff --git a/packages/manager/src/features/IAM/Shared/Permissions/Permissions.tsx b/packages/manager/src/features/IAM/Shared/Permissions/Permissions.tsx
index fc7bcea2a89..e83905385be 100644
--- a/packages/manager/src/features/IAM/Shared/Permissions/Permissions.tsx
+++ b/packages/manager/src/features/IAM/Shared/Permissions/Permissions.tsx
@@ -1,16 +1,10 @@
-import { LinkButton, Typography } from '@linode/ui';
-import { debounce } from '@mui/material';
+import { Typography } from '@linode/ui';
+import { sortByString } from '@linode/utilities';
 import { Grid } from '@mui/material';
 import * as React from 'react';
 
-import { useCalculateHiddenItems } from '../../hooks/useCalculateHiddenItems';
-import {
-  StyledBox,
-  StyledClampedContent,
-  StyledContainer,
-  StyledPermissionItem,
-  StyledTitle,
-} from './Permissions.style';
+import { TruncatedList } from '../TruncatedList';
+import { StyledPermissionItem, StyledTitle } from './Permissions.style';
 
 import type { PermissionType } from '@linode/api-v4/lib/iam/types';
 
@@ -20,22 +14,9 @@ type Props = {
 };
 
 export const Permissions = React.memo(({ permissions }: Props) => {
-  const [showAll, setShowAll] = React.useState(false);
-
-  const { calculateHiddenItems, containerRef, itemRefs, numHiddenItems } =
-    useCalculateHiddenItems(permissions, showAll);
-
-  const handleResize = React.useMemo(
-    () => debounce(() => calculateHiddenItems(), 100),
-    [calculateHiddenItems]
-  );
-
-  React.useEffect(() => {
-    window.addEventListener('resize', handleResize);
-    return () => {
-      window.removeEventListener('resize', handleResize);
-    };
-  }, [handleResize]);
+  const sortedPermissions = permissions.sort((a, b) => {
+    return sortByString(a, b, 'asc');
+  });
 
   return (
     <Grid container data-testid="parent" direction="column">
@@ -46,35 +27,18 @@ export const Permissions = React.memo(({ permissions }: Props) => {
           to understand what access is granted by this role.
         </Typography>
       ) : (
-        <StyledContainer data-testid="container">
-          <StyledClampedContent ref={containerRef} showAll={showAll}>
-            {permissions.map((permission: PermissionType, index: number) => (
-              <StyledPermissionItem
-                data-testid="permission"
-                key={permission}
-                ref={(el: HTMLSpanElement) => {
-                  itemRefs.current[index] = el;
-                }}
-              >
-                {permission}
-              </StyledPermissionItem>
-            ))}
-          </StyledClampedContent>
-
-          {(numHiddenItems > 0 || showAll) && (
-            <StyledBox>
-              <LinkButton
-                onClick={(e) => {
-                  e.stopPropagation();
-                  setShowAll(!showAll);
-                }}
-                type="button"
-              >
-                {showAll ? 'Hide' : `Expand (+${numHiddenItems})`}
-              </LinkButton>
-            </StyledBox>
-          )}
-        </StyledContainer>
+        <TruncatedList
+          dataTestId="container"
+          listContainerSx={(theme) => ({
+            marginLeft: `-${theme.spacingFunction(6)}`,
+          })}
+        >
+          {sortedPermissions.map((permission: PermissionType) => (
+            <StyledPermissionItem data-testid="permission" key={permission}>
+              {permission}
+            </StyledPermissionItem>
+          ))}
+        </TruncatedList>
       )}
     </Grid>
   );
diff --git a/packages/manager/src/features/IAM/Shared/TruncatedList.styles.ts b/packages/manager/src/features/IAM/Shared/TruncatedList.styles.ts
new file mode 100644
index 00000000000..ccd4b092572
--- /dev/null
+++ b/packages/manager/src/features/IAM/Shared/TruncatedList.styles.ts
@@ -0,0 +1,39 @@
+import { List } from '@linode/ui';
+import { styled } from '@mui/material/styles';
+
+export const StyledTruncatedList = styled(List, {
+  label: 'StyledTruncatedList',
+})(({ theme }) => ({
+  margin: 0,
+  padding: 0,
+  display: 'flex',
+  listStyleType: 'none',
+  flexWrap: 'wrap',
+  maxHeight: '3.2em',
+  '&.expanded': {
+    maxHeight: 'none',
+  },
+  '& .visible-overflow-button': {
+    flex: 1,
+    display: 'flex',
+    justifyContent: 'end',
+  },
+  '& .last-visible-before-overflow': {
+    position: 'relative',
+    '&::after': {
+      content: "'...'",
+      display: 'inline',
+      top: 2,
+      position: 'absolute',
+      right: -3,
+    },
+  },
+  // Show right border on all visible items except the last visible one (@supports is really here to get around our test environment limitations - :has is widely supported)
+  // - The item does not have the hidden attribute
+  // - There exists a following visible <li>
+  '@supports (selector(:has(*)))': {
+    '& li:not([hidden]):has(~ li:not([hidden])) > span': {
+      borderRight: `1px solid ${theme.tokens.alias.Border.Normal}`,
+    },
+  },
+}));
diff --git a/packages/manager/src/features/IAM/Shared/TruncatedList.test.tsx b/packages/manager/src/features/IAM/Shared/TruncatedList.test.tsx
new file mode 100644
index 00000000000..5678cd20162
--- /dev/null
+++ b/packages/manager/src/features/IAM/Shared/TruncatedList.test.tsx
@@ -0,0 +1,55 @@
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { TruncatedList } from './TruncatedList';
+
+import type { PermissionType } from '@linode/api-v4';
+
+const mockPermissions: PermissionType[] = [
+  'list_linode_firewalls',
+  'list_firewall_devices',
+  'view_linode_disk',
+];
+
+describe('TruncatedList', () => {
+  it('renders all items with correct test ids', () => {
+    const { getAllByTestId } = renderWithTheme(
+      <TruncatedList dataTestId="permission">
+        {mockPermissions.map((permission) => (
+          <div key={permission}>{permission}</div>
+        ))}
+      </TruncatedList>
+    );
+
+    const allListItems = getAllByTestId('permission-list-item');
+    expect(allListItems).toHaveLength(mockPermissions.length);
+
+    mockPermissions.forEach((permission, index) => {
+      expect(allListItems[index]).toHaveTextContent(permission);
+    });
+  });
+
+  it('uses custom expand and collapse text', async () => {
+    const { container, getByText } = renderWithTheme(
+      <TruncatedList
+        collapseText="Hide permissions"
+        dataTestId="permission"
+        expandText="Show all permissions"
+      >
+        {mockPermissions.map((permission) => (
+          <div key={permission}>{permission}</div>
+        ))}
+      </TruncatedList>
+    );
+
+    expect(container).toBeInTheDocument();
+    const expandText = getByText('Show all permissions (+3)');
+    expect(expandText).toBeInTheDocument();
+
+    await userEvent.click(expandText);
+    const collapseText = getByText('Hide permissions');
+    expect(collapseText).toBeInTheDocument();
+  });
+});
diff --git a/packages/manager/src/features/IAM/Shared/TruncatedList.tsx b/packages/manager/src/features/IAM/Shared/TruncatedList.tsx
new file mode 100644
index 00000000000..e40c0616003
--- /dev/null
+++ b/packages/manager/src/features/IAM/Shared/TruncatedList.tsx
@@ -0,0 +1,270 @@
+import { Box, LinkButton } from '@linode/ui';
+import React, { useLayoutEffect, useRef } from 'react';
+import { useCallback } from 'react';
+import { debounce } from 'throttle-debounce';
+
+import { StyledTruncatedList } from './TruncatedList.styles';
+
+import type { SxProps, Theme } from '@mui/material';
+
+export interface TruncatedListProps {
+  addEllipsis?: boolean;
+  children?: React.ReactNode;
+  collapseText?: string;
+  customOverflowButton?: (hiddenItemsCount: number) => React.ReactNode;
+  dataTestId?: string;
+  expandText?: string;
+  justifyOverflowButtonRight?: boolean;
+  listContainerSx?: SxProps<Theme>;
+}
+
+type OverflowButtonProps = {
+  buttonCopy: string;
+  hiddenItemsCount: number;
+  onClick: () => void;
+};
+
+/**
+ * Checks if a child rectangle is fully contained within a parent rectangle.
+ */
+const rectFullyContains = (parentRect: DOMRect, childRect: DOMRect) => {
+  return (
+    childRect.top >= parentRect.top &&
+    childRect.bottom <= parentRect.bottom &&
+    childRect.left >= parentRect.left &&
+    childRect.right <= parentRect.right
+  );
+};
+
+export const TruncatedList = (props: TruncatedListProps) => {
+  const {
+    addEllipsis = false,
+    children,
+    collapseText = 'Hide',
+    customOverflowButton,
+    dataTestId,
+    expandText = 'Expand',
+    justifyOverflowButtonRight = false,
+    listContainerSx,
+  } = props;
+  const [showAll, setShowAll] = React.useState(false);
+
+  const containerRef = useRef<HTMLUListElement>(null);
+  const expandedRef = useRef<HTMLUListElement>(null);
+
+  const OverflowButton = React.memo((props: OverflowButtonProps) => {
+    const { hiddenItemsCount, onClick, buttonCopy } = props;
+
+    if (customOverflowButton) {
+      return customOverflowButton(hiddenItemsCount);
+    }
+
+    return (
+      <LinkButton
+        onClick={onClick}
+        sx={(theme) => ({
+          font: theme.tokens.alias.Typography.Label.Semibold.Xs,
+          paddingLeft: theme.tokens.spacing.S6,
+        })}
+      >
+        {buttonCopy} {!showAll && `(+${hiddenItemsCount})`}
+      </LinkButton>
+    );
+  });
+
+  const handleToggle = () => {
+    setShowAll(!showAll);
+  };
+
+  const truncate = useCallback(() => {
+    if (!containerRef.current) {
+      return;
+    }
+
+    const listItems = Array.from(
+      containerRef.current.children
+    ) as HTMLElement[];
+
+    containerRef.current.style.overflow = showAll ? 'visible' : 'hidden';
+
+    for (let i = 0; i < listItems.length; ++i) {
+      listItems[i].hidden = i % 2 === 0;
+      if (i % 2 === 0 && justifyOverflowButtonRight) {
+        listItems[i].classList.remove('visible-overflow-button');
+      } else if (addEllipsis) {
+        listItems[i].classList.remove('last-visible-before-overflow');
+      }
+    }
+
+    if (listItems.length === 1) {
+      return;
+    }
+
+    const itemEl = listItems[listItems.length - 2];
+    if (
+      rectFullyContains(
+        containerRef.current.getBoundingClientRect(),
+        itemEl.getBoundingClientRect()
+      )
+    ) {
+      return;
+    }
+
+    const numBreakpoints = Math.floor((listItems.length - 1) / 2);
+    let left = 0;
+    let right = numBreakpoints - 1;
+    let numItemsShowingWithTruncation: null | number = null;
+
+    while (left <= right) {
+      const middle = Math.floor((left + right) / 2);
+
+      for (let i = 0; i < middle; i += 1) {
+        listItems[i * 2 + 1].hidden = false;
+      }
+      for (let i = middle; i < numBreakpoints; i += 1) {
+        listItems[i * 2 + 1].hidden = true;
+      }
+
+      const breakpointEl = listItems[middle * 2];
+      breakpointEl.hidden = false;
+
+      if (
+        rectFullyContains(
+          containerRef.current.getBoundingClientRect(),
+          breakpointEl.getBoundingClientRect()
+        )
+      ) {
+        numItemsShowingWithTruncation = middle;
+        left = middle + 1;
+      } else {
+        right = middle - 1;
+      }
+
+      breakpointEl.hidden = true;
+    }
+
+    if (numItemsShowingWithTruncation === null) {
+      return;
+    }
+
+    for (let i = 0; i < numItemsShowingWithTruncation; i += 1) {
+      listItems[i * 2 + 1].hidden = false;
+    }
+    for (let i = numItemsShowingWithTruncation; i < numBreakpoints; i += 1) {
+      listItems[i * 2 + 1].hidden = true;
+    }
+
+    const breakpointEl = listItems[numItemsShowingWithTruncation * 2];
+    breakpointEl.hidden = false;
+
+    if (justifyOverflowButtonRight) {
+      breakpointEl.classList.add('visible-overflow-button'); // Add class to the visible one
+    }
+
+    if (numItemsShowingWithTruncation > 0) {
+      const lastVisibleContentIndex =
+        (numItemsShowingWithTruncation - 1) * 2 + 1;
+      const lastVisibleContentEl = listItems[lastVisibleContentIndex];
+      if (lastVisibleContentEl && addEllipsis) {
+        lastVisibleContentEl.classList.add('last-visible-before-overflow');
+      }
+    }
+  }, [showAll, justifyOverflowButtonRight, addEllipsis]);
+
+  useLayoutEffect(() => {
+    const container = showAll ? expandedRef.current : containerRef.current;
+    if (!container) return;
+
+    let isInitialObservation = true;
+
+    const resizeObserver = new ResizeObserver(
+      debounce(150, () => {
+        if (isInitialObservation) {
+          isInitialObservation = false;
+          truncate();
+          return;
+        }
+
+        // Only reset to collapsed on actual resize events, not initial observation
+        if (showAll) {
+          setShowAll(false);
+        }
+        truncate();
+      })
+    );
+
+    resizeObserver.observe(container);
+    truncate();
+
+    return () => {
+      resizeObserver.unobserve(container);
+    };
+  }, [truncate, showAll, children]);
+
+  const childArray = React.Children.toArray(children);
+
+  if (showAll) {
+    return (
+      <StyledTruncatedList
+        className="expanded"
+        data-testid={dataTestId}
+        ref={expandedRef}
+        sx={listContainerSx}
+      >
+        {childArray.map((item, i) => (
+          <li
+            data-testid={`${dataTestId ?? 'truncated-list'}-list-item`}
+            key={i}
+          >
+            {item}
+          </li>
+        ))}
+        <li>
+          <OverflowButton
+            buttonCopy={collapseText}
+            hiddenItemsCount={0}
+            onClick={handleToggle}
+          />
+        </li>
+      </StyledTruncatedList>
+    );
+  }
+
+  const items = childArray.map((item, i) => (
+    <React.Fragment key={i}>
+      <li hidden>
+        <OverflowButton
+          buttonCopy={expandText}
+          hiddenItemsCount={childArray.length - i}
+          onClick={handleToggle}
+        />
+      </li>
+      <li data-testid={`${dataTestId ?? 'truncated-list'}-list-item`}>
+        {item}
+      </li>
+    </React.Fragment>
+  ));
+
+  return (
+    <Box>
+      <StyledTruncatedList
+        data-testid={dataTestId}
+        ref={containerRef}
+        sx={listContainerSx}
+      >
+        {showAll ? null : (
+          <>
+            {items}
+            <li hidden>
+              <OverflowButton
+                buttonCopy={expandText}
+                hiddenItemsCount={0}
+                onClick={handleToggle}
+              />
+            </li>
+          </>
+        )}
+      </StyledTruncatedList>
+    </Box>
+  );
+};
diff --git a/packages/manager/src/features/IAM/Users/UserEntities/AssignedEntitiesTable.test.tsx b/packages/manager/src/features/IAM/Users/UserEntities/AssignedEntitiesTable.test.tsx
index fe06dd6582f..d0c06967d7d 100644
--- a/packages/manager/src/features/IAM/Users/UserEntities/AssignedEntitiesTable.test.tsx
+++ b/packages/manager/src/features/IAM/Users/UserEntities/AssignedEntitiesTable.test.tsx
@@ -4,13 +4,12 @@ import React from 'react';
 
 import { accountEntityFactory } from 'src/factories/accountEntities';
 import { userRolesFactory } from 'src/factories/userRoles';
-import { makeResourcePage } from 'src/mocks/serverHandlers';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { AssignedEntitiesTable } from '../../Users/UserEntities/AssignedEntitiesTable';
 
 const queryMocks = vi.hoisted(() => ({
-  useAccountEntities: vi.fn().mockReturnValue({}),
+  useAllAccountEntities: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
   useSearch: vi.fn().mockReturnValue({}),
   useUserRoles: vi.fn().mockReturnValue({}),
@@ -28,7 +27,7 @@ vi.mock('src/queries/entities/entities', async () => {
   const actual = await vi.importActual('src/queries/entities/entities');
   return {
     ...actual,
-    useAccountEntities: queryMocks.useAccountEntities,
+    useAllAccountEntities: queryMocks.useAllAccountEntities,
   };
 });
 
@@ -74,8 +73,8 @@ describe('AssignedEntitiesTable', () => {
       data: userRolesFactory.build(),
     });
 
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<AssignedEntitiesTable />);
@@ -99,8 +98,8 @@ describe('AssignedEntitiesTable', () => {
       data: userRolesFactory.build(),
     });
 
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<AssignedEntitiesTable />);
@@ -118,8 +117,8 @@ describe('AssignedEntitiesTable', () => {
       data: userRolesFactory.build(),
     });
 
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<AssignedEntitiesTable />);
@@ -137,8 +136,8 @@ describe('AssignedEntitiesTable', () => {
       data: userRolesFactory.build(),
     });
 
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<AssignedEntitiesTable />);
diff --git a/packages/manager/src/features/IAM/Users/UserEntities/AssignedEntitiesTable.tsx b/packages/manager/src/features/IAM/Users/UserEntities/AssignedEntitiesTable.tsx
index a1fd2a6ee39..fc922a54522 100644
--- a/packages/manager/src/features/IAM/Users/UserEntities/AssignedEntitiesTable.tsx
+++ b/packages/manager/src/features/IAM/Users/UserEntities/AssignedEntitiesTable.tsx
@@ -18,7 +18,7 @@ import { TableRowError } from 'src/components/TableRowError/TableRowError';
 import { TableRowLoading } from 'src/components/TableRowLoading/TableRowLoading';
 import { TableSortCell } from 'src/components/TableSortCell';
 import { usePaginationV2 } from 'src/hooks/usePaginationV2';
-import { useAccountEntities } from 'src/queries/entities/entities';
+import { useAllAccountEntities } from 'src/queries/entities/entities';
 
 import { usePermissions } from '../../hooks/usePermissions';
 import { ENTITIES_TABLE_PREFERENCE_KEY } from '../../Shared/constants';
@@ -90,7 +90,7 @@ export const AssignedEntitiesTable = () => {
     data: entities,
     error: entitiesError,
     isLoading: entitiesLoading,
-  } = useAccountEntities();
+  } = useAllAccountEntities({});
 
   const {
     data: assignedRoles,
@@ -102,7 +102,7 @@ export const AssignedEntitiesTable = () => {
     if (!assignedRoles || !entities) {
       return { filterableOptions: [], roles: [] };
     }
-    const transformedEntities = groupAccountEntitiesByType(entities.data);
+    const transformedEntities = groupAccountEntitiesByType(entities);
 
     const roles = addEntityNamesToRoles(assignedRoles, transformedEntities);
 
diff --git a/packages/manager/src/features/IAM/Users/UserEntities/UserEntities.test.tsx b/packages/manager/src/features/IAM/Users/UserEntities/UserEntities.test.tsx
index 22034c79276..1858996f4ea 100644
--- a/packages/manager/src/features/IAM/Users/UserEntities/UserEntities.test.tsx
+++ b/packages/manager/src/features/IAM/Users/UserEntities/UserEntities.test.tsx
@@ -5,7 +5,6 @@ import React from 'react';
 import { accountEntityFactory } from 'src/factories/accountEntities';
 import { accountRolesFactory } from 'src/factories/accountRoles';
 import { userRolesFactory } from 'src/factories/userRoles';
-import { makeResourcePage } from 'src/mocks/serverHandlers';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import {
@@ -23,7 +22,7 @@ const mockEntities = [
 ];
 
 const queryMocks = vi.hoisted(() => ({
-  useAccountEntities: vi.fn().mockReturnValue({}),
+  useAllAccountEntities: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
   useSearch: vi.fn().mockReturnValue({}),
   useAccountRoles: vi.fn().mockReturnValue({}),
@@ -44,7 +43,7 @@ vi.mock('src/queries/entities/entities', async () => {
   const actual = await vi.importActual('src/queries/entities/entities');
   return {
     ...actual,
-    useAccountEntities: queryMocks.useAccountEntities,
+    useAllAccountEntities: queryMocks.useAllAccountEntities,
   };
 });
 
@@ -121,14 +120,13 @@ describe('UserEntities', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<UserEntities />);
 
     expect(screen.queryByText('Assign New Roles')).toBeNull();
-
     expect(screen.getByText('firewall_admin')).toBeVisible();
     expect(screen.getByText('firewall-1')).toBeVisible();
 
diff --git a/packages/manager/src/features/IAM/Users/UserRoles/AssignedEntities.tsx b/packages/manager/src/features/IAM/Users/UserRoles/AssignedEntities.tsx
index 8559ad920e8..f1c53a8b555 100644
--- a/packages/manager/src/features/IAM/Users/UserRoles/AssignedEntities.tsx
+++ b/packages/manager/src/features/IAM/Users/UserRoles/AssignedEntities.tsx
@@ -1,8 +1,9 @@
 import { Box, Button, Chip, CloseIcon, Tooltip } from '@linode/ui';
-import { debounce, useTheme } from '@mui/material';
+import { sortByString } from '@linode/utilities';
+import { useTheme } from '@mui/material';
 import * as React from 'react';
 
-import { useCalculateHiddenItems } from '../../hooks/useCalculateHiddenItems';
+import { TruncatedList } from '../../Shared/TruncatedList';
 
 import type { CombinedEntity, ExtendedRoleView } from '../../Shared/types';
 import type { AccountRoleType, EntityRoleType } from '@linode/api-v4';
@@ -20,28 +21,6 @@ export const AssignedEntities = ({
 }: Props) => {
   const theme = useTheme();
 
-  const { calculateHiddenItems, containerRef, itemRefs, numHiddenItems } =
-    useCalculateHiddenItems(role.entity_names!);
-
-  const handleResize = React.useMemo(
-    () => debounce(() => calculateHiddenItems(), 250),
-    [calculateHiddenItems]
-  );
-
-  React.useEffect(() => {
-    // Double RAF for good measure - see https://stackoverflow.com/questions/44145740/how-does-double-requestanimationframe-work
-    const rafId = requestAnimationFrame(() => {
-      requestAnimationFrame(() => calculateHiddenItems());
-    });
-
-    window.addEventListener('resize', handleResize);
-
-    return () => {
-      cancelAnimationFrame(rafId);
-      window.removeEventListener('resize', handleResize);
-    };
-  }, [calculateHiddenItems, handleResize]);
-
   const combinedEntities: CombinedEntity[] = React.useMemo(
     () =>
       role.entity_names!.map((name, index) => ({
@@ -51,114 +30,91 @@ export const AssignedEntities = ({
     [role.entity_names, role.entity_ids]
   );
 
-  const isLastVisibleItem = React.useCallback(
-    (index: number) => {
-      return combinedEntities.length - numHiddenItems - 1 === index;
-    },
-    [combinedEntities.length, numHiddenItems]
-  );
+  const sortedEntities = combinedEntities?.sort((a, b) => {
+    return sortByString(a.name, b.name, 'asc');
+  });
 
-  const items = combinedEntities?.map(
-    (entity: CombinedEntity, index: number) => (
-      <Box
-        key={entity.id}
-        ref={(el: HTMLDivElement) => {
-          itemRefs.current[index] = el;
-        }}
-        sx={{
-          display: 'inline',
-          marginRight:
-            numHiddenItems > 0 && isLastVisibleItem(index)
-              ? theme.tokens.spacing.S16
-              : theme.tokens.spacing.S8,
-        }}
+  const items = sortedEntities?.map((entity: CombinedEntity) => (
+    <Box
+      key={entity.id}
+      sx={{
+        display: 'inline',
+        marginRight: theme.tokens.spacing.S8,
+      }}
+    >
+      <Tooltip
+        placement="top"
+        title={entity.name.length > 30 ? entity.name : null}
       >
-        <Tooltip
-          placement="top"
-          title={entity.name.length > 30 ? entity.name : null}
-        >
-          <Chip
-            data-testid="entities"
-            deleteIcon={<CloseIcon data-testid="CloseIcon" />}
-            label={
-              entity.name.length > 30
-                ? `${entity.name.slice(0, 20)}...`
-                : entity.name
-            }
-            onDelete={() => onRemoveAssignment(entity, role)}
+        <Chip
+          data-testid="entities"
+          deleteIcon={<CloseIcon data-testid="CloseIcon" />}
+          label={
+            entity.name.length > 30
+              ? `${entity.name.slice(0, 20)}...`
+              : entity.name
+          }
+          onDelete={() => onRemoveAssignment(entity, role)}
+          sx={{
+            backgroundColor:
+              theme.name === 'light'
+                ? theme.tokens.color.Ultramarine[20]
+                : theme.tokens.color.Neutrals.Black,
+            color: theme.tokens.alias.Content.Text.Primary.Default,
+            '& .MuiChip-deleteIcon': {
+              color: theme.tokens.alias.Content.Text.Primary.Default,
+            },
+            position: 'relative',
+          }}
+        />
+      </Tooltip>
+    </Box>
+  ));
+
+  return (
+    <Box>
+      <TruncatedList
+        addEllipsis
+        customOverflowButton={(numHiddenItems) => (
+          <Box
             sx={{
+              alignItems: 'center',
               backgroundColor:
                 theme.name === 'light'
                   ? theme.tokens.color.Ultramarine[20]
                   : theme.tokens.color.Neutrals.Black,
-              color: theme.tokens.alias.Content.Text.Primary.Default,
-              '& .MuiChip-deleteIcon': {
-                color: theme.tokens.alias.Content.Text.Primary.Default,
-              },
+              borderRadius: 1,
+              display: 'flex',
+              height: '20px',
+              maxWidth: 'max-content',
+              padding: `${theme.tokens.spacing.S4} ${theme.tokens.spacing.S8}`,
               position: 'relative',
-              '&::after': {
-                content:
-                  numHiddenItems > 0 && isLastVisibleItem(index)
-                    ? '"..."'
-                    : '""',
-                position: 'absolute',
-                top: 0,
-                right: -16,
-                width: 14,
-              },
+              top: 2,
             }}
-          />
-        </Tooltip>
-      </Box>
-    )
-  );
-
-  return (
-    <Box
-      sx={{
-        alignItems: 'center',
-        display: 'flex',
-        position: 'relative',
-      }}
-    >
-      <Box
-        ref={containerRef}
-        sx={{
+          >
+            <Tooltip placement="top" title="Click to View All Entities">
+              <Button
+                onClick={() => onButtonClick(role.name as EntityRoleType)}
+                sx={{
+                  color: theme.tokens.alias.Content.Text.Primary.Default,
+                  font: theme.tokens.alias.Typography.Label.Regular.Xs,
+                  padding: 0,
+                }}
+              >
+                +{numHiddenItems}
+              </Button>
+            </Tooltip>
+          </Box>
+        )}
+        justifyOverflowButtonRight
+        listContainerSx={{
+          width: '100%',
           overflow: 'hidden',
-          height: 24,
+          maxHeight: 24,
         }}
       >
         {items}
-      </Box>
-      {numHiddenItems > 0 && (
-        <Box
-          sx={{
-            alignItems: 'center',
-            backgroundColor:
-              theme.name === 'light'
-                ? theme.tokens.color.Ultramarine[20]
-                : theme.tokens.color.Neutrals.Black,
-            borderRadius: 1,
-            display: 'flex',
-            height: '20px',
-            maxWidth: 'max-content',
-            padding: `${theme.tokens.spacing.S4} ${theme.tokens.spacing.S8}`,
-          }}
-        >
-          <Tooltip placement="top" title="Click to View All Entities">
-            <Button
-              onClick={() => onButtonClick(role.name as EntityRoleType)}
-              sx={{
-                color: theme.tokens.alias.Content.Text.Primary.Default,
-                font: theme.tokens.alias.Typography.Label.Regular.Xs,
-                padding: 0,
-              }}
-            >
-              +{numHiddenItems}
-            </Button>
-          </Tooltip>
-        </Box>
-      )}
+      </TruncatedList>
     </Box>
   );
 };
diff --git a/packages/manager/src/features/IAM/Users/UserRoles/UserRoles.test.tsx b/packages/manager/src/features/IAM/Users/UserRoles/UserRoles.test.tsx
index a14d7e6cf9d..3565e7d17c2 100644
--- a/packages/manager/src/features/IAM/Users/UserRoles/UserRoles.test.tsx
+++ b/packages/manager/src/features/IAM/Users/UserRoles/UserRoles.test.tsx
@@ -5,7 +5,6 @@ import React from 'react';
 import { accountEntityFactory } from 'src/factories/accountEntities';
 import { accountRolesFactory } from 'src/factories/accountRoles';
 import { userRolesFactory } from 'src/factories/userRoles';
-import { makeResourcePage } from 'src/mocks/serverHandlers';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import {
@@ -22,7 +21,7 @@ const mockEntities = [
 ];
 
 const queryMocks = vi.hoisted(() => ({
-  useAccountEntities: vi.fn().mockReturnValue({}),
+  useAllAccountEntities: vi.fn().mockReturnValue({}),
   useParams: vi.fn().mockReturnValue({}),
   useSearch: vi.fn().mockReturnValue({}),
   useAccountRoles: vi.fn().mockReturnValue({}),
@@ -43,7 +42,7 @@ vi.mock('src/queries/entities/entities', async () => {
   const actual = await vi.importActual('src/queries/entities/entities');
   return {
     ...actual,
-    useAccountEntities: queryMocks.useAccountEntities,
+    useAllAccountEntities: queryMocks.useAllAccountEntities,
   };
 });
 
@@ -108,8 +107,8 @@ describe('UserRoles', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<UserRoles />);
@@ -140,8 +139,8 @@ describe('UserRoles', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<UserRoles />);
@@ -167,8 +166,8 @@ describe('UserRoles', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<UserRoles />);
@@ -185,8 +184,8 @@ describe('UserRoles', () => {
       data: accountRolesFactory.build(),
     });
 
-    queryMocks.useAccountEntities.mockReturnValue({
-      data: makeResourcePage(mockEntities),
+    queryMocks.useAllAccountEntities.mockReturnValue({
+      data: mockEntities,
     });
 
     renderWithTheme(<UserRoles />);
diff --git a/packages/manager/src/features/IAM/Users/UsersTable/ProxyUserTable.tsx b/packages/manager/src/features/IAM/Users/UsersTable/ProxyUserTable.tsx
deleted file mode 100644
index 6895a04a313..00000000000
--- a/packages/manager/src/features/IAM/Users/UsersTable/ProxyUserTable.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { useAccountUsers } from '@linode/queries';
-import { Typography } from '@linode/ui';
-import React from 'react';
-
-import { Table } from 'src/components/Table';
-import { TableBody } from 'src/components/TableBody';
-import { PARENT_USER } from 'src/features/Account/constants';
-
-import { UsersLandingProxyTableHead } from './UsersLandingProxyTableHead';
-import { UsersLandingTableBody } from './UsersLandingTableBody';
-
-import type { Order } from './UsersLandingTableHead';
-
-interface Props {
-  canListUsers: boolean | undefined;
-  handleDelete: (username: string) => void;
-  isProxyUser: boolean;
-  order: Order;
-}
-
-export const ProxyUserTable = ({
-  handleDelete,
-  isProxyUser,
-  canListUsers,
-  order,
-}: Props) => {
-  const {
-    data: proxyUser,
-    error: proxyUserError,
-    isLoading: isLoadingProxyUser,
-  } = useAccountUsers({
-    enabled: isProxyUser && canListUsers,
-    filters: { user_type: 'proxy' },
-  });
-
-  const proxyNumCols = 3;
-
-  return (
-    <>
-      <Typography
-        sx={(theme) => ({
-          marginBottom: theme.spacing(2),
-          marginTop: theme.spacing(3),
-          textTransform: 'capitalize',
-          [theme.breakpoints.down('md')]: {
-            marginLeft: theme.spacing(1),
-          },
-        })}
-        variant="h3"
-      >
-        {PARENT_USER} Settings
-      </Typography>
-
-      <Table aria-label="List of Parent Users">
-        <UsersLandingProxyTableHead order={order} />
-        <TableBody>
-          <UsersLandingTableBody
-            error={proxyUserError}
-            isLoading={isLoadingProxyUser}
-            numCols={proxyNumCols}
-            onDelete={handleDelete}
-            users={proxyUser?.data}
-          />
-        </TableBody>
-      </Table>
-    </>
-  );
-};
diff --git a/packages/manager/src/features/IAM/Users/UsersTable/Users.tsx b/packages/manager/src/features/IAM/Users/UsersTable/Users.tsx
index a32f4e194d8..81de8087324 100644
--- a/packages/manager/src/features/IAM/Users/UsersTable/Users.tsx
+++ b/packages/manager/src/features/IAM/Users/UsersTable/Users.tsx
@@ -1,6 +1,6 @@
-import { useAccountUsers, useProfile } from '@linode/queries';
+import { useAccountUsers } from '@linode/queries';
 import { getAPIFilterFromQuery } from '@linode/search';
-import { Button, Paper, Stack, Typography } from '@linode/ui';
+import { Button, Paper, Stack } from '@linode/ui';
 import { useMediaQuery } from '@mui/material';
 import { useTheme } from '@mui/material/styles';
 import { useNavigate, useSearch } from '@tanstack/react-router';
@@ -16,7 +16,6 @@ import { usePaginationV2 } from 'src/hooks/usePaginationV2';
 import { usePermissions } from '../../hooks/usePermissions';
 import { UserDeleteConfirmation } from '../../Shared/UserDeleteConfirmation';
 import { CreateUserDrawer } from './CreateUserDrawer';
-import { ProxyUserTable } from './ProxyUserTable';
 import { UsersLandingTableBody } from './UsersLandingTableBody';
 import { UsersLandingTableHead } from './UsersLandingTableHead';
 
@@ -31,7 +30,6 @@ export const UsersLanding = () => {
     React.useState<boolean>(false);
   const [isDeleteDialogOpen, setIsDeleteDialogOpen] = React.useState(false);
   const [selectedUsername, setSelectedUsername] = React.useState('');
-  const { data: profile } = useProfile();
   const theme = useTheme();
   const { data: permissions } = usePermissions('account', ['create_user']);
   const pagination = usePaginationV2({
@@ -50,9 +48,6 @@ export const UsersLanding = () => {
     preferenceKey: 'iam-account-users-order',
   });
 
-  const isProxyUser =
-    profile?.user_type === 'child' || profile?.user_type === 'proxy';
-
   const queryParams = new URLSearchParams(location.search);
 
   const { error: searchError, filter } = getAPIFilterFromQuery(query, {
@@ -108,14 +103,6 @@ export const UsersLanding = () => {
 
   return (
     <React.Fragment>
-      {isProxyUser && (
-        <ProxyUserTable
-          canListUsers={true}
-          handleDelete={handleDelete}
-          isProxyUser={isProxyUser}
-          order={order}
-        />
-      )}
       <Paper sx={(theme) => ({ marginTop: theme.tokens.spacing.S16 })}>
         <Stack
           direction={isSmDown ? 'column' : 'row'}
@@ -123,35 +110,22 @@ export const UsersLanding = () => {
           marginBottom={2}
           spacing={2}
         >
-          {isProxyUser ? (
-            <Typography
-              sx={(theme) => ({
-                [theme.breakpoints.down('md')]: {
-                  marginLeft: theme.tokens.spacing.S8,
-                },
-              })}
-              variant="h3"
-            >
-              User Settings
-            </Typography>
-          ) : (
-            <DebouncedSearchTextField
-              clearable
-              containerProps={{
-                sx: {
-                  width: '320px',
-                },
-              }}
-              debounceTime={250}
-              errorText={searchError?.message}
-              hideLabel
-              isSearching={isFetching}
-              label="Filter"
-              onSearch={handleSearch}
-              placeholder="Filter"
-              value={query ?? ''}
-            />
-          )}
+          <DebouncedSearchTextField
+            clearable
+            containerProps={{
+              sx: {
+                width: '320px',
+              },
+            }}
+            debounceTime={250}
+            errorText={searchError?.message}
+            hideLabel
+            isSearching={isFetching}
+            label="Filter"
+            onSearch={handleSearch}
+            placeholder="Filter"
+            value={query ?? ''}
+          />
           <Button
             buttonType="primary"
             disabled={!canCreateUser}
diff --git a/packages/manager/src/features/IAM/Users/UsersTable/UsersLandingProxyTableHead.test.tsx b/packages/manager/src/features/IAM/Users/UsersTable/UsersLandingProxyTableHead.test.tsx
deleted file mode 100644
index b3111495e39..00000000000
--- a/packages/manager/src/features/IAM/Users/UsersTable/UsersLandingProxyTableHead.test.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { fireEvent } from '@testing-library/react';
-import React from 'react';
-
-import { renderWithTheme } from 'src/utilities/testHelpers';
-
-import { UsersLandingProxyTableHead } from './UsersLandingProxyTableHead';
-
-import type { SortOrder } from './UsersLandingTableHead';
-
-const mockOrder = {
-  handleOrderChange: vi.fn(),
-  order: 'asc' as SortOrder,
-  orderBy: 'username',
-};
-
-describe('UsersLandingProxyTableHead', () => {
-  it('should render Username cell', () => {
-    const { getByText } = renderWithTheme(
-      <UsersLandingProxyTableHead order={mockOrder} />
-    );
-
-    const username = getByText('Username');
-    expect(username).toBeInTheDocument();
-  });
-
-  it('should call handleOrderChange when Username sort cell is clicked', () => {
-    const { getByText } = renderWithTheme(
-      <UsersLandingProxyTableHead order={mockOrder} />
-    );
-
-    const usernameCell = getByText('Username');
-    expect(usernameCell).toBeInTheDocument();
-    fireEvent.click(usernameCell);
-
-    // Expect the handleOrderChange to have been called
-    expect(mockOrder.handleOrderChange).toHaveBeenCalled();
-  });
-
-  it('should render correctly with order props', () => {
-    const { getByText } = renderWithTheme(
-      <UsersLandingProxyTableHead order={mockOrder} />
-    );
-
-    const usernameCell = getByText('Username');
-    expect(usernameCell).toBeInTheDocument();
-
-    expect(usernameCell.closest('span')).toHaveAttribute(
-      'aria-label',
-      'Sort by username'
-    );
-  });
-});
diff --git a/packages/manager/src/features/IAM/Users/UsersTable/UsersLandingProxyTableHead.tsx b/packages/manager/src/features/IAM/Users/UsersTable/UsersLandingProxyTableHead.tsx
deleted file mode 100644
index 0259e6efaf8..00000000000
--- a/packages/manager/src/features/IAM/Users/UsersTable/UsersLandingProxyTableHead.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Hidden } from '@linode/ui';
-import React from 'react';
-
-import { TableCell } from 'src/components/TableCell';
-import { TableHead } from 'src/components/TableHead';
-import { TableRow } from 'src/components/TableRow/TableRow';
-import { TableSortCell } from 'src/components/TableSortCell';
-
-import type { Order } from './UsersLandingTableHead';
-
-interface Props {
-  order: Order;
-}
-
-export const UsersLandingProxyTableHead = ({ order }: Props) => {
-  return (
-    <TableHead
-      sx={{
-        whiteSpace: 'nowrap',
-      }}
-    >
-      <TableRow>
-        <TableSortCell
-          active={order.orderBy === 'username'}
-          direction={order.order}
-          handleClick={order.handleOrderChange}
-          label="username"
-        >
-          Username
-        </TableSortCell>
-        <Hidden smDown>
-          <TableSortCell
-            active={order.orderBy === 'email'}
-            direction={order.order}
-            handleClick={order.handleOrderChange}
-            label="email"
-          >
-            Email Address
-          </TableSortCell>
-        </Hidden>
-        <TableCell />
-      </TableRow>
-    </TableHead>
-  );
-};
diff --git a/packages/manager/src/features/IAM/hooks/useCalculateHiddenItems.ts b/packages/manager/src/features/IAM/hooks/useCalculateHiddenItems.ts
deleted file mode 100644
index b3a13dc051c..00000000000
--- a/packages/manager/src/features/IAM/hooks/useCalculateHiddenItems.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import React, { useLayoutEffect, useRef, useState } from 'react';
-
-import type { PermissionType } from '@linode/api-v4';
-
-/**
- * Custom hook to calculate hidden items
- */
-export const useCalculateHiddenItems = (
-  items: PermissionType[] | string[],
-  showAll?: boolean
-) => {
-  const [numHiddenItems, setNumHiddenItems] = useState<number>(0);
-  const containerRef = useRef<HTMLDivElement | null>(null);
-  const itemRefs = useRef<(HTMLDivElement | HTMLSpanElement)[]>([]);
-
-  const calculateHiddenItems = React.useCallback(() => {
-    if (showAll) {
-      setNumHiddenItems(0);
-      return;
-    }
-
-    if (!containerRef.current || !itemRefs.current) {
-      return;
-    }
-
-    const containerBottom = containerRef.current.getBoundingClientRect().bottom;
-
-    const itemsArray = Array.from(itemRefs.current);
-
-    const firstHiddenIndex = itemsArray.findIndex(
-      (item: HTMLDivElement | HTMLSpanElement) => {
-        if (!item) {
-          return false;
-        }
-        const rect = item.getBoundingClientRect();
-        return rect.top >= containerBottom;
-      }
-    );
-
-    const numHiddenItems =
-      firstHiddenIndex !== -1 ? itemsArray.length - firstHiddenIndex : 0;
-
-    setNumHiddenItems(numHiddenItems);
-  }, [showAll]);
-
-  useLayoutEffect(() => {
-    let rafId: number;
-
-    const run = () => {
-      const container = containerRef.current;
-      if (!container || container.offsetHeight === 0) {
-        rafId = requestAnimationFrame(run);
-        return;
-      }
-
-      calculateHiddenItems();
-    };
-
-    rafId = requestAnimationFrame(run);
-
-    return () => cancelAnimationFrame(rafId);
-  }, [items, calculateHiddenItems]);
-
-  return { calculateHiddenItems, containerRef, itemRefs, numHiddenItems };
-};
diff --git a/packages/manager/src/features/IAM/hooks/useIsIAMEnabled.ts b/packages/manager/src/features/IAM/hooks/useIsIAMEnabled.ts
index 0a0f3c7b73f..7cd61bf8280 100644
--- a/packages/manager/src/features/IAM/hooks/useIsIAMEnabled.ts
+++ b/packages/manager/src/features/IAM/hooks/useIsIAMEnabled.ts
@@ -73,3 +73,13 @@ export const checkIAMEnabled = async (
     return false;
   }
 };
+
+/**
+ * Returns whether or not features related to the IAM Delegation project
+ * should be enabled.
+ */
+export const useIsIAMDelegationEnabled = () => {
+  const flags = useFlags();
+
+  return { isIAMDelegationEnabled: flags.iamDelegation?.enabled ?? false };
+};
diff --git a/packages/manager/src/features/IAM/hooks/usePermissions.ts b/packages/manager/src/features/IAM/hooks/usePermissions.ts
index d5eba95fcba..b266e03ff90 100644
--- a/packages/manager/src/features/IAM/hooks/usePermissions.ts
+++ b/packages/manager/src/features/IAM/hooks/usePermissions.ts
@@ -21,9 +21,27 @@ import type {
   AccountEntity,
   APIError,
   EntityType,
+  FirewallAdmin,
+  FirewallContributor,
+  FirewallViewer,
   GrantType,
+  ImageAdmin,
+  ImageContributor,
+  ImageViewer,
+  LinodeAdmin,
+  LinodeContributor,
+  LinodeViewer,
+  NodeBalancerAdmin,
+  NodeBalancerContributor,
+  NodeBalancerViewer,
   PermissionType,
   Profile,
+  VolumeAdmin,
+  VolumeContributor,
+  VolumeViewer,
+  VPCAdmin,
+  VPCContributor,
+  VPCViewer,
 } from '@linode/api-v4';
 import type { UseQueryResult } from '@linode/queries';
 
@@ -36,16 +54,110 @@ const LA_ACCOUNT_ADMIN_PERMISSIONS_TO_EXCLUDE = [
   'create_nodebalancer',
 ];
 
+type EntityPermission =
+  | FirewallAdmin
+  | FirewallContributor
+  | FirewallViewer
+  | ImageAdmin
+  | ImageContributor
+  | ImageViewer
+  | LinodeAdmin
+  | LinodeContributor
+  | LinodeViewer
+  | NodeBalancerAdmin
+  | NodeBalancerContributor
+  | NodeBalancerViewer
+  | VolumeAdmin
+  | VolumeContributor
+  | VolumeViewer
+  | VPCAdmin
+  | VPCContributor
+  | VPCViewer;
+
+declare const PermissionByAccessKnown: {
+  account: Exclude<AccountAdmin, EntityPermission>;
+  database: never; // TODO: add database permissions
+  domain: never; // TODO: add domain permissions
+  firewall: FirewallAdmin | FirewallContributor | FirewallViewer;
+  image: ImageAdmin | ImageContributor | ImageViewer;
+  linode: LinodeAdmin | LinodeContributor | LinodeViewer;
+  lkecluster: never; // TODO: add lkecluster permissions
+  longview: never; // TODO: add longview permissions
+  nodebalancer:
+    | NodeBalancerAdmin
+    | NodeBalancerContributor
+    | NodeBalancerViewer;
+  placement_group: never; // TODO: add placement_group permissions
+  stackscript: never; // TODO: add stackscript permissions
+  volume: VolumeAdmin | VolumeContributor | VolumeViewer;
+  vpc: VPCAdmin | VPCContributor | VPCViewer;
+};
+
+type AssertNever<T extends never> = T;
+
+/**
+ * Compile‑time assertions only.
+ *
+ * Ensure:
+ * - PermissionByAccessKnown has only allowed AccessTypes.
+ * - All AccessTypes are handled by PermissionByAccessKnown.
+ */
+export type NoExtraKeys = AssertNever<
+  Exclude<keyof typeof PermissionByAccessKnown, AccessType>
+>;
+export type AllHandled = AssertNever<
+  Exclude<AccessType, keyof typeof PermissionByAccessKnown>
+>;
+
+type KnownAccessKeys = keyof typeof PermissionByAccessKnown & AccessType;
+
+type AllowedPermissionsFor<A extends AccessType> = A extends KnownAccessKeys
+  ? (typeof PermissionByAccessKnown)[A]
+  : // exhaustiveness check, no fallback
+    never;
+
 export type PermissionsResult<T extends readonly PermissionType[]> = {
   data: Record<T[number], boolean>;
 } & Omit<UseQueryResult<PermissionType[], APIError[]>, 'data'>;
 
-export const usePermissions = <T extends readonly PermissionType[]>(
-  accessType: AccessType,
+/**
+ * Overload 1: account-level
+ */
+export function usePermissions<
+  A extends 'account',
+  T extends readonly AllowedPermissionsFor<A>[],
+>(
+  accessType: A,
+  permissionsToCheck: T,
+  entityId?: undefined,
+  enabled?: boolean
+): PermissionsResult<T>;
+
+/**
+ * Overload 2: entity-level
+ */
+export function usePermissions<
+  A extends Exclude<AccessType, 'account'>,
+  T extends readonly AllowedPermissionsFor<A>[],
+>(
+  accessType: A,
+  permissionsToCheck: T,
+  entityId: number | string | undefined,
+  enabled?: boolean
+): PermissionsResult<T>;
+
+/**
+ * Implementation
+ */
+export function usePermissions<
+  A extends AccessType,
+  T extends readonly PermissionType[],
+>(
+  accessType: A,
   permissionsToCheck: T,
   entityId?: number | string,
   enabled: boolean = true
-): PermissionsResult<T> => {
+): PermissionsResult<T> {
   const { isIAMBeta, isIAMEnabled } = useIsIAMEnabled();
   const { data: profile } = useProfile();
 
@@ -70,26 +182,34 @@ export const usePermissions = <T extends readonly PermissionType[]>(
     BETA_ACCESS_TYPE_SCOPE.includes(accessType) &&
     LA_ACCOUNT_ADMIN_PERMISSIONS_TO_EXCLUDE.some(
       (blacklistedPermission) =>
-        permissionsToCheck.includes(blacklistedPermission as AccountAdmin) // some of the account admin in the blacklist have not been added yet
+        permissionsToCheck.includes(
+          blacklistedPermission as AllowedPermissionsFor<A>
+        ) // some of the account admin in the blacklist have not been added yet
     ) === false;
   const useLAPermissions = isIAMEnabled && !isIAMBeta;
   const shouldUsePermissionMap = useBetaPermissions || useLAPermissions;
 
-  const { data: grants } = useGrants(
+  const { data: grants, isLoading: isGrantsLoading } = useGrants(
     (!isIAMEnabled || !shouldUsePermissionMap) && enabled
   );
 
-  const { data: userAccountPermissions, ...restAccountPermissions } =
-    useUserAccountPermissions(
-      shouldUsePermissionMap && accessType === 'account' && enabled
-    );
+  const {
+    data: userAccountPermissions,
+    isLoading: isUserAccountPermissionsLoading,
+    ...restAccountPermissions
+  } = useUserAccountPermissions(
+    shouldUsePermissionMap && accessType === 'account' && enabled
+  );
 
-  const { data: userEntityPermissions, ...restEntityPermissions } =
-    useUserEntityPermissions(
-      accessType,
-      _entityId!,
-      shouldUsePermissionMap && enabled
-    );
+  const {
+    data: userEntityPermissions,
+    isLoading: isUserEntityPermissionsLoading,
+    ...restEntityPermissions
+  } = useUserEntityPermissions(
+    accessType,
+    _entityId!,
+    shouldUsePermissionMap && enabled
+  );
 
   const usersPermissions =
     accessType === 'account' ? userAccountPermissions : userEntityPermissions;
@@ -110,10 +230,13 @@ export const usePermissions = <T extends readonly PermissionType[]>(
 
   return {
     data: permissionMap,
+    isLoading: shouldUsePermissionMap
+      ? isUserAccountPermissionsLoading || isUserEntityPermissionsLoading
+      : isGrantsLoading,
     ...restAccountPermissions,
     ...restEntityPermissions,
   } as const;
-};
+}
 
 export type EntityBase = Pick<AccountEntity, 'id' | 'label'>;
 
@@ -169,17 +292,41 @@ export const useQueryWithPermissions = <T extends EntityBase>(
     ...restQueryResult
   } = useQueryResult;
   const { data: profile } = useProfile();
-  const { isIAMEnabled } = useIsIAMEnabled();
+  const { isIAMBeta, isIAMEnabled } = useIsIAMEnabled();
+
+  const accessType = entityType;
+
+  /**
+   * Apply the same Beta/LA permission logic as usePermissions.
+   * - Use Beta Permissions if:
+   *   - The feature is beta
+   *   - The access type is in the BETA_ACCESS_TYPE_SCOPE
+   *   - The account permission is not in the LA_ACCOUNT_ADMIN_PERMISSIONS_TO_EXCLUDE
+   * - Use LA Permissions if:
+   *   - The feature is not beta
+   */
+  const useBetaPermissions =
+    isIAMEnabled &&
+    isIAMBeta &&
+    BETA_ACCESS_TYPE_SCOPE.includes(accessType) &&
+    LA_ACCOUNT_ADMIN_PERMISSIONS_TO_EXCLUDE.some((blacklistedPermission) =>
+      permissionsToCheck.includes(blacklistedPermission as AccountAdmin)
+    ) === false;
+  const useLAPermissions = isIAMEnabled && !isIAMBeta;
+  const shouldUsePermissionMap = useBetaPermissions || useLAPermissions;
+
   const { data: entityPermissions, isLoading: areEntityPermissionsLoading } =
     useEntitiesPermissions<T>(
       allEntities,
       entityType,
       profile,
-      isIAMEnabled && enabled
+      shouldUsePermissionMap && enabled
     );
-  const { data: grants } = useGrants(!isIAMEnabled);
+  const { data: grants } = useGrants(
+    (!isIAMEnabled || !shouldUsePermissionMap) && enabled
+  );
 
-  const entityPermissionsMap = isIAMEnabled
+  const entityPermissionsMap = shouldUsePermissionMap
     ? toEntityPermissionMap(
         allEntities,
         entityPermissions,
diff --git a/packages/manager/src/features/IAM/hooks/useQueryWithPermissions.test.ts b/packages/manager/src/features/IAM/hooks/useQueryWithPermissions.test.ts
new file mode 100644
index 00000000000..1ecd51aab28
--- /dev/null
+++ b/packages/manager/src/features/IAM/hooks/useQueryWithPermissions.test.ts
@@ -0,0 +1,267 @@
+import { renderHook } from '@testing-library/react';
+
+import { wrapWithTheme } from 'src/utilities/testHelpers';
+
+import { useQueryWithPermissions } from './usePermissions';
+
+import type { EntityBase } from './usePermissions';
+import type { APIError, PermissionType } from '@linode/api-v4';
+import type { UseQueryResult } from '@tanstack/react-query';
+
+type Entity = { id: number; label: string };
+
+const queryMocks = vi.hoisted(() => {
+  let entitiesPermsLoading = false;
+
+  return {
+    useIsIAMEnabled: vi
+      .fn()
+      .mockReturnValue({ isIAMEnabled: true, isIAMBeta: true }),
+    useGrants: vi.fn().mockReturnValue({ data: null }),
+    useProfile: vi
+      .fn()
+      .mockReturnValue({ data: { username: 'user-1', restricted: true } }),
+    useQueries: Object.assign(
+      vi.fn().mockImplementation(({ queries }) =>
+        (queries || []).map(() => ({
+          data: null,
+          error: null,
+          isError: false,
+          isLoading: entitiesPermsLoading,
+        }))
+      ),
+      {
+        setEntitiesPermsLoading: (b: boolean) => {
+          entitiesPermsLoading = b;
+        },
+      }
+    ),
+  };
+});
+
+vi.mock(import('@linode/queries'), async (importOriginal) => {
+  const actual = await importOriginal();
+
+  return {
+    ...actual,
+    useGrants: queryMocks.useGrants,
+    useProfile: queryMocks.useProfile,
+    useQueries: queryMocks.useQueries,
+  };
+});
+
+vi.mock('src/features/IAM/hooks/useIsIAMEnabled', async () => {
+  const actual = await vi.importActual(
+    'src/features/IAM/hooks/useIsIAMEnabled'
+  );
+
+  return {
+    ...actual,
+    useIsIAMEnabled: queryMocks.useIsIAMEnabled,
+  };
+});
+
+vi.mock('./adapters/permissionAdapters', () => ({
+  toEntityPermissionMap: vi.fn(
+    (entities: EntityBase[] = [], entitiesPermissions: PermissionType[]) => {
+      const map: Record<number, Record<string, boolean>> = {};
+      entities.forEach((e) => {
+        map[e.id] = entitiesPermissions?.reduce<Record<string, boolean>>(
+          (acc, p) => {
+            acc[p] = e.id === 1;
+            return acc;
+          },
+          {}
+        );
+      });
+
+      return map;
+    }
+  ),
+  entityPermissionMapFrom: vi.fn(() => {
+    return {
+      1: { update_linode: true, resize_volume: true, create_volume: true },
+      2: { update_linode: true, resize_volume: true, create_volume: true },
+    };
+  }),
+}));
+
+describe('useQueryWithPermissions', () => {
+  const entities: Entity[] = [
+    { id: 1, label: 'one' },
+    { id: 2, label: 'two' },
+  ];
+
+  const baseQueryResult = {
+    data: entities,
+    error: null,
+    isError: false,
+    isLoading: false,
+  } as UseQueryResult<Entity[], APIError[]>;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    queryMocks.useQueries.setEntitiesPermsLoading(false);
+  });
+
+  it('uses Beta permissions when IAM enabled + beta true + in scope; filters restricted entities', () => {
+    const flags = { iam: { beta: true, enabled: true } };
+    queryMocks.useIsIAMEnabled.mockReturnValue({
+      isIAMEnabled: true,
+      isIAMBeta: true,
+    });
+    queryMocks.useProfile.mockReturnValue({
+      data: { username: 'user-1', restricted: true },
+    });
+
+    const { result } = renderHook(
+      () =>
+        useQueryWithPermissions(
+          baseQueryResult,
+          'linode',
+          ['update_linode'],
+          true
+        ),
+      { wrapper: (ui) => wrapWithTheme(ui, { flags }) }
+    );
+
+    expect(queryMocks.useGrants).toHaveBeenCalledWith(false);
+
+    const calls = queryMocks.useQueries.mock.calls;
+    expect(calls.length).toBeGreaterThan(0);
+    const queryArgs = calls[0][0];
+    expect(
+      queryArgs.queries.every((q: { enabled?: boolean }) => q.enabled === true)
+    ).toBe(true);
+
+    expect(result.current.data.map((e) => e.id)).toEqual([]);
+    expect(result.current.hasFiltered).toBe(true);
+    expect(result.current.isLoading).toBe(false);
+  });
+
+  it('falls back to grants when IAM disabled', () => {
+    const flags = { iam: { beta: false, enabled: false } };
+    queryMocks.useIsIAMEnabled.mockReturnValue({
+      isIAMEnabled: false,
+      isIAMBeta: false,
+    });
+
+    const { result } = renderHook(
+      () =>
+        useQueryWithPermissions(
+          baseQueryResult,
+          'linode',
+          ['update_linode'],
+          true
+        ),
+      { wrapper: (ui) => wrapWithTheme(ui, { flags }) }
+    );
+
+    expect(queryMocks.useGrants).toHaveBeenCalledWith(true);
+
+    const queryArgs = queryMocks.useQueries.mock.calls[0][0];
+    expect(
+      queryArgs.queries.every((q: { enabled?: boolean }) => q.enabled === false)
+    ).toBe(true);
+
+    expect(result.current.data.map((e) => e.id)).toEqual([1, 2]);
+    expect(result.current.hasFiltered).toBe(false);
+  });
+
+  it('falls back to grants when Beta true but entityType not in scope', () => {
+    const flags = { iam: { beta: true, enabled: true } };
+    queryMocks.useIsIAMEnabled.mockReturnValue({
+      isIAMEnabled: true,
+      isIAMBeta: true,
+    });
+
+    renderHook(
+      () =>
+        useQueryWithPermissions(
+          baseQueryResult,
+          'volume',
+          ['resize_volume'],
+          true
+        ),
+      { wrapper: (ui) => wrapWithTheme(ui, { flags }) }
+    );
+
+    expect(queryMocks.useGrants).toHaveBeenCalledWith(true);
+    const qArg = queryMocks.useQueries.mock.calls[0][0];
+    expect(
+      qArg.queries.every((q: { enabled?: boolean }) => q.enabled === false)
+    ).toBe(true);
+  });
+
+  it('falls back to grants when Beta true but permission is in the LA exclusion list', () => {
+    const flags = { iam: { beta: true, enabled: true } };
+    queryMocks.useIsIAMEnabled.mockReturnValue({
+      isIAMEnabled: true,
+      isIAMBeta: true,
+    });
+
+    renderHook(
+      () =>
+        useQueryWithPermissions(
+          baseQueryResult,
+          'volume',
+          ['create_volume'], // blacklisted
+          true
+        ),
+      { wrapper: (ui) => wrapWithTheme(ui, { flags }) }
+    );
+
+    expect(queryMocks.useGrants).toHaveBeenCalledWith(true);
+    const queryArgs = queryMocks.useQueries.mock.calls[0][0];
+    expect(
+      queryArgs.queries.every((q: { enabled?: boolean }) => q.enabled === false)
+    ).toBe(true);
+  });
+
+  it('uses LA permissions when IAM enabled + beta false', () => {
+    const flags = { iam: { beta: false, enabled: true } };
+    queryMocks.useIsIAMEnabled.mockReturnValue({
+      isIAMEnabled: true,
+      isIAMBeta: false,
+    });
+
+    renderHook(
+      () =>
+        useQueryWithPermissions(
+          baseQueryResult,
+          'linode',
+          ['update_linode'],
+          true
+        ),
+      { wrapper: (ui) => wrapWithTheme(ui, { flags }) }
+    );
+
+    expect(queryMocks.useGrants).toHaveBeenCalledWith(false);
+    const queryArgs = queryMocks.useQueries.mock.calls[0][0];
+    expect(
+      queryArgs.queries.every((q: { enabled?: boolean }) => q.enabled === true)
+    ).toBe(true);
+  });
+
+  it('marks loading when entity permissions queries are loading', () => {
+    const flags = { iam: { beta: true, enabled: true } };
+    queryMocks.useIsIAMEnabled.mockReturnValue({
+      isIAMEnabled: true,
+      isIAMBeta: true,
+    });
+    queryMocks.useQueries.setEntitiesPermsLoading(true);
+
+    const { result } = renderHook(
+      () =>
+        useQueryWithPermissions(
+          baseQueryResult,
+          'linode',
+          ['update_linode'],
+          true
+        ),
+      { wrapper: (ui) => wrapWithTheme(ui, { flags }) }
+    );
+
+    expect(result.current.isLoading).toBe(true);
+  });
+});
diff --git a/packages/manager/src/features/Images/ImagesLanding/DeleteImageDialog.test.tsx b/packages/manager/src/features/Images/ImagesLanding/DeleteImageDialog.test.tsx
new file mode 100644
index 00000000000..5b1eb1e239e
--- /dev/null
+++ b/packages/manager/src/features/Images/ImagesLanding/DeleteImageDialog.test.tsx
@@ -0,0 +1,59 @@
+import * as React from 'react';
+
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+import { DeleteImageDialog } from './DeleteImageDialog';
+
+const queryMocks = vi.hoisted(() => ({
+  userPermissions: vi.fn(() => ({
+    data: {
+      delete_image: true,
+    },
+  })),
+}));
+vi.mock('src/features/IAM/hooks/usePermissions', () => ({
+  usePermissions: queryMocks.userPermissions,
+}));
+
+describe('Image Delete Dialog', () => {
+  const props = {
+    imageId: '1',
+    onClose: vi.fn(),
+    open: true,
+  };
+
+  it('renders a Image delete dialog correctly', async () => {
+    const { findByText } = renderWithTheme(<DeleteImageDialog {...props} />);
+    const cancelButton = await findByText('Cancel');
+    expect(cancelButton).toBeVisible();
+
+    const deleteButton = await findByText('Delete');
+    expect(deleteButton).toBeVisible();
+  });
+
+  it('disables the Image Label input when user does not have permission', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        delete_image: false,
+      },
+    });
+    const { findByLabelText } = renderWithTheme(
+      <DeleteImageDialog {...props} />
+    );
+    const imageLabelInput = await findByLabelText('Image Label');
+    expect(imageLabelInput).toBeDisabled();
+  });
+
+  it('enables the Image Label input when user has permission', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        delete_image: true,
+      },
+    });
+    const { findByLabelText } = renderWithTheme(
+      <DeleteImageDialog {...props} />
+    );
+    const imageLabelInput = await findByLabelText('Image Label');
+    expect(imageLabelInput).not.toBeDisabled();
+  });
+});
diff --git a/packages/manager/src/features/Images/ImagesLanding/DeleteImageDialog.tsx b/packages/manager/src/features/Images/ImagesLanding/DeleteImageDialog.tsx
index ca9c62d65dd..81d75be076c 100644
--- a/packages/manager/src/features/Images/ImagesLanding/DeleteImageDialog.tsx
+++ b/packages/manager/src/features/Images/ImagesLanding/DeleteImageDialog.tsx
@@ -1,8 +1,11 @@
 import { useDeleteImageMutation, useImageQuery } from '@linode/queries';
+import { Notice } from '@linode/ui';
 import { useSnackbar } from 'notistack';
 import React from 'react';
 
 import { TypeToConfirmDialog } from 'src/components/TypeToConfirmDialog/TypeToConfirmDialog';
+import { getRestrictedResourceText } from 'src/features/Account/utils';
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 
 interface Props {
   imageId: string | undefined;
@@ -20,6 +23,13 @@ export const DeleteImageDialog = (props: Props) => {
     error,
   } = useImageQuery(imageId ?? '', Boolean(imageId));
 
+  const { data: permissions } = usePermissions(
+    'image',
+    ['delete_image'],
+    imageId,
+    open
+  );
+
   const { mutate: deleteImage, isPending } = useDeleteImageMutation({
     onSuccess() {
       enqueueSnackbar('Image has been scheduled for deletion.', {
@@ -33,6 +43,7 @@ export const DeleteImageDialog = (props: Props) => {
 
   return (
     <TypeToConfirmDialog
+      disableTypeToConfirmInput={!permissions.delete_image}
       entity={{
         type: 'Image',
         primaryBtnText: isPendingUpload ? 'Cancel Upload' : 'Delete',
@@ -54,6 +65,16 @@ export const DeleteImageDialog = (props: Props) => {
           ? 'Cancel Upload'
           : `Delete Image ${image?.label ?? imageId}`
       }
-    />
+    >
+      {!permissions.delete_image && (
+        <Notice
+          text={getRestrictedResourceText({
+            resourceType: 'Images',
+            action: 'delete',
+          })}
+          variant="error"
+        />
+      )}
+    </TypeToConfirmDialog>
   );
 };
diff --git a/packages/manager/src/features/Images/ImagesLanding/ImageRegions/ImageRegionRow.tsx b/packages/manager/src/features/Images/ImagesLanding/ImageRegions/ImageRegionRow.tsx
index 0a54391d56c..47db741acb6 100644
--- a/packages/manager/src/features/Images/ImagesLanding/ImageRegions/ImageRegionRow.tsx
+++ b/packages/manager/src/features/Images/ImagesLanding/ImageRegions/ImageRegionRow.tsx
@@ -11,6 +11,7 @@ import React from 'react';
 
 import { Flag } from 'src/components/Flag';
 import { StatusIcon } from 'src/components/StatusIcon/StatusIcon';
+import { getRestrictedResourceText } from 'src/features/Account/utils';
 
 import type { ImageRegionStatus, ImageStatus } from '@linode/api-v4';
 import type { Status } from 'src/components/StatusIcon/StatusIcon';
@@ -18,6 +19,7 @@ import type { Status } from 'src/components/StatusIcon/StatusIcon';
 type ExtendedImageRegionStatus = 'unsaved' | ImageRegionStatus;
 
 interface Props {
+  disabled?: boolean;
   disableRemoveButton?: boolean;
   onRemove: () => void;
   region: string;
@@ -25,12 +27,21 @@ interface Props {
 }
 
 export const ImageRegionRow = (props: Props) => {
-  const { disableRemoveButton, onRemove, region, status } = props;
+  const { disableRemoveButton, onRemove, region, status, disabled } = props;
 
   const { data: regions } = useRegionsQuery();
 
   const actualRegion = regions?.find((r) => r.id === region);
 
+  const tooltipTextPerPermission = getRestrictedResourceText({
+    action: 'edit',
+    isSingular: true,
+    resourceType: 'Images',
+  });
+
+  const tooltipTextPerRegion =
+    'You cannot remove this region because at least one available region must be present.';
+
   return (
     <Box alignItems="center" display="flex" justifyContent="space-between">
       <Stack alignItems="center" direction="row" gap={1}>
@@ -42,15 +53,17 @@ export const ImageRegionRow = (props: Props) => {
         <StatusIcon status={imageStatusIconMap[status]} />
         <Tooltip
           title={
-            disableRemoveButton
-              ? 'You cannot remove this region because at least one available region must be present.'
-              : ''
+            disabled
+              ? tooltipTextPerPermission
+              : disableRemoveButton
+                ? tooltipTextPerRegion
+                : undefined
           }
         >
           <span>
             <IconButton
               aria-label={`Remove ${region}`}
-              disabled={disableRemoveButton}
+              disabled={disabled || disableRemoveButton}
               onClick={onRemove}
               sx={{ p: 0.75 }}
             >
diff --git a/packages/manager/src/features/Images/ImagesLanding/ImageRegions/ManageImageRegionsForm.test.tsx b/packages/manager/src/features/Images/ImagesLanding/ImageRegions/ManageImageRegionsForm.test.tsx
index 64b6f84d751..d58166ac336 100644
--- a/packages/manager/src/features/Images/ImagesLanding/ImageRegions/ManageImageRegionsForm.test.tsx
+++ b/packages/manager/src/features/Images/ImagesLanding/ImageRegions/ManageImageRegionsForm.test.tsx
@@ -9,6 +9,18 @@ import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { ManageImageReplicasForm } from './ManageImageRegionsForm';
 
+const queryMocks = vi.hoisted(() => ({
+  userPermissions: vi.fn(() => ({
+    data: {
+      replicate_image: true,
+    },
+  })),
+}));
+
+vi.mock('src/features/IAM/hooks/usePermissions', () => ({
+  usePermissions: queryMocks.userPermissions,
+}));
+
 describe('ManageImageRegionsDrawer', () => {
   it('should render a save button and a cancel button', () => {
     const image = imageFactory.build();
@@ -160,4 +172,29 @@ describe('ManageImageRegionsDrawer', () => {
       )
     ).toBeInTheDocument();
   });
+
+  it('should enable the region select if the user has permissions', async () => {
+    const image = imageFactory.build();
+    const { getByRole } = renderWithTheme(
+      <ManageImageReplicasForm image={image} onClose={vi.fn()} />
+    );
+    const select = getByRole('combobox');
+    expect(select).toBeInTheDocument();
+    expect(select).toBeEnabled();
+  });
+
+  it('should disable the region select if the user has no permissions', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        replicate_image: false,
+      },
+    });
+    const image = imageFactory.build();
+    const { getByRole } = renderWithTheme(
+      <ManageImageReplicasForm image={image} onClose={vi.fn()} />
+    );
+    const select = getByRole('combobox');
+    expect(select).toBeInTheDocument();
+    expect(select).toBeDisabled();
+  });
 });
diff --git a/packages/manager/src/features/Images/ImagesLanding/ImageRegions/ManageImageRegionsForm.tsx b/packages/manager/src/features/Images/ImagesLanding/ImageRegions/ManageImageRegionsForm.tsx
index 60d1788d500..81646271ae6 100644
--- a/packages/manager/src/features/Images/ImagesLanding/ImageRegions/ManageImageRegionsForm.tsx
+++ b/packages/manager/src/features/Images/ImagesLanding/ImageRegions/ManageImageRegionsForm.tsx
@@ -8,6 +8,8 @@ import type { Resolver } from 'react-hook-form';
 
 import { Link } from 'src/components/Link';
 import { RegionMultiSelect } from 'src/components/RegionSelect/RegionMultiSelect';
+import { getRestrictedResourceText } from 'src/features/Account/utils';
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 import { useFlags } from 'src/hooks/useFlags';
 
 import { useRegionsThatSupportImageStorage } from '../../utils';
@@ -45,6 +47,12 @@ export const ManageImageReplicasForm = (props: Props) => {
   const { regions } = useRegionsThatSupportImageStorage();
   const { mutateAsync } = useUpdateImageRegionsMutation(image?.id ?? '');
 
+  const { data: permissions } = usePermissions(
+    'image',
+    ['replicate_image'],
+    image?.id
+  );
+
   const {
     formState: { errors, isDirty, isSubmitting },
     handleSubmit,
@@ -103,6 +111,14 @@ export const ManageImageReplicasForm = (props: Props) => {
 
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
+      {!permissions.replicate_image && (
+        <Notice
+          text={getRestrictedResourceText({
+            resourceType: 'Images',
+          })}
+          variant="error"
+        />
+      )}
       {errors.root?.message && (
         <Notice text={errors.root.message} variant="error" />
       )}
@@ -127,6 +143,7 @@ export const ManageImageReplicasForm = (props: Props) => {
       </Notice>
       <RegionMultiSelect
         currentCapability={undefined} // Images don't have a region capability yet
+        disabled={!permissions.replicate_image}
         disabledRegions={disabledRegions}
         errorText={errors.regions?.message}
         isGeckoLAEnabled={isGeckoLAEnabled}
@@ -147,7 +164,9 @@ export const ManageImageReplicasForm = (props: Props) => {
       </Typography>
       <Paper
         sx={(theme) => ({
-          backgroundColor: theme.palette.background.paper,
+          backgroundColor: !permissions.replicate_image
+            ? theme.tokens.alias.Interaction.Background.Disabled
+            : theme.palette.background.paper,
           p: 2,
           py: 1,
         })}
@@ -173,6 +192,7 @@ export const ManageImageReplicasForm = (props: Props) => {
 
             return (
               <ImageRegionRow
+                disabled={!permissions.replicate_image}
                 disableRemoveButton={isLastAvailableRegion}
                 key={regionId}
                 onRemove={() =>
@@ -191,7 +211,7 @@ export const ManageImageReplicasForm = (props: Props) => {
       </Paper>
       <ActionsPanel
         primaryButtonProps={{
-          disabled: !isDirty,
+          disabled: !isDirty || !permissions.replicate_image,
           label: 'Save',
           loading: isSubmitting,
           type: 'submit',
diff --git a/packages/manager/src/features/Kubernetes/ClusterList/ClusterChips.test.tsx b/packages/manager/src/features/Kubernetes/ClusterList/ClusterChips.test.tsx
index bbfb210e005..5df2c8d38c0 100644
--- a/packages/manager/src/features/Kubernetes/ClusterList/ClusterChips.test.tsx
+++ b/packages/manager/src/features/Kubernetes/ClusterList/ClusterChips.test.tsx
@@ -73,32 +73,6 @@ describe('Kubernetes cluster action menu', () => {
     expect(getByText('ENTERPRISE')).toBeVisible();
   });
 
-  it('does not render an enterprise chip for an enterprise cluster if the feature is disabled', async () => {
-    queryMocks.useAccount.mockReturnValue({
-      data: {
-        capabilities: ['Kubernetes Enterprise'],
-      },
-    });
-
-    const { getByText, queryByText } = renderWithTheme(
-      <ClusterChips cluster={mockEnterpriseCluster} />,
-      {
-        flags: {
-          lkeEnterprise2: {
-            enabled: false,
-            ga: false,
-            la: true,
-            phase2Mtc: { byoVPC: false, dualStack: false },
-            postLa: false,
-          },
-        },
-      }
-    );
-
-    expect(getByText('HA', { exact: false })).toBeVisible();
-    expect(queryByText('ENTERPRISE')).toBe(null);
-  });
-
   it('does not render an enterprise chip for a standard cluster', async () => {
     queryMocks.useAccount.mockReturnValue({
       data: {
diff --git a/packages/manager/src/features/Kubernetes/ClusterList/ClusterChips.tsx b/packages/manager/src/features/Kubernetes/ClusterList/ClusterChips.tsx
index 1db03d6f60d..4db9b53b148 100644
--- a/packages/manager/src/features/Kubernetes/ClusterList/ClusterChips.tsx
+++ b/packages/manager/src/features/Kubernetes/ClusterList/ClusterChips.tsx
@@ -2,8 +2,6 @@ import { Chip, Stack } from '@linode/ui';
 import { useLocation } from '@tanstack/react-router';
 import React from 'react';
 
-import { useIsLkeEnterpriseEnabled } from '../kubeUtils';
-
 import type { KubernetesCluster } from '@linode/api-v4';
 import type { SxProps, Theme } from '@mui/material';
 
@@ -14,13 +12,12 @@ interface Props {
 
 export const ClusterChips = (props: Props) => {
   const { cluster, sx } = props;
-  const { isLkeEnterpriseLAFeatureEnabled } = useIsLkeEnterpriseEnabled();
 
   const location = useLocation({ select: (location) => location.pathname });
 
   return (
     <Stack columnGap={0.5} flexDirection="row" sx={sx}>
-      {isLkeEnterpriseLAFeatureEnabled && cluster?.tier === 'enterprise' && (
+      {cluster?.tier === 'enterprise' && (
         <Chip
           data-testid="lke-e-chip"
           label="ENTERPRISE"
diff --git a/packages/manager/src/features/Kubernetes/ClusterList/KubernetesClusterRow.tsx b/packages/manager/src/features/Kubernetes/ClusterList/KubernetesClusterRow.tsx
index 4b6f1d51ff8..a1ed422acb7 100644
--- a/packages/manager/src/features/Kubernetes/ClusterList/KubernetesClusterRow.tsx
+++ b/packages/manager/src/features/Kubernetes/ClusterList/KubernetesClusterRow.tsx
@@ -8,13 +8,15 @@ import { Link } from 'src/components/Link';
 import { TableCell } from 'src/components/TableCell';
 import { TableRow } from 'src/components/TableRow';
 import { useIsResourceRestricted } from 'src/hooks/useIsResourceRestricted';
-import { useAllKubernetesNodePoolQuery } from 'src/queries/kubernetes';
+import {
+  useAllKubernetesNodePoolQuery,
+  useKubernetesTieredVersionsQuery,
+} from 'src/queries/kubernetes';
 import { extendTypesQueryResult } from 'src/utilities/extendType';
 
 import {
   getNextVersion,
   getTotalClusterMemoryCPUAndStorage,
-  useLkeStandardOrEnterpriseVersions,
 } from '../kubeUtils';
 import { ClusterActionMenu } from './ClusterActionMenu';
 import { ClusterChips } from './ClusterChips';
@@ -41,8 +43,8 @@ export const KubernetesClusterRow = (props: Props) => {
 
   const region = regions?.find((r) => r.id === cluster.region);
 
-  const { versions } = useLkeStandardOrEnterpriseVersions(
-    cluster.tier ?? 'standard' // TODO LKE: remove fallback once LKE-E is in GA and tier is required
+  const { data: versions } = useKubernetesTieredVersionsQuery(
+    cluster?.tier ?? 'standard'
   );
 
   const isLKEClusterReadOnly = useIsResourceRestricted({
diff --git a/packages/manager/src/features/Kubernetes/CreateCluster/CreateCluster.tsx b/packages/manager/src/features/Kubernetes/CreateCluster/CreateCluster.tsx
index c4d29857c01..38d53a50da7 100644
--- a/packages/manager/src/features/Kubernetes/CreateCluster/CreateCluster.tsx
+++ b/packages/manager/src/features/Kubernetes/CreateCluster/CreateCluster.tsx
@@ -38,14 +38,12 @@ import {
   getLatestVersion,
   useAPLAvailability,
   useIsLkeEnterpriseEnabled,
-  useKubernetesBetaEndpoint,
-  useLkeStandardOrEnterpriseVersions,
 } from 'src/features/Kubernetes/kubeUtils';
 import { useFlags } from 'src/hooks/useFlags';
 import { useRestrictedGlobalGrantCheck } from 'src/hooks/useRestrictedGlobalGrantCheck';
 import {
-  useCreateKubernetesClusterBetaMutation,
   useCreateKubernetesClusterMutation,
+  useKubernetesTieredVersionsQuery,
   useKubernetesTypesQuery,
 } from 'src/queries/kubernetes';
 import { getAPIErrorOrDefault, getErrorMap } from 'src/utilities/errorUtils';
@@ -126,7 +124,6 @@ export const CreateCluster = () => {
   const { data, error: regionsError } = useRegionsQuery();
   const regionsData = data ?? [];
   const { showAPL } = useAPLAvailability();
-  const { isUsingBetaEndpoint } = useKubernetesBetaEndpoint();
   const [ipV4Addr, setIPv4Addr] = React.useState<ExtendedIP[]>([
     stringToExtendedIP(''),
   ]);
@@ -174,7 +171,7 @@ export const CreateCluster = () => {
     data: kubernetesHighAvailabilityTypesData,
     isError: isErrorKubernetesTypes,
     isLoading: isLoadingKubernetesTypes,
-  } = useKubernetesTypesQuery(selectedTier === 'enterprise');
+  } = useKubernetesTypesQuery();
 
   // LKE-E does not support APL at this time.
   const isAPLSupported = showAPL && selectedTier === 'standard';
@@ -200,7 +197,10 @@ export const CreateCluster = () => {
       setErrors(undefined);
     }
 
-    // If a user adds > 100 nodes in the LKE-E flow but then switches to LKE, set the max node count to 100 for correct price display
+    // If a user configures node pools in the LKE-E flow, but then switches to LKE, reset configurations that are incompatible with LKE-E:
+    // - If a user added > 100 nodes, set the max node count to 100 for correct price display.
+    // - Clear the firewall selection.
+    // - Clear the update strategy selection.
     if (isLkeEnterpriseLAFeatureEnabled) {
       nodePools.forEach((nodePool, idx) =>
         update(idx, {
@@ -211,6 +211,8 @@ export const CreateCluster = () => {
               ? MAX_NODES_PER_POOL_ENTERPRISE_TIER
               : MAX_NODES_PER_POOL_STANDARD_TIER
           ),
+          firewall_id: undefined,
+          update_strategy: undefined,
         })
       );
     }
@@ -240,14 +242,11 @@ export const CreateCluster = () => {
   const { mutateAsync: createKubernetesCluster } =
     useCreateKubernetesClusterMutation();
 
-  const { mutateAsync: createKubernetesClusterBeta } =
-    useCreateKubernetesClusterBetaMutation();
-
   const {
-    isLoadingVersions,
-    versions: versionData,
-    versionsError,
-  } = useLkeStandardOrEnterpriseVersions(selectedTier);
+    data: versionData,
+    isLoading: isLoadingVersions,
+    error: versionsError,
+  } = useKubernetesTieredVersionsQuery(selectedTier);
 
   const versions = (versionData ?? []).map((thisVersion) => ({
     label: thisVersion.id,
@@ -349,10 +348,6 @@ export const CreateCluster = () => {
       };
     }
 
-    const createClusterFn = isUsingBetaEndpoint
-      ? createKubernetesClusterBeta
-      : createKubernetesCluster;
-
     // TODO: Improve error handling in M3-10429, at which point we shouldn't need this.
     if (
       (isLkeEnterprisePostLAFeatureEnabled ||
@@ -384,7 +379,7 @@ export const CreateCluster = () => {
       }
     }
 
-    createClusterFn(payload)
+    createKubernetesCluster(payload)
       .then((cluster) => {
         navigate({
           to: '/kubernetes/clusters/$clusterId/summary',
diff --git a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeClusterSpecs.tsx b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeClusterSpecs.tsx
index a16934dc5fb..e6aa6472671 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeClusterSpecs.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeClusterSpecs.tsx
@@ -67,7 +67,7 @@ export const KubeClusterSpecs = React.memo((props: Props) => {
     data: kubernetesHighAvailabilityTypesData,
     isError: isErrorKubernetesTypes,
     isLoading: isLoadingKubernetesTypes,
-  } = useKubernetesTypesQuery(cluster.tier === 'enterprise');
+  } = useKubernetesTypesQuery();
 
   const matchesColGapBreakpointDown = useMediaQuery(
     theme.breakpoints.down(theme.breakpoints.values.lg)
diff --git a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubernetesClusterDetail.tsx b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubernetesClusterDetail.tsx
index 286b79dfb09..43f5ed395bc 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubernetesClusterDetail.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubernetesClusterDetail.tsx
@@ -6,10 +6,7 @@ import * as React from 'react';
 import { DocumentTitleSegment } from 'src/components/DocumentTitle';
 import { LandingHeader } from 'src/components/LandingHeader';
 import { getRestrictedResourceText } from 'src/features/Account/utils';
-import {
-  useAPLAvailability,
-  useKubernetesBetaEndpoint,
-} from 'src/features/Kubernetes/kubeUtils';
+import { useAPLAvailability } from 'src/features/Kubernetes/kubeUtils';
 import { getKubeHighAvailability } from 'src/features/Kubernetes/kubeUtils';
 import { useIsResourceRestricted } from 'src/hooks/useIsResourceRestricted';
 import {
@@ -31,7 +28,6 @@ export const KubernetesClusterDetail = () => {
   });
   const location = useLocation();
   const { showAPL } = useAPLAvailability();
-  const { isUsingBetaEndpoint } = useKubernetesBetaEndpoint();
 
   const {
     data: cluster,
@@ -39,7 +35,6 @@ export const KubernetesClusterDetail = () => {
     isLoading,
   } = useKubernetesClusterQuery({
     id,
-    isUsingBetaEndpoint,
   });
 
   const { mutateAsync: updateKubernetesCluster } =
diff --git a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/UpgradeKubernetesVersionBanner.tsx b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/UpgradeKubernetesVersionBanner.tsx
index dc244366905..6318e4e088d 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/UpgradeKubernetesVersionBanner.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/UpgradeKubernetesVersionBanner.tsx
@@ -2,11 +2,9 @@ import { Button, Typography } from '@linode/ui';
 import * as React from 'react';
 
 import { DismissibleBanner } from 'src/components/DismissibleBanner/DismissibleBanner';
+import { useKubernetesTieredVersionsQuery } from 'src/queries/kubernetes';
 
-import {
-  getNextVersion,
-  useLkeStandardOrEnterpriseVersions,
-} from '../kubeUtils';
+import { getNextVersion } from '../kubeUtils';
 import UpgradeVersionModal from '../UpgradeVersionModal';
 
 import type { KubernetesTier } from '@linode/api-v4';
@@ -20,7 +18,7 @@ interface Props {
 export const UpgradeKubernetesVersionBanner = (props: Props) => {
   const { clusterID, clusterTier, currentVersion } = props;
 
-  const { versions } = useLkeStandardOrEnterpriseVersions(clusterTier);
+  const { data: versions } = useKubernetesTieredVersionsQuery(clusterTier);
   const nextVersion = getNextVersion(currentVersion, versions ?? []);
 
   const [dialogOpen, setDialogOpen] = React.useState(false);
diff --git a/packages/manager/src/features/Kubernetes/KubernetesLanding/KubernetesLanding.tsx b/packages/manager/src/features/Kubernetes/KubernetesLanding/KubernetesLanding.tsx
index 3f54f63deb5..7480e68cc4e 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesLanding/KubernetesLanding.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesLanding/KubernetesLanding.tsx
@@ -28,7 +28,6 @@ import { getErrorStringOrDefault } from 'src/utilities/errorUtils';
 
 import { KubernetesClusterRow } from '../ClusterList/KubernetesClusterRow';
 import { DeleteKubernetesClusterDialog } from '../KubernetesClusterDetail/DeleteKubernetesClusterDialog';
-import { useKubernetesBetaEndpoint } from '../kubeUtils';
 import UpgradeVersionModal from '../UpgradeVersionModal';
 import { KubernetesEmptyState } from './KubernetesLandingEmptyState';
 
@@ -95,10 +94,8 @@ export const KubernetesLanding = () => {
     globalGrantType: 'add_lkes',
   });
 
-  const { isUsingBetaEndpoint } = useKubernetesBetaEndpoint();
   const { data, error, isLoading } = useKubernetesClustersQuery({
     filter,
-    isUsingBetaEndpoint,
     params: {
       page: pagination.page,
       page_size: pagination.pageSize,
diff --git a/packages/manager/src/features/Kubernetes/UpgradeVersionModal.tsx b/packages/manager/src/features/Kubernetes/UpgradeVersionModal.tsx
index 83a602b02bd..116e0fdf721 100644
--- a/packages/manager/src/features/Kubernetes/UpgradeVersionModal.tsx
+++ b/packages/manager/src/features/Kubernetes/UpgradeVersionModal.tsx
@@ -5,14 +5,11 @@ import * as React from 'react';
 
 import { ConfirmationDialog } from 'src/components/ConfirmationDialog/ConfirmationDialog';
 import { Link } from 'src/components/Link';
-import {
-  getNextVersion,
-  useKubernetesBetaEndpoint,
-  useLkeStandardOrEnterpriseVersions,
-} from 'src/features/Kubernetes/kubeUtils';
+import { getNextVersion } from 'src/features/Kubernetes/kubeUtils';
 import {
   useKubernetesClusterMutation,
   useKubernetesClusterQuery,
+  useKubernetesTieredVersionsQuery,
 } from 'src/queries/kubernetes';
 
 import { LocalStorageWarningNotice } from './KubernetesClusterDetail/LocalStorageWarningNotice';
@@ -38,7 +35,8 @@ const getWorkerNodeCopy = (clusterTier: KubernetesTier = 'standard') => {
     </span>
   ) : (
     <span>
-      . Worker nodes within each node pool can then be upgraded separately.{' '}
+      . Existing worker nodes are updated automatically or manually, depending
+      on the update strategy defined for each node pool.{' '}
       <Link to="https://techdocs.akamai.com/cloud-computing/docs/upgrade-an-lke-enterprise-cluster-to-a-newer-kubernetes-version">
         Learn more
       </Link>
@@ -52,19 +50,16 @@ export const UpgradeDialog = (props: Props) => {
 
   const { enqueueSnackbar } = useSnackbar();
 
-  const { isUsingBetaEndpoint } = useKubernetesBetaEndpoint();
-
   const { data: cluster } = useKubernetesClusterQuery({
     id: clusterID,
-    isUsingBetaEndpoint,
   });
 
   const { mutateAsync: updateKubernetesCluster } =
     useKubernetesClusterMutation(clusterID);
 
-  const { versions } = useLkeStandardOrEnterpriseVersions(
+  const { data: versions } = useKubernetesTieredVersionsQuery(
     cluster?.tier ?? 'standard'
-  ); // TODO LKE: remove fallback once LKE-E is in GA and tier is required
+  );
 
   const nextVersion = getNextVersion(
     cluster?.k8s_version ?? '',
@@ -131,9 +126,7 @@ export const UpgradeDialog = (props: Props) => {
 
   const dialogTitle = shouldShowRecycleNodesStep
     ? 'Upgrade complete'
-    : `Upgrade Kubernetes version ${
-        nextVersion ? `to ${nextVersion}` : ''
-      } on ${cluster?.label}?`;
+    : `Upgrade Cluster ${cluster?.label} to ${nextVersion}`;
 
   const actions = (
     <ActionsPanel
diff --git a/packages/manager/src/features/Kubernetes/kubeUtils.test.ts b/packages/manager/src/features/Kubernetes/kubeUtils.test.ts
index 5c63de8b7ab..ae1512add65 100644
--- a/packages/manager/src/features/Kubernetes/kubeUtils.test.ts
+++ b/packages/manager/src/features/Kubernetes/kubeUtils.test.ts
@@ -1,12 +1,7 @@
 import { accountBetaFactory, linodeTypeFactory } from '@linode/utilities';
 import { renderHook } from '@testing-library/react';
 
-import {
-  kubeLinodeFactory,
-  kubernetesEnterpriseTierVersionFactory,
-  kubernetesVersionFactory,
-  nodePoolFactory,
-} from 'src/factories';
+import { kubeLinodeFactory, nodePoolFactory } from 'src/factories';
 import { extendType } from 'src/utilities/extendType';
 
 import {
@@ -16,7 +11,6 @@ import {
   getTotalClusterMemoryCPUAndStorage,
   useAPLAvailability,
   useIsLkeEnterpriseEnabled,
-  useLkeStandardOrEnterpriseVersions,
 } from './kubeUtils';
 
 import type {
@@ -24,16 +18,12 @@ import type {
   KubernetesVersion,
 } from '@linode/api-v4';
 
-const mockKubernetesVersions = kubernetesVersionFactory.buildList(1);
-const mockKubernetesEnterpriseVersions =
-  kubernetesEnterpriseTierVersionFactory.buildList(1);
-
 const queryMocks = vi.hoisted(() => ({
   useAccount: vi.fn().mockReturnValue({}),
+  useGrants: vi.fn().mockReturnValue({}),
   useAccountBetaQuery: vi.fn().mockReturnValue({}),
   useFlags: vi.fn().mockReturnValue({}),
   useKubernetesTieredVersionsQuery: vi.fn().mockReturnValue({}),
-  useKubernetesVersionQuery: vi.fn().mockReturnValue({}),
 }));
 
 vi.mock('@linode/queries', () => {
@@ -41,6 +31,7 @@ vi.mock('@linode/queries', () => {
   return {
     ...actual,
     useAccount: queryMocks.useAccount,
+    useGrants: queryMocks.useGrants,
     useAccountBetaQuery: queryMocks.useAccountBetaQuery,
   };
 });
@@ -59,7 +50,6 @@ vi.mock('src/queries/kubernetes', () => {
     ...actual,
     useKubernetesTieredVersionsQuery:
       queryMocks.useKubernetesTieredVersionsQuery,
-    useKubernetesVersionQuery: queryMocks.useKubernetesVersionQuery,
   };
 });
 
@@ -356,7 +346,7 @@ describe('helper functions', () => {
 
 describe('hooks', () => {
   describe('useIsLkeEnterpriseEnabled', () => {
-    it('returns false for feature enablement if the account does not have the capability', () => {
+    it('returns false for feature enablement (except post-LA) if the account does not have the capability', () => {
       queryMocks.useAccount.mockReturnValue({
         data: {
           capabilities: [],
@@ -380,7 +370,7 @@ describe('hooks', () => {
         isLkeEnterpriseLAFlagEnabled: true,
         isLkeEnterprisePhase2BYOVPCFeatureEnabled: false,
         isLkeEnterprisePhase2DualStackFeatureEnabled: false,
-        isLkeEnterprisePostLAFeatureEnabled: false,
+        isLkeEnterprisePostLAFeatureEnabled: true, // This is okay, because the *LA* feature is gated by the account capability.
       });
     });
 
@@ -504,71 +494,4 @@ describe('hooks', () => {
       });
     });
   });
-
-  describe('useLkeStandardOrEnterpriseVersions', () => {
-    beforeAll(() => {
-      queryMocks.useAccount.mockReturnValue({
-        data: {
-          capabilities: ['Kubernetes Enterprise'],
-        },
-      });
-      queryMocks.useFlags.mockReturnValue({
-        lkeEnterprise2: {
-          enabled: true,
-          ga: true,
-          la: true,
-          phase2Mtc: { byoVPC: true, dualStack: true },
-        },
-      });
-      queryMocks.useKubernetesTieredVersionsQuery.mockReturnValue({
-        data: mockKubernetesEnterpriseVersions,
-        error: null,
-        isFetching: false,
-      });
-      queryMocks.useKubernetesVersionQuery.mockReturnValue({
-        data: mockKubernetesVersions,
-        error: null,
-        isLoading: false,
-      });
-    });
-
-    it('returns enterprise versions for enterprise clusters when the LKE-E feature is enabled', () => {
-      const { result } = renderHook(() =>
-        useLkeStandardOrEnterpriseVersions('enterprise')
-      );
-
-      expect(result.current.versions).toEqual(mockKubernetesEnterpriseVersions);
-      expect(result.current.isLoadingVersions).toBe(false);
-      expect(result.current.versionsError).toBe(null);
-    });
-
-    it('returns standard versions for standard clusters when the LKE-E feature is enabled', () => {
-      const { result } = renderHook(() =>
-        useLkeStandardOrEnterpriseVersions('standard')
-      );
-
-      expect(result.current.versions).toEqual(mockKubernetesVersions);
-      expect(result.current.isLoadingVersions).toBe(false);
-      expect(result.current.versionsError).toBe(null);
-    });
-
-    it('returns standard versions when the LKE-E feature is disabled', () => {
-      queryMocks.useFlags.mockReturnValue({
-        lkeEnterprise2: {
-          enabled: false,
-          ga: true,
-          la: true,
-          phase2Mtc: { byoVPC: true, dualStack: true },
-        },
-      });
-
-      const { result } = renderHook(() =>
-        useLkeStandardOrEnterpriseVersions('standard')
-      );
-
-      expect(result.current.versions).toEqual(mockKubernetesVersions);
-      expect(result.current.isLoadingVersions).toBe(false);
-      expect(result.current.versionsError).toBe(null);
-    });
-  });
 });
diff --git a/packages/manager/src/features/Kubernetes/kubeUtils.ts b/packages/manager/src/features/Kubernetes/kubeUtils.ts
index 991104fc614..eb5570f3927 100644
--- a/packages/manager/src/features/Kubernetes/kubeUtils.ts
+++ b/packages/manager/src/features/Kubernetes/kubeUtils.ts
@@ -1,17 +1,12 @@
-import { useAccount, useAccountBetaQuery } from '@linode/queries';
+import { useAccount, useAccountBetaQuery, useGrants } from '@linode/queries';
 import { getBetaStatus, isFeatureEnabledV2 } from '@linode/utilities';
 
 import { useFlags } from 'src/hooks/useFlags';
-import {
-  useKubernetesTieredVersionsQuery,
-  useKubernetesVersionQuery,
-} from 'src/queries/kubernetes';
 
 import type { Account } from '@linode/api-v4/lib/account';
 import type {
   KubeNodePoolResponse,
   KubernetesCluster,
-  KubernetesTier,
   KubernetesTieredVersion,
   KubernetesVersion,
 } from '@linode/api-v4/lib/kubernetes';
@@ -266,6 +261,11 @@ export const getLatestVersion = (
 export const useIsLkeEnterpriseEnabled = () => {
   const flags = useFlags();
   const { data: account } = useAccount();
+  const { data: grants } = useGrants();
+
+  const hasAccountEndpointAccess =
+    grants?.global.account_access === 'read_only' ||
+    grants?.global.account_access === 'read_write';
 
   const isLkeEnterpriseLAFlagEnabled = Boolean(
     flags?.lkeEnterprise2?.enabled && flags.lkeEnterprise2.la
@@ -299,11 +299,15 @@ export const useIsLkeEnterpriseEnabled = () => {
     account?.capabilities ?? []
   );
   // For feature-flagged update strategy and firewall work
-  const isLkeEnterprisePostLAFeatureEnabled = isFeatureEnabledV2(
-    'Kubernetes Enterprise',
-    isLkeEnterprisePostLAFlagEnabled,
-    account?.capabilities ?? []
-  );
+  // For users with restricted billing/account access, skip the inaccessible capability and just check the feature flag.
+  // This is okay, because the LA feature is gated by the account capability.
+  const isLkeEnterprisePostLAFeatureEnabled = hasAccountEndpointAccess
+    ? isFeatureEnabledV2(
+        'Kubernetes Enterprise',
+        isLkeEnterprisePostLAFlagEnabled,
+        account?.capabilities ?? []
+      )
+    : isLkeEnterprisePostLAFlagEnabled;
   const isLkeEnterpriseGAFeatureEnabled = isFeatureEnabledV2(
     'Kubernetes Enterprise',
     isLkeEnterpriseGAFlagEnabled,
@@ -320,64 +324,3 @@ export const useIsLkeEnterpriseEnabled = () => {
     isLkeEnterprisePostLAFeatureEnabled,
   };
 };
-
-/**
- * @todo Remove this hook and just use `useKubernetesTieredVersionsQuery` directly once we're in GA
- * since we'll always have a cluster tier.
- *
- * A hook to return the correct list of versions depending on the LKE cluster tier.
- * @param clusterTier Whether the cluster is standard or enterprise
- * @returns The list of either standard or enterprise k8 versions and query loading or error state
- */
-export const useLkeStandardOrEnterpriseVersions = (
-  clusterTier: KubernetesTier
-) => {
-  const { isLkeEnterpriseLAFeatureEnabled } = useIsLkeEnterpriseEnabled();
-
-  /**
-   * If LKE-E is enabled, use the data from the new /versions/<tier> endpoint for enterprise tiers.
-   * If LKE-E is disabled, use the data from the existing /versions endpoint and disable the tiered query.
-   */
-  const {
-    data: enterpriseTierVersions,
-    error: enterpriseTierVersionsError,
-    isFetching: enterpriseTierVersionsIsLoading,
-  } = useKubernetesTieredVersionsQuery(
-    'enterprise',
-    isLkeEnterpriseLAFeatureEnabled
-  );
-
-  const {
-    data: _versions,
-    error: versionsError,
-    isLoading: versionsIsLoading,
-  } = useKubernetesVersionQuery();
-
-  return {
-    isLoadingVersions: enterpriseTierVersionsIsLoading || versionsIsLoading,
-    versions:
-      isLkeEnterpriseLAFeatureEnabled && clusterTier === 'enterprise'
-        ? enterpriseTierVersions
-        : _versions,
-    versionsError: enterpriseTierVersionsError || versionsError,
-  };
-};
-
-export const useKubernetesBetaEndpoint = () => {
-  const {
-    isLoading: isAPLAvailabilityLoading,
-    showAPL,
-    isAPLGeneralAvailability,
-  } = useAPLAvailability();
-  const { isLkeEnterpriseLAFeatureEnabled } = useIsLkeEnterpriseEnabled();
-  // Use beta endpoint if either:
-  // 1. LKE Enterprise is enabled
-  // 2. APL is supported but not in GA
-  const isUsingBetaEndpoint =
-    (showAPL && !isAPLGeneralAvailability) || isLkeEnterpriseLAFeatureEnabled;
-
-  return {
-    isAPLAvailabilityLoading,
-    isUsingBetaEndpoint,
-  };
-};
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/AdditionalOptions/Alerts.tsx b/packages/manager/src/features/Linodes/LinodeCreate/AdditionalOptions/Alerts.tsx
index 5161ad1b6c4..e2af0ce0371 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/AdditionalOptions/Alerts.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/AdditionalOptions/Alerts.tsx
@@ -27,7 +27,7 @@ export const Alerts = ({
   const { field } = useController({
     control,
     name: 'alerts',
-    defaultValue: { system: [], user: [] },
+    defaultValue: { system_alerts: [], user_alerts: [] },
   });
 
   const handleToggleAlert = (updatedAlerts: CloudPulseAlertsPayload) => {
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/AdditionalOptions/MaintenancePolicy.tsx b/packages/manager/src/features/Linodes/LinodeCreate/AdditionalOptions/MaintenancePolicy.tsx
index 4bdd304b90d..61357db3320 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/AdditionalOptions/MaintenancePolicy.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/AdditionalOptions/MaintenancePolicy.tsx
@@ -31,8 +31,7 @@ export const MaintenancePolicy = () => {
   const { data: region } = useRegionQuery(selectedRegion);
   const { data: type } = useTypeQuery(selectedType, Boolean(selectedType));
 
-  // Check if user has permission to update linodes (needed for maintenance policy)
-  const { data: permissions } = usePermissions('linode', ['update_linode']);
+  const { data: permissions } = usePermissions('account', ['create_linode']);
 
   const isGPUPlan = type && type.class === 'gpu';
 
@@ -42,7 +41,7 @@ export const MaintenancePolicy = () => {
   // Determine if disabled due to missing prerequisites vs permission issues
   const isDisabledDueToPrerequisites =
     !selectedRegion || !regionSupportsMaintenancePolicy;
-  const isDisabledDueToPermissions = !permissions?.update_linode;
+  const isDisabledDueToPermissions = !permissions?.create_linode;
   const isDisabled = isDisabledDueToPrerequisites || isDisabledDueToPermissions;
 
   return (
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/Networking/Firewall.tsx b/packages/manager/src/features/Linodes/LinodeCreate/Networking/Firewall.tsx
index f537896fd81..2787eea9874 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/Networking/Firewall.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/Networking/Firewall.tsx
@@ -52,7 +52,7 @@ export const Firewall = () => {
             }
             text={
               flags.secureVmCopy?.linodeCreate?.text ??
-              'All accounts must apply an compliant firewall to all their Linodes.'
+              'All accounts must apply a compliant firewall to all their Linodes.'
             }
           />
         )}
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/Networking/InterfaceFirewall.tsx b/packages/manager/src/features/Linodes/LinodeCreate/Networking/InterfaceFirewall.tsx
index cab7c07820d..34d99be08f3 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/Networking/InterfaceFirewall.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/Networking/InterfaceFirewall.tsx
@@ -62,7 +62,7 @@ export const InterfaceFirewall = ({ index }: Props) => {
             }
             text={
               flags.secureVmCopy?.linodeCreate?.text ??
-              'All accounts must apply an compliant firewall to all their Linodes.'
+              'All accounts must apply a compliant firewall to all their Linodes.'
             }
           />
         )}
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/Networking/VPC.tsx b/packages/manager/src/features/Linodes/LinodeCreate/Networking/VPC.tsx
index c9b737bb09b..5078f112ae0 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/Networking/VPC.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/Networking/VPC.tsx
@@ -23,8 +23,9 @@ import {
   REGION_CAVEAT_HELPER_TEXT,
   VPC_AUTO_ASSIGN_IPV4_TOOLTIP,
   VPC_AUTO_ASSIGN_IPV6_TOOLTIP,
+  VPC_IPV4_INPUT_HELPER_TEXT,
+  VPC_IPV6_INPUT_HELPER_TEXT,
 } from 'src/features/VPCs/constants';
-import { generateVPCIPv6InputHelperText } from 'src/features/VPCs/utils';
 import { VPCCreateDrawer } from 'src/features/VPCs/VPCCreateDrawer/VPCCreateDrawer';
 import { useVPCDualStack } from 'src/hooks/useVPCDualStack';
 
@@ -167,7 +168,7 @@ export const VPC = ({ index }: Props) => {
                   disabled={!regionSupportsVPCs}
                   label={
                     <Stack alignItems="center" direction="row">
-                      <Typography>Auto-assign VPC IPv4 address</Typography>
+                      <Typography>Auto-assign VPC IPv4</Typography>
                       <TooltipIcon
                         status="info"
                         text={VPC_AUTO_ASSIGN_IPV4_TOOLTIP}
@@ -186,6 +187,7 @@ export const VPC = ({ index }: Props) => {
                       errors.linodeInterfaces?.[index]?.vpc?.ipv4
                         ?.addresses?.[0]?.message
                     }
+                    helperText={VPC_IPV4_INPUT_HELPER_TEXT}
                     label="VPC IPv4"
                     noMarginTop
                     onBlur={field.onBlur}
@@ -209,7 +211,7 @@ export const VPC = ({ index }: Props) => {
                     disabled={!regionSupportsVPCs}
                     label={
                       <Stack alignItems="center" direction="row">
-                        <Typography>Auto-assign VPC IPv6 address</Typography>
+                        <Typography>Auto-assign VPC IPv6</Typography>
                         <TooltipIcon
                           status="info"
                           text={VPC_AUTO_ASSIGN_IPV6_TOOLTIP}
@@ -228,9 +230,7 @@ export const VPC = ({ index }: Props) => {
                         errors.linodeInterfaces?.[index]?.vpc?.ipv6?.slaac?.[0]
                           ?.range?.message
                       }
-                      helperText={generateVPCIPv6InputHelperText(
-                        selectedSubnet?.ipv6?.[0].range ?? ''
-                      )}
+                      helperText={VPC_IPV6_INPUT_HELPER_TEXT}
                       label="VPC IPv6"
                       noMarginTop
                       onBlur={field.onBlur}
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/Summary/Summary.tsx b/packages/manager/src/features/Linodes/LinodeCreate/Summary/Summary.tsx
index e6659c55867..7cb67eca885 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/Summary/Summary.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/Summary/Summary.tsx
@@ -104,11 +104,11 @@ export const Summary = ({ isAlertsBetaMode }: SummaryProps) => {
     isAlertsBetaMode;
 
   const totalBetaAclpAlertsAssignedCount =
-    (alerts?.system?.length ?? 0) + (alerts?.user?.length ?? 0);
+    (alerts?.system_alerts?.length ?? 0) + (alerts?.user_alerts?.length ?? 0);
 
   const betaAclpAlertsAssignedList = [
-    ...(alerts?.system ?? []),
-    ...(alerts?.user ?? []),
+    ...(alerts?.system_alerts ?? []),
+    ...(alerts?.user_alerts ?? []),
   ].join(', ');
 
   const betaAclpAlertsAssignedDetails =
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/VPC/VPC.test.tsx b/packages/manager/src/features/Linodes/LinodeCreate/VPC/VPC.test.tsx
index b172be8eefd..0408342deab 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/VPC/VPC.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/VPC/VPC.test.tsx
@@ -78,7 +78,7 @@ describe('VPC', () => {
         },
       });
 
-    expect(getByLabelText('Auto-assign VPC IPv4 address')).toBeInTheDocument();
+    expect(getByLabelText('Auto-assign VPC IPv4')).toBeInTheDocument();
 
     expect(
       getByLabelText('Allow public IPv4 access (1:1 NAT)')
@@ -103,7 +103,7 @@ describe('VPC', () => {
         },
       });
 
-    expect(getByLabelText('Auto-assign VPC IPv4 address')).toBeChecked();
+    expect(getByLabelText('Auto-assign VPC IPv4')).toBeChecked();
   });
 
   it('should uncheck the VPC IPv4 if a "ipv4.vpc" is a string value and show the VPC IP TextField', async () => {
@@ -122,7 +122,7 @@ describe('VPC', () => {
         },
       });
 
-    expect(getByLabelText('Auto-assign VPC IPv4 address')).not.toBeChecked();
+    expect(getByLabelText('Auto-assign VPC IPv4')).not.toBeChecked();
 
     expect(getByLabelText('VPC IPv4 (required)')).toBeVisible();
   });
diff --git a/packages/manager/src/features/Linodes/LinodeCreate/VPC/VPC.tsx b/packages/manager/src/features/Linodes/LinodeCreate/VPC/VPC.tsx
index 3d41fe4bdd4..5e9f3b4595e 100644
--- a/packages/manager/src/features/Linodes/LinodeCreate/VPC/VPC.tsx
+++ b/packages/manager/src/features/Linodes/LinodeCreate/VPC/VPC.tsx
@@ -30,8 +30,9 @@ import {
   REGION_CAVEAT_HELPER_TEXT,
   VPC_AUTO_ASSIGN_IPV4_TOOLTIP,
   VPC_AUTO_ASSIGN_IPV6_TOOLTIP,
+  VPC_IPV4_INPUT_HELPER_TEXT,
+  VPC_IPV6_INPUT_HELPER_TEXT,
 } from 'src/features/VPCs/constants';
-import { generateVPCIPv6InputHelperText } from 'src/features/VPCs/utils';
 import { VPCCreateDrawer } from 'src/features/VPCs/VPCCreateDrawer/VPCCreateDrawer';
 import { useVPCDualStack } from 'src/hooks/useVPCDualStack';
 import { sendLinodeCreateFormInputEvent } from 'src/utilities/analytics/formEventAnalytics';
@@ -251,9 +252,7 @@ export const VPC = () => {
                             control={<Checkbox sx={{ ml: 0.5 }} />}
                             label={
                               <Stack alignItems="center" direction="row">
-                                <Typography>
-                                  Auto-assign VPC IPv4 address
-                                </Typography>
+                                <Typography>Auto-assign VPC IPv4</Typography>
                                 <TooltipIcon
                                   status="info"
                                   text={VPC_AUTO_ASSIGN_IPV4_TOOLTIP}
@@ -280,6 +279,7 @@ export const VPC = () => {
                             <TextField
                               containerProps={{ sx: { mb: 1, mt: 1 } }}
                               errorText={fieldState.error?.message}
+                              helperText={VPC_IPV4_INPUT_HELPER_TEXT}
                               label="VPC IPv4"
                               noMarginTop
                               onBlur={field.onBlur}
@@ -303,7 +303,7 @@ export const VPC = () => {
                                 label={
                                   <Stack alignItems="center" direction="row">
                                     <Typography>
-                                      Auto-assign VPC IPv6 address
+                                      Auto-assign VPC IPv6
                                     </Typography>
                                     <TooltipIcon
                                       status="info"
@@ -330,9 +330,7 @@ export const VPC = () => {
                               <TextField
                                 containerProps={{ sx: { mb: 1, mt: 1 } }}
                                 errorText={fieldState.error?.message}
-                                helperText={generateVPCIPv6InputHelperText(
-                                  selectedSubnet?.ipv6?.[0].range ?? ''
-                                )}
+                                helperText={VPC_IPV6_INPUT_HELPER_TEXT}
                                 label="VPC IPv6"
                                 noMarginTop
                                 onBlur={field.onBlur}
diff --git a/packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx b/packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx
index fff726768ad..60bf5453a2c 100644
--- a/packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx
+++ b/packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx
@@ -9,7 +9,7 @@ import * as React from 'react';
 import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip';
 import { useIsDiskEncryptionFeatureEnabled } from 'src/components/Encryption/utils';
 import { Link } from 'src/components/Link';
-import { useKubernetesBetaEndpoint } from 'src/features/Kubernetes/kubeUtils';
+import { useAPLAvailability } from 'src/features/Kubernetes/kubeUtils';
 import { AccessTable } from 'src/features/Linodes/AccessTable';
 import { ipTableId } from 'src/features/Linodes/LinodesDetail/LinodeNetworking/utils';
 import { useVPCDualStack } from 'src/hooks/useVPCDualStack';
@@ -138,13 +138,11 @@ export const LinodeEntityDetailBody = React.memo((props: BodyProps) => {
   const secondAddress = ipv6 ? ipv6 : ipv4.length > 1 ? ipv4[1] : null;
   const matchesLgUp = useMediaQuery(theme.breakpoints.up('lg'));
 
-  const { isAPLAvailabilityLoading, isUsingBetaEndpoint } =
-    useKubernetesBetaEndpoint();
+  const { isLoading } = useAPLAvailability();
 
   const { data: cluster } = useKubernetesClusterQuery({
-    enabled: Boolean(linodeLkeClusterId) && !isAPLAvailabilityLoading,
+    enabled: Boolean(linodeLkeClusterId) && !isLoading,
     id: linodeLkeClusterId ?? -1,
-    isUsingBetaEndpoint,
   });
 
   return (
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeAlerts/AlertsPanel.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeAlerts/AlertsPanel.tsx
index 271b9df67a9..45473a8904b 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeAlerts/AlertsPanel.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeAlerts/AlertsPanel.tsx
@@ -5,7 +5,7 @@ import {
 } from '@linode/queries';
 import { useIsLinodeAclpSubscribed } from '@linode/shared';
 import { ActionsPanel, Divider, Notice, Paper, Typography } from '@linode/ui';
-import { alertsSchema } from '@linode/validation';
+import { UpdateLinodeAlertsSchema } from '@linode/validation';
 import { styled } from '@mui/material/styles';
 import { useFormik } from 'formik';
 import { useSnackbar } from 'notistack';
@@ -81,7 +81,7 @@ export const AlertsPanel = (props: Props) => {
     enableReinitialize: true,
     initialValues,
     validateOnChange: true,
-    validationSchema: alertsSchema,
+    validationSchema: UpdateLinodeAlertsSchema,
     async onSubmit({ cpu, io, network_in, network_out, transfer_quota }) {
       await updateLinode({
         alerts: {
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewalls.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewalls.tsx
index 6aed322306f..03e67423d15 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewalls.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeFirewalls/LinodeFirewalls.tsx
@@ -110,7 +110,7 @@ export const LinodeFirewalls = (props: LinodeFirewallsProps) => {
           Add Firewall
         </Button>
       </Paper>
-      <Table>
+      <Table data-qa-linode-firewalls-table>
         <TableHead>
           <TableRow>
             <TableCell>Firewall</TableCell>
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/AddInterfaceDrawer/VPC/VPCIPAddresses.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/AddInterfaceDrawer/VPC/VPCIPAddresses.tsx
index a1f81c52c59..de618d4b849 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/AddInterfaceDrawer/VPC/VPCIPAddresses.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/AddInterfaceDrawer/VPC/VPCIPAddresses.tsx
@@ -35,11 +35,7 @@ export const VPCIPAddresses = () => {
   return (
     <Stack spacing={1}>
       {fields.map((field, index) => (
-        <VPCIPv4Address
-          index={index}
-          isDualStackVPC={isDualStackEnabled}
-          key={field.id}
-        />
+        <VPCIPv4Address index={index} key={field.id} />
       ))}
       {isDualStackVPC && <VPCIPv6Address />}
     </Stack>
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/AddInterfaceDrawer/VPC/VPCIPv4Address.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/AddInterfaceDrawer/VPC/VPCIPv4Address.tsx
index 908950efdd1..52e5416d7a6 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/AddInterfaceDrawer/VPC/VPCIPv4Address.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/AddInterfaceDrawer/VPC/VPCIPv4Address.tsx
@@ -5,7 +5,6 @@ import {
   Stack,
   TextField,
   TooltipIcon,
-  Typography,
 } from '@linode/ui';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
@@ -17,11 +16,10 @@ import type { CreateInterfaceFormValues } from '../utilities';
 
 interface Props {
   index: number;
-  isDualStackVPC: boolean;
 }
 
 export const VPCIPv4Address = (props: Props) => {
-  const { index, isDualStackVPC } = props;
+  const { index } = props;
   const {
     control,
     formState: { errors },
@@ -45,24 +43,11 @@ export const VPCIPv4Address = (props: Props) => {
               <FormControlLabel
                 checked={field.value === 'auto'}
                 control={<Checkbox />}
-                label="Auto-assign VPC IPv4 address"
+                label="Auto-assign VPC IPv4"
                 onChange={(e, checked) => field.onChange(checked ? 'auto' : '')}
                 sx={{ pl: 0.4, mr: 0 }}
               />
-              <TooltipIcon
-                status="info"
-                text={
-                  isDualStackVPC ? (
-                    <Typography component="span">
-                      Automatically assign an IPv4 address as{' '}
-                      {isDualStackVPC ? 'a' : 'the'} private IP address for this
-                      Linode in the VPC.
-                    </Typography>
-                  ) : (
-                    VPC_AUTO_ASSIGN_IPV4_TOOLTIP
-                  )
-                }
-              />
+              <TooltipIcon status="info" text={VPC_AUTO_ASSIGN_IPV4_TOOLTIP} />
             </Stack>
             {field.value !== 'auto' && (
               <TextField
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/AddInterfaceDrawer/VPC/VPCIPv6Address.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/AddInterfaceDrawer/VPC/VPCIPv6Address.tsx
index e5cdcd500f8..76b60a9140c 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/AddInterfaceDrawer/VPC/VPCIPv6Address.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/AddInterfaceDrawer/VPC/VPCIPv6Address.tsx
@@ -1,4 +1,3 @@
-import { useSubnetQuery } from '@linode/queries';
 import {
   Checkbox,
   FormControlLabel,
@@ -6,31 +5,24 @@ import {
   Stack,
   TextField,
   TooltipIcon,
-  Typography,
 } from '@linode/ui';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 
-import { Code } from 'src/components/Code/Code';
 import { ErrorMessage } from 'src/components/ErrorMessage';
-import { generateVPCIPv6InputHelperText } from 'src/features/VPCs/utils';
+import {
+  VPC_AUTO_ASSIGN_IPV6_TOOLTIP,
+  VPC_IPV6_INPUT_HELPER_TEXT,
+} from 'src/features/VPCs/constants';
 
 import type { CreateInterfaceFormValues } from '../utilities';
 
 export const VPCIPv6Address = () => {
   const {
     control,
-    getValues,
     formState: { errors },
   } = useFormContext<CreateInterfaceFormValues>();
 
-  const { vpc } = getValues();
-  const { data: subnet } = useSubnetQuery(
-    vpc?.vpc_id ?? -1,
-    vpc?.subnet_id ?? -1,
-    Boolean(vpc?.vpc_id && vpc?.subnet_id)
-  );
-
   const error = errors.vpc?.ipv6?.message;
 
   return (
@@ -49,27 +41,16 @@ export const VPCIPv6Address = () => {
               <FormControlLabel
                 checked={field.value === 'auto'}
                 control={<Checkbox />}
-                label="Auto-assign VPC IPv6 address"
+                label="Auto-assign VPC IPv6"
                 onChange={(e, checked) => field.onChange(checked ? 'auto' : '')}
                 sx={{ pl: 0.4, mr: 0 }}
               />
-              <TooltipIcon
-                status="info"
-                text={
-                  <Typography component="span">
-                    Automatically assign an IPv6 address as a private IP address
-                    for this Linode in the VPC. A <Code>/52</Code> IPv6 network
-                    prefix is allocated for the VPC.
-                  </Typography>
-                }
-              />
+              <TooltipIcon status="info" text={VPC_AUTO_ASSIGN_IPV6_TOOLTIP} />
             </Stack>
             {field.value !== 'auto' && (
               <TextField
                 errorText={fieldState.error?.message}
-                helperText={generateVPCIPv6InputHelperText(
-                  subnet?.ipv6?.[0].range ?? ''
-                )}
+                helperText={VPC_IPV6_INPUT_HELPER_TEXT}
                 label="VPC IPv6"
                 noMarginTop
                 onChange={field.onChange}
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/EditInterfaceDrawer/VPCInterface/VPCIPAddresses.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/EditInterfaceDrawer/VPCInterface/VPCIPAddresses.tsx
index 25dfec2c9ef..f9b0f7f0e55 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/EditInterfaceDrawer/VPCInterface/VPCIPAddresses.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/EditInterfaceDrawer/VPCInterface/VPCIPAddresses.tsx
@@ -32,7 +32,7 @@ export const VPCIPAddresses = (props: Props) => {
    * We currently enforce a hard limit of one IPv4 address per VPC interface.
    * See VPC-2044.
    *
-   * @todo Eventually, when the API supports it, we should all the user to append/remove more VPC IPs
+   * @todo Eventually, when the API supports it, we should allow the user to append/remove more VPC IPs
    */
   const { fields } = useFieldArray({
     control,
@@ -50,7 +50,6 @@ export const VPCIPAddresses = (props: Props) => {
       {fields.map((field, index) => (
         <VPCIPv4Address
           index={index}
-          isDualStackVPC={isDualStackVPC}
           key={field.id}
           linodeInterface={linodeInterface}
         />
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/EditInterfaceDrawer/VPCInterface/VPCIPv4Address.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/EditInterfaceDrawer/VPCInterface/VPCIPv4Address.tsx
index 9fde079098b..fc88f4b5f06 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/EditInterfaceDrawer/VPCInterface/VPCIPv4Address.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/EditInterfaceDrawer/VPCInterface/VPCIPv4Address.tsx
@@ -5,7 +5,6 @@ import {
   Stack,
   TextField,
   TooltipIcon,
-  Typography,
 } from '@linode/ui';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
@@ -20,12 +19,11 @@ import type {
 
 interface Props {
   index: number;
-  isDualStackVPC: boolean;
   linodeInterface: LinodeInterface;
 }
 
 export const VPCIPv4Address = (props: Props) => {
-  const { index, linodeInterface, isDualStackVPC } = props;
+  const { index, linodeInterface } = props;
   const {
     control,
     formState: { errors },
@@ -50,7 +48,7 @@ export const VPCIPv4Address = (props: Props) => {
                 <FormControlLabel
                   checked={field.value === 'auto'}
                   control={<Checkbox />}
-                  label="Auto-assign VPC IPv4 address"
+                  label="Auto-assign VPC IPv4"
                   onChange={(e, checked) =>
                     field.onChange(
                       checked
@@ -63,17 +61,7 @@ export const VPCIPv4Address = (props: Props) => {
                 />
                 <TooltipIcon
                   status="info"
-                  text={
-                    isDualStackVPC ? (
-                      <Typography component="span">
-                        Automatically assign an IPv4 address as{' '}
-                        {isDualStackVPC ? 'a' : 'the'} private IP address for
-                        this Linode in the VPC.
-                      </Typography>
-                    ) : (
-                      VPC_AUTO_ASSIGN_IPV4_TOOLTIP
-                    )
-                  }
+                  text={VPC_AUTO_ASSIGN_IPV4_TOOLTIP}
                 />
               </Stack>
               {field.value !== 'auto' && (
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/EditInterfaceDrawer/VPCInterface/VPCIPv6Address.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/EditInterfaceDrawer/VPCInterface/VPCIPv6Address.tsx
index eeaa072c716..26bf66d49a1 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/EditInterfaceDrawer/VPCInterface/VPCIPv6Address.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/EditInterfaceDrawer/VPCInterface/VPCIPv6Address.tsx
@@ -1,4 +1,3 @@
-import { useSubnetQuery } from '@linode/queries';
 import {
   Checkbox,
   FormControlLabel,
@@ -6,15 +5,15 @@ import {
   Stack,
   TextField,
   TooltipIcon,
-  Typography,
 } from '@linode/ui';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 
-import { Code } from 'src/components/Code/Code';
 import { ErrorMessage } from 'src/components/ErrorMessage';
-import { generateVPCIPv6InputHelperText } from 'src/features/VPCs/utils';
-import { useVPCDualStack } from 'src/hooks/useVPCDualStack';
+import {
+  VPC_AUTO_ASSIGN_IPV6_TOOLTIP,
+  VPC_IPV6_INPUT_HELPER_TEXT,
+} from 'src/features/VPCs/constants';
 
 import type {
   LinodeInterface,
@@ -32,18 +31,6 @@ export const VPCIPv6Address = (props: Props) => {
     formState: { errors },
   } = useFormContext<ModifyLinodeInterfacePayload>();
 
-  const { isDualStackEnabled } = useVPCDualStack();
-
-  const { data: subnet } = useSubnetQuery(
-    linodeInterface.vpc?.vpc_id ?? -1,
-    linodeInterface.vpc?.subnet_id ?? -1,
-    Boolean(
-      isDualStackEnabled &&
-        linodeInterface.vpc?.vpc_id &&
-        linodeInterface.vpc?.subnet_id
-    )
-  );
-
   const error = errors.vpc?.ipv6?.message;
 
   return (
@@ -62,7 +49,7 @@ export const VPCIPv6Address = (props: Props) => {
               <FormControlLabel
                 checked={field.value === 'auto'}
                 control={<Checkbox />}
-                label="Auto-assign VPC IPv6 address"
+                label="Auto-assign VPC IPv6"
                 onChange={(e, checked) =>
                   field.onChange(
                     checked ? 'auto' : linodeInterface.vpc?.ipv6?.slaac[0].range
@@ -70,23 +57,12 @@ export const VPCIPv6Address = (props: Props) => {
                 }
                 sx={{ pl: 0.3, mr: 0 }}
               />
-              <TooltipIcon
-                status="info"
-                text={
-                  <Typography component="span">
-                    Automatically assign an IPv6 address as a private IP address
-                    for this Linode in the VPC. A <Code>/52</Code> IPv6 network
-                    prefix is allocated for the VPC.
-                  </Typography>
-                }
-              />
+              <TooltipIcon status="info" text={VPC_AUTO_ASSIGN_IPV6_TOOLTIP} />
             </Stack>
             {field.value !== 'auto' && (
               <TextField
                 errorText={fieldState.error?.message}
-                helperText={generateVPCIPv6InputHelperText(
-                  subnet?.ipv6?.[0].range ?? ''
-                )}
+                helperText={VPC_IPV6_INPUT_HELPER_TEXT}
                 label="VPC IPv6"
                 noMarginTop
                 onChange={field.onChange}
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/InterfaceDetailsDrawer/VlanInterfaceDetailsContent.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/InterfaceDetailsDrawer/VlanInterfaceDetailsContent.tsx
index e7561e27138..35087465117 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/InterfaceDetailsDrawer/VlanInterfaceDetailsContent.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/InterfaceDetailsDrawer/VlanInterfaceDetailsContent.tsx
@@ -5,7 +5,7 @@ import { MaskableText } from 'src/components/MaskableText/MaskableText';
 
 export const VlanInterfaceDetailsContent = (props: {
   ipam_address: string;
-  vlan_label: string;
+  vlan_label: null | string;
 }) => {
   const { ipam_address, vlan_label } = props;
   return (
@@ -20,9 +20,7 @@ export const VlanInterfaceDetailsContent = (props: {
         <Typography>
           <strong>IPAM Address</strong>
         </Typography>
-        <Typography>
-          <MaskableText isToggleable text={ipam_address} />
-        </Typography>
+        <MaskableText isToggleable text={ipam_address} />
       </Stack>
     </>
   );
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/LinodeInterfacesTable.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/LinodeInterfacesTable.tsx
index 5530bfb6172..80013557fa2 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/LinodeInterfacesTable.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeInterfaces/LinodeInterfacesTable.tsx
@@ -18,7 +18,7 @@ interface Props {
 
 export const LinodeInterfacesTable = ({ handlers, linodeId }: Props) => {
   return (
-    <Table>
+    <Table data-qa-linode-interfaces-table>
       <TableHead>
         <TableRow>
           <TableCell>Type</TableCell>
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRescue/StandardRescueDialog.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRescue/StandardRescueDialog.tsx
index 622be8630c3..6bb3bc119a8 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRescue/StandardRescueDialog.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRescue/StandardRescueDialog.tsx
@@ -1,10 +1,8 @@
 import {
   useAllLinodeDisksQuery,
   useAllVolumesQuery,
-  useGrants,
   useLinodeQuery,
   useLinodeRescueMutation,
-  useProfile,
 } from '@linode/queries';
 import {
   ActionsPanel,
@@ -20,6 +18,7 @@ import { styled, useTheme } from '@mui/material/styles';
 import { useSnackbar } from 'notistack';
 import * as React from 'react';
 
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 import { useEventsPollingActions } from 'src/queries/events/events';
 
 import { deviceSlots } from '../LinodeConfigs/constants';
@@ -95,13 +94,12 @@ export const StandardRescueDialog = (props: Props) => {
   } = useAllVolumesQuery({}, { region: linode?.region }, open);
   const isLoading = isLoadingLinodes || isLoadingDisks || isLoadingVolumes;
 
-  const { data: profile } = useProfile();
-  const { data: grants } = useGrants();
-
-  const isReadOnly =
-    Boolean(profile?.restricted) &&
-    grants?.linode.find((grant) => grant.id === linodeId)?.permissions ===
-      'read_only';
+  const { data: permissions } = usePermissions(
+    'linode',
+    ['rescue_linode'],
+    linodeId,
+    open
+  );
 
   // We need the API to allow us to filter on `linode_id`
   // const { data: volumes } = useAllVolumesQuery(
@@ -173,7 +171,7 @@ export const StandardRescueDialog = (props: Props) => {
       })) ?? [],
   };
 
-  const disabled = isReadOnly;
+  const disabled = !permissions.rescue_linode;
 
   const onSubmit = () => {
     rescueLinode(createDevicesFromStrings(rescueDevices))
@@ -224,7 +222,7 @@ export const StandardRescueDialog = (props: Props) => {
       ) : (
         <div>
           <StyledPaper>
-            {isReadOnly && <LinodePermissionsError />}
+            {!permissions.rescue_linode && <LinodePermissionsError />}
             {linodeId ? <RescueDescription linodeId={linodeId} /> : null}
             <DeviceSelection
               counter={counter}
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDiskActionMenu.test.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDiskActionMenu.test.tsx
index ba5b70b604e..d8736fe4b2b 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDiskActionMenu.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDiskActionMenu.test.tsx
@@ -26,6 +26,7 @@ const queryMocks = vi.hoisted(() => ({
       resize_linode: false,
       delete_linode: false,
       clone_linode: false,
+      create_image: true,
     },
   })),
 }));
@@ -209,6 +210,7 @@ describe('LinodeDiskActionMenu', () => {
         resize_linode: false,
         delete_linode: false,
         clone_linode: false,
+        create_image: false,
       },
     });
 
@@ -242,6 +244,7 @@ describe('LinodeDiskActionMenu', () => {
         resize_linode: true,
         delete_linode: true,
         clone_linode: true,
+        create_image: true,
       },
     });
 
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDiskActionMenu.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDiskActionMenu.tsx
index 3602f0dc84a..0c27e67ce6d 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDiskActionMenu.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDiskActionMenu.tsx
@@ -14,22 +14,13 @@ interface Props {
   onDelete: () => void;
   onRename: () => void;
   onResize: () => void;
-  readOnly?: boolean;
 }
 
 export const LinodeDiskActionMenu = (props: Props) => {
   const navigate = useNavigate();
   const [isOpen, setIsOpen] = React.useState<boolean>(false);
 
-  const {
-    disk,
-    linodeId,
-    linodeStatus,
-    onDelete,
-    onRename,
-    onResize,
-    readOnly,
-  } = props;
+  const { disk, linodeId, linodeStatus, onDelete, onRename, onResize } = props;
 
   const { data: permissions, isLoading } = usePermissions(
     'linode',
@@ -38,6 +29,10 @@ export const LinodeDiskActionMenu = (props: Props) => {
     isOpen
   );
 
+  const { data: imagePermissions } = usePermissions('account', [
+    'create_image',
+  ]);
+
   const poweredOnTooltip =
     linodeStatus !== 'offline'
       ? 'Your Linode must be fully powered down in order to perform this action.'
@@ -67,7 +62,7 @@ export const LinodeDiskActionMenu = (props: Props) => {
         : poweredOnTooltip,
     },
     {
-      disabled: readOnly || !!swapTooltip,
+      disabled: !imagePermissions.create_image || !!swapTooltip,
       onClick: () =>
         navigate({
           to: `/images/create/disk`,
@@ -77,7 +72,9 @@ export const LinodeDiskActionMenu = (props: Props) => {
           },
         }),
       title: 'Create Disk Image',
-      tooltip: readOnly ? noPermissionTooltip : swapTooltip,
+      tooltip: !imagePermissions.create_image
+        ? noPermissionTooltip
+        : swapTooltip,
     },
     {
       disabled: !permissions.clone_linode,
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDiskRow.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDiskRow.tsx
index ded59fdcd2b..a922f53e8da 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDiskRow.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDiskRow.tsx
@@ -18,20 +18,11 @@ interface Props {
   onDelete: () => void;
   onRename: () => void;
   onResize: () => void;
-  readOnly: boolean;
 }
 
 export const LinodeDiskRow = React.memo((props: Props) => {
   const { data: events } = useInProgressEvents();
-  const {
-    disk,
-    linodeId,
-    linodeStatus,
-    onDelete,
-    onRename,
-    onResize,
-    readOnly,
-  } = props;
+  const { disk, linodeId, linodeStatus, onDelete, onRename, onResize } = props;
 
   const diskEventLabelMap: Partial<Record<EventAction, string>> = {
     disk_create: 'Creating',
@@ -80,7 +71,6 @@ export const LinodeDiskRow = React.memo((props: Props) => {
           onDelete={onDelete}
           onRename={onRename}
           onResize={onResize}
-          readOnly={readOnly}
         />
       </TableCell>
     </TableRow>
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDisks.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDisks.tsx
index 9b962de61b9..33a4bcc7927 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDisks.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeDisks.tsx
@@ -1,8 +1,4 @@
-import {
-  useAllLinodeDisksQuery,
-  useGrants,
-  useLinodeQuery,
-} from '@linode/queries';
+import { useAllLinodeDisksQuery, useLinodeQuery } from '@linode/queries';
 import { Box, Button, Paper, Stack, Typography } from '@linode/ui';
 import { Hidden } from '@linode/ui';
 import Grid from '@mui/material/Grid';
@@ -41,7 +37,6 @@ export const LinodeDisks = () => {
 
   const { data: disks, error, isLoading } = useAllLinodeDisksQuery(id);
   const { data: linode } = useLinodeQuery(id);
-  const { data: grants } = useGrants();
 
   const { data: permissions } = usePermissions(
     'linode',
@@ -59,10 +54,6 @@ export const LinodeDisks = () => {
 
   const linodeTotalDisk = linode?.specs.disk ?? 0;
 
-  const readOnly =
-    grants !== undefined &&
-    grants.linode.some((g) => g.id === id && g.permissions === 'read_only');
-
   const usedDiskSpace = addUsedDiskSpace(disks ?? []);
 
   const hasFreeDiskSpace = linodeTotalDisk > usedDiskSpace;
@@ -107,7 +98,6 @@ export const LinodeDisks = () => {
         onDelete={() => onDelete(disk)}
         onRename={() => onRename(disk)}
         onResize={() => onResize(disk)}
-        readOnly={readOnly}
       />
     ));
   };
diff --git a/packages/manager/src/features/Managed/ManagedDashboardCard/ManagedChartPanel.styles.tsx b/packages/manager/src/features/Managed/ManagedDashboardCard/ManagedChartPanel.styles.tsx
index 16612857359..a7c2bf37a36 100644
--- a/packages/manager/src/features/Managed/ManagedDashboardCard/ManagedChartPanel.styles.tsx
+++ b/packages/manager/src/features/Managed/ManagedDashboardCard/ManagedChartPanel.styles.tsx
@@ -29,6 +29,9 @@ export const StyledGraphControlsDiv = styled('div', {
     top: 52,
     width: 1,
   },
+  '& .MuiPaper-root': {
+    padding: `0 0 0 ${theme.spacingFunction(24)}`,
+  },
   alignItems: 'center',
   display: 'flex',
   minHeight: 460,
diff --git a/packages/manager/src/features/Managed/ManagedDashboardCard/ManagedDashboardCard.styles.tsx b/packages/manager/src/features/Managed/ManagedDashboardCard/ManagedDashboardCard.styles.tsx
index aac50be3668..9d03064cd63 100644
--- a/packages/manager/src/features/Managed/ManagedDashboardCard/ManagedDashboardCard.styles.tsx
+++ b/packages/manager/src/features/Managed/ManagedDashboardCard/ManagedDashboardCard.styles.tsx
@@ -18,6 +18,7 @@ export const StyledOuterContainerGrid = styled(Grid, {
   background: theme.bg.bgPaper,
   flexDirection: 'column',
   margin: '-8px',
+  padding: theme.spacingFunction(12),
   [theme.breakpoints.up('sm')]: {
     flexDirection: 'row',
     flexWrap: 'nowrap',
diff --git a/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerSummary/SummaryPanel.tsx b/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerSummary/SummaryPanel.tsx
index e2003220d02..6b2f59db1b6 100644
--- a/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerSummary/SummaryPanel.tsx
+++ b/packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerSummary/SummaryPanel.tsx
@@ -16,15 +16,12 @@ import * as React from 'react';
 import { Link } from 'src/components/Link';
 import { TagCell } from 'src/components/TagCell/TagCell';
 import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
-import { useKubernetesBetaEndpoint } from 'src/features/Kubernetes/kubeUtils';
 import { IPAddress } from 'src/features/Linodes/LinodesLanding/IPAddress';
 import { useKubernetesClusterQuery } from 'src/queries/kubernetes';
 
 import { useIsNodebalancerVPCEnabled } from '../../utils';
 
 export const SummaryPanel = () => {
-  const { isUsingBetaEndpoint } = useKubernetesBetaEndpoint();
-
   const { id } = useParams({
     from: '/nodebalancers/$id/summary',
   });
@@ -77,7 +74,6 @@ export const SummaryPanel = () => {
   const { status: clusterStatus } = useKubernetesClusterQuery({
     enabled: Boolean(nodebalancer?.lke_cluster),
     id: nodebalancer?.lke_cluster?.id ?? -1,
-    isUsingBetaEndpoint,
     options: {
       refetchOnMount: false,
       refetchOnReconnect: false,
diff --git a/packages/manager/src/features/NodeBalancers/NodeBalancerSelect.tsx b/packages/manager/src/features/NodeBalancers/NodeBalancerSelect.tsx
index 2d1b624b9c3..a91724ebde0 100644
--- a/packages/manager/src/features/NodeBalancers/NodeBalancerSelect.tsx
+++ b/packages/manager/src/features/NodeBalancers/NodeBalancerSelect.tsx
@@ -5,6 +5,8 @@ import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
 import * as React from 'react';
 import type { JSX } from 'react';
 
+import { useQueryWithPermissions } from '../IAM/hooks/usePermissions';
+
 import type { APIError, NodeBalancer } from '@linode/api-v4';
 import type { SxProps, Theme } from '@mui/material/styles';
 
@@ -95,7 +97,20 @@ export const NodeBalancerSelect = (
 
   const { data, error, isLoading } = useAllNodeBalancersQuery();
 
-  const nodebalancers = optionsFilter ? data?.filter(optionsFilter) : data;
+  const {
+    data: availableNodebalancers,
+    error: availableNodebalancersError,
+    isLoading: availableNodebalancersLoading,
+  } = useQueryWithPermissions<NodeBalancer>(
+    useAllNodeBalancersQuery(),
+    'nodebalancer',
+    ['update_nodebalancer'],
+    Boolean(optionsFilter)
+  );
+
+  const nodebalancers = optionsFilter
+    ? availableNodebalancers.filter(optionsFilter)
+    : data;
 
   React.useEffect(() => {
     /** We want to clear the input value when the value prop changes to null.
@@ -116,7 +131,10 @@ export const NodeBalancerSelect = (
       disableCloseOnSelect={multiple}
       disabled={disabled}
       disablePortal={true}
-      errorText={error?.[0].reason ?? errorText}
+      errorText={
+        (error?.[0].reason || availableNodebalancersError?.[0].reason) ??
+        errorText
+      }
       getOptionLabel={(nodebalancer: NodeBalancer) =>
         renderOptionLabel ? renderOptionLabel(nodebalancer) : nodebalancer.label
       }
@@ -124,11 +142,15 @@ export const NodeBalancerSelect = (
       id={id}
       inputValue={inputValue}
       label={label ? label : multiple ? 'NodeBalancers' : 'NodeBalancer'}
-      loading={isLoading || loading}
+      loading={isLoading || availableNodebalancersLoading || loading}
       multiple={multiple}
       noMarginTop={noMarginTop}
       noOptionsText={
-        noOptionsMessage ?? getDefaultNoOptionsMessage(error, isLoading)
+        noOptionsMessage ??
+        getDefaultNoOptionsMessage(
+          error || availableNodebalancersError,
+          isLoading || availableNodebalancersLoading
+        )
       }
       onBlur={onBlur}
       onChange={(_, value) =>
diff --git a/packages/manager/src/features/OneClickApps/oneClickApps.ts b/packages/manager/src/features/OneClickApps/oneClickApps.ts
index 085e1b05143..604338a6e3b 100644
--- a/packages/manager/src/features/OneClickApps/oneClickApps.ts
+++ b/packages/manager/src/features/OneClickApps/oneClickApps.ts
@@ -86,23 +86,22 @@ export const oneClickApps: Record<number, OCA> = {
     summary: `Build production-ready apps with the MERN stack: MongoDB, Express, React, and Node.js.`,
   },
   401706: {
-    alt_description: 'Virtual private network.',
-    alt_name: 'Free VPN',
+    alt_description: 'Virtual private network server.',
+    alt_name: 'Free VPN Server',
     categories: ['Security'],
     colors: {
       end: '51171a',
       start: '88171a',
     },
-    description: `Configuring WireGuard&reg; is as simple as configuring SSH. A connection is established by an exchange of public keys between server and client, and only a client whose public key is present in the server's configuration file is considered authorized. WireGuard sets up
-      standard network interfaces which behave similarly to other common network interfaces, like eth0. This makes it possible to configure and manage WireGuard interfaces using standard networking tools such as ifconfig and ip. "WireGuard" is a registered trademark of Jason A. Donenfeld.`,
+    description: `Deploy a WireGuard&reg; server to create a central VPN hub for secure network connections. This server automatically configures WireGuard with sensible defaults, sets up NAT for full-tunnel capability, and implements security best practices. The server acts as a central point where multiple WireGuard clients can connect by adding their public keys to the server's configuration. WireGuard uses state-of-the-art cryptography and is designed to be faster and more secure than traditional VPN protocols. "WireGuard" is a registered trademark of Jason A. Donenfeld.`,
     logo_url: 'wireguard.svg',
     related_guides: [
       {
         href: 'https://www.linode.com/docs/products/tools/marketplace/guides/wireguard/',
-        title: 'Deploy WireGuard through the Linode Marketplace',
+        title: 'Deploy WireGuard Server through the Linode Marketplace',
       },
     ],
-    summary: `Modern VPN which utilizes state-of-the-art cryptography. It aims to be faster and leaner than other VPN protocols and has a smaller source code footprint.`,
+    summary: `Modern VPN server which acts as a central hub for secure client connections using state-of-the-art cryptography.`,
     website: 'https://www.wireguard.com/',
   },
   401707: {
@@ -1832,7 +1831,7 @@ export const oneClickApps: Record<number, OCA> = {
       start: '85A355',
     },
     description: `Distributed, masterless, replicating NoSQL database cluster.`,
-    isNew: true,
+    isNew: false,
     logo_url: 'apachecassandra.svg',
     related_guides: [
       {
@@ -1892,7 +1891,7 @@ export const oneClickApps: Record<number, OCA> = {
       start: 'AAAAAA',
     },
     description: `High performance, BSD license key/value database.`,
-    isNew: true,
+    isNew: false,
     logo_url: 'valkey.svg',
     related_guides: [
       {
@@ -1912,7 +1911,7 @@ export const oneClickApps: Record<number, OCA> = {
       start: 'FFBA01',
     },
     description: `OSI approved open source secrets platform.`,
-    isNew: true,
+    isNew: false,
     logo_url: 'openbao.svg',
     related_guides: [
       {
@@ -1932,7 +1931,7 @@ export const oneClickApps: Record<number, OCA> = {
       start: '9D29FB',
     },
     description: `Time series database supporting native query and visualization.`,
-    isNew: true,
+    isNew: false,
     logo_url: 'influxdb.svg',
     related_guides: [
       {
@@ -2094,4 +2093,63 @@ export const oneClickApps: Record<number, OCA> = {
     summary: 'Leading graph database for connected data applications.',
     website: 'https://neo4j.com/',
   },
+  1914317: {
+    alt_description: 'Virtual private network client.',
+    alt_name: 'Free VPN Client',
+    categories: ['Security'],
+    colors: {
+      end: '51171a',
+      start: '88171a',
+    },
+    description: `Deploy a WireGuard&reg; client to securely connect your Linode to a remote WireGuard server for private networking, tunneling, or secure remote access. This client automatically configures the WireGuard connection using the server's public key and endpoint information you provide. The client is ideal for creating secure point-to-point connections, accessing private networks through a VPN tunnel, or routing traffic through a central WireGuard server. WireGuard uses state-of-the-art cryptography and is designed to be faster and more secure than traditional VPN protocols. "WireGuard" is a registered trademark of Jason A. Donenfeld.`,
+    logo_url: 'wireguard.svg',
+    related_guides: [
+      {
+        href: 'https://www.linode.com/docs/products/tools/marketplace/guides/wireguard/',
+        title: 'Deploy WireGuard Client through the Linode Marketplace',
+      },
+    ],
+    summary: `Modern VPN client that connects to a remote WireGuard server for secure network access using state-of-the-art cryptography.`,
+    website: 'https://www.wireguard.com/',
+  },
+  1902903: {
+    alt_description: 'Observability pipeline for data management.',
+    alt_name: 'Telemetry data routing and optimization',
+    categories: ['Development'],
+    colors: {
+      end: '04cccc',
+      start: 'ffffff',
+    },
+    description: `Cribl Stream is an observability pipeline that helps organizations collect, reduce, enrich, and route telemetry data in real-time. It connects with 80+ sources and destinations, enabling you to handle data from any source to any analytics tool. Cribl Stream helps reduce data volume and optimize log processing to cut costs, enhance data security with encryption and access controls, and transform data using AI-powered tools. The platform scales from small to enterprise-level deployments and acts as a universal data management layer, giving organizations more control and efficiency in handling their telemetry data across various systems.`,
+    isNew: true,
+    logo_url: 'cribl.svg',
+    related_guides: [
+      {
+        href: 'https://www.linode.com/docs/products/tools/marketplace/guides/cribl/',
+        title: 'Deploy Cribl through the Linode Marketplace',
+      },
+    ],
+    summary: `Observability pipeline for collecting, reducing, enriching, and routing telemetry data in real-time across 80+ sources and destinations.`,
+    website: 'https://cribl.io/products/stream/',
+  },
+  1902904: {
+    alt_description: 'All-in-one distributed tracing platform.',
+    alt_name: 'Microservices tracing and observability',
+    categories: ['Development'],
+    colors: {
+      end: '68cfe3',
+      start: '648c19',
+    },
+    description: `Jaeger all-in-one is a complete distributed tracing solution deployed as a single Docker container that includes the Jaeger UI, Collector, Query service, Agent, and in-memory storage. This integrated setup is designed for development, testing, and quick deployment scenarios where you need full tracing capabilities without complex distributed architecture. Jaeger helps developers track request flows across microservices, identify performance bottlenecks, analyze service dependencies, and troubleshoot errors in distributed applications. The all-in-one image supports various tracing protocols including Zipkin and Jaeger's own formats, making it ideal for getting started with distributed tracing.`,
+    isNew: true,
+    logo_url: 'jaeger.svg',
+    related_guides: [
+      {
+        href: 'https://www.linode.com/docs/products/tools/marketplace/guides/jaeger/',
+        title: 'Deploy Jaeger through the Linode Marketplace',
+      },
+    ],
+    summary: `All-in-one distributed tracing platform with integrated UI, collector, and storage for monitoring microservices.`,
+    website: 'https://www.jaegertracing.io/',
+  },
 };
diff --git a/packages/manager/src/features/Search/useClientSideSearch.ts b/packages/manager/src/features/Search/useClientSideSearch.ts
index 7c5cf8e0706..fa885192829 100644
--- a/packages/manager/src/features/Search/useClientSideSearch.ts
+++ b/packages/manager/src/features/Search/useClientSideSearch.ts
@@ -11,7 +11,6 @@ import {
   useAllVolumesQuery,
 } from '@linode/queries';
 
-import { useKubernetesBetaEndpoint } from 'src/features/Kubernetes/kubeUtils';
 import { useAllKubernetesClustersQuery } from 'src/queries/kubernetes';
 import { useObjectStorageBuckets } from 'src/queries/object-storage/queries';
 import {
@@ -48,12 +47,11 @@ export const useClientSideSearch = ({ enabled, query }: Props) => {
     error: domainsError,
     isLoading: domainsLoading,
   } = useAllDomainsQuery(enabled);
-  const { isUsingBetaEndpoint } = useKubernetesBetaEndpoint();
   const {
     data: clusters,
     error: lkeClustersError,
     isLoading: lkeClustersLoading,
-  } = useAllKubernetesClustersQuery({ enabled, isUsingBetaEndpoint });
+  } = useAllKubernetesClustersQuery({ enabled });
   const {
     data: volumes,
     error: volumesError,
@@ -115,9 +113,9 @@ export const useClientSideSearch = ({ enabled, query }: Props) => {
     objectStorageBuckets?.buckets.map(bucketToSearchableItem) ?? [];
   const searchableClusters =
     clusters?.map(kubernetesClusterToSearchableItem) ?? [];
-  const searchableStreams = streams?.data?.map(streamToSearchableItem) ?? [];
+  const searchableStreams = streams?.map(streamToSearchableItem) ?? [];
   const searchableDestinations =
-    destinations?.data?.map(destinationToSearchableItem) ?? [];
+    destinations?.map(destinationToSearchableItem) ?? [];
 
   const searchableItems = [
     ...searchableLinodes,
diff --git a/packages/manager/src/features/Support/SupportTickets/SupportTicketProductSelectionFields.tsx b/packages/manager/src/features/Support/SupportTickets/SupportTicketProductSelectionFields.tsx
index 511e4d6b154..685c38f237c 100644
--- a/packages/manager/src/features/Support/SupportTickets/SupportTicketProductSelectionFields.tsx
+++ b/packages/manager/src/features/Support/SupportTickets/SupportTicketProductSelectionFields.tsx
@@ -11,7 +11,6 @@ import { Autocomplete, FormHelperText, TextField } from '@linode/ui';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 
-import { useKubernetesBetaEndpoint } from 'src/features/Kubernetes/kubeUtils';
 import { useAllKubernetesClustersQuery } from 'src/queries/kubernetes';
 import { useObjectStorageBuckets } from 'src/queries/object-storage/queries';
 
@@ -71,14 +70,12 @@ export const SupportTicketProductSelectionFields = (props: Props) => {
     isLoading: nodebalancersLoading,
   } = useAllNodeBalancersQuery(entityType === 'nodebalancer_id');
 
-  const { isUsingBetaEndpoint } = useKubernetesBetaEndpoint();
   const {
     data: clusters,
     error: clustersError,
     isLoading: clustersLoading,
   } = useAllKubernetesClustersQuery({
     enabled: entityType === 'lkecluster_id',
-    isUsingBetaEndpoint,
   });
 
   const {
diff --git a/packages/manager/src/features/TopMenu/UserMenu/UserMenuPopover.tsx b/packages/manager/src/features/TopMenu/UserMenu/UserMenuPopover.tsx
index aed316a400e..91d51143ab3 100644
--- a/packages/manager/src/features/TopMenu/UserMenu/UserMenuPopover.tsx
+++ b/packages/manager/src/features/TopMenu/UserMenu/UserMenuPopover.tsx
@@ -40,7 +40,7 @@ export const UserMenuPopover = (props: UserMenuPopoverProps) => {
 
   const { data: account } = useAccount();
   const { data: profile } = useProfile();
-  const { isIAMEnabled } = useIsIAMEnabled();
+  const { isIAMEnabled, isIAMBeta } = useIsIAMEnabled();
 
   const isChildAccountAccessRestricted = useRestrictedGlobalGrantCheck({
     globalGrantType: 'child_account_access',
@@ -114,7 +114,7 @@ export const UserMenuPopover = (props: UserMenuPopoverProps) => {
             : iamRbacPrimaryNavChanges && !isIAMEnabled
               ? '/users'
               : '/account/users',
-        isBeta: iamRbacPrimaryNavChanges && isIAMEnabled,
+        isBeta: iamRbacPrimaryNavChanges && isIAMEnabled && isIAMBeta,
       },
       {
         display: 'Quotas',
diff --git a/packages/manager/src/features/VPCs/VPCCreate/FormComponents/SubnetContent.test.tsx b/packages/manager/src/features/VPCs/VPCCreate/FormComponents/SubnetContent.test.tsx
index 4a92bbffa41..0229bb0ab68 100644
--- a/packages/manager/src/features/VPCs/VPCCreate/FormComponents/SubnetContent.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCCreate/FormComponents/SubnetContent.test.tsx
@@ -20,7 +20,7 @@ describe('Subnet form content', () => {
 
     expect(getByText('Subnets')).toBeVisible();
     expect(getByText('Subnet Label')).toBeVisible();
-    expect(getByText('Subnet IP Address Range')).toBeVisible();
+    expect(getByText('Subnet IPv4 Range (CIDR)')).toBeVisible();
     expect(getByText('Add another Subnet')).toBeVisible();
   });
 });
diff --git a/packages/manager/src/features/VPCs/VPCCreate/FormComponents/VPCTopSectionContent.test.tsx b/packages/manager/src/features/VPCs/VPCCreate/FormComponents/VPCTopSectionContent.test.tsx
index 9dfa388b178..97345c9b573 100644
--- a/packages/manager/src/features/VPCs/VPCCreate/FormComponents/VPCTopSectionContent.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCCreate/FormComponents/VPCTopSectionContent.test.tsx
@@ -1,9 +1,11 @@
+import { regionFactory, regionVPCAvailabilityFactory } from '@linode/utilities';
 import { waitFor } from '@testing-library/react';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
 import { accountFactory } from 'src/factories';
+import { makeResourcePage } from 'src/mocks/serverHandlers';
 import { http, HttpResponse, server } from 'src/mocks/testServer';
 import { renderWithThemeAndHookFormContext } from 'src/utilities/testHelpers';
 
@@ -45,7 +47,7 @@ describe('VPC Top Section form content', () => {
       capabilities: ['VPC Dual Stack'],
     });
 
-    server.use(http.get('*/v4*/account', () => HttpResponse.json(account)));
+    server.use(http.get('*/account', () => HttpResponse.json(account)));
 
     renderWithThemeAndHookFormContext({
       component: <VPCTopSectionContent {...props} />,
@@ -74,15 +76,38 @@ describe('VPC Top Section form content', () => {
     expect(NetworkingIPStackRadios[1]).not.toBeChecked(); // Dual Stack
   });
 
-  it('renders VPC IPv6 Prefix Length options with /52 selected if Dual Stack is checked and the customer is enterprise', async () => {
+  it('renders VPC IPv6 Prefix Length options with /52 selected if the selected region has multiple prefix lengths available', async () => {
     const account = accountFactory.build({
       capabilities: ['VPC Dual Stack', 'VPC IPv6 Large Prefixes'],
     });
 
-    server.use(http.get('*/v4*/account', () => HttpResponse.json(account)));
+    server.use(http.get('*/account', () => HttpResponse.json(account)));
+    server.use(
+      http.get('*/regions/vpc-availability*', () =>
+        HttpResponse.json(
+          makeResourcePage([
+            regionVPCAvailabilityFactory.build({
+              region: 'us-east',
+              available_ipv6_prefix_lengths: [48, 52],
+            }),
+          ])
+        )
+      )
+    );
 
     renderWithThemeAndHookFormContext({
-      component: <VPCTopSectionContent {...props} />,
+      component: (
+        <VPCTopSectionContent
+          {...props}
+          regions={[
+            regionFactory.build({
+              id: 'us-east',
+              capabilities: ['VPCs', 'VPC Dual Stack'],
+              label: 'US, Newark, NJ',
+            }),
+          ]}
+        />
+      ),
       // @TODO VPC IPv6: Remove this flag check once VPC IPv6 is in GA
       options: {
         flags: {
@@ -99,6 +124,15 @@ describe('VPC Top Section form content', () => {
       },
     });
 
+    const regionSelect = screen.getByPlaceholderText('Select a Region');
+
+    await userEvent.click(regionSelect);
+    await userEvent.type(regionSelect, 'US, Newark, NJ (us-east)');
+    await waitFor(async () => {
+      const selectedRegionOption = screen.getByText('US, Newark, NJ (us-east)');
+      await userEvent.click(selectedRegionOption);
+    });
+
     await waitFor(() => {
       expect(screen.getByText('IP Stack')).toBeVisible();
     });
@@ -110,16 +144,28 @@ describe('VPC Top Section form content', () => {
 
     expect(screen.getByText('VPC IPv6 Prefix Length')).toBeVisible();
     const IPv6CIDRRadios = screen.getAllByRole('radio');
-    expect(IPv6CIDRRadios[2]).toBeChecked(); // /52
-    expect(IPv6CIDRRadios[3]).not.toBeChecked(); // /48
+    expect(IPv6CIDRRadios[2]).not.toBeChecked(); // /48
+    expect(IPv6CIDRRadios[3]).toBeChecked(); // /52
   });
 
-  it('does not render VPC IPv6 Prefix Length options if the customer is not enterprise', async () => {
+  it('does not render VPC IPv6 Prefix Length options if there are none available or only /52 available', async () => {
     const account = accountFactory.build({
       capabilities: ['VPC Dual Stack'],
     });
 
-    server.use(http.get('*/v4*/account', () => HttpResponse.json(account)));
+    server.use(http.get('*/account', () => HttpResponse.json(account)));
+    server.use(
+      http.get('*/regions/vpc-availability*', () =>
+        HttpResponse.json(
+          makeResourcePage([
+            regionVPCAvailabilityFactory.build({
+              region: 'us-east',
+              available_ipv6_prefix_lengths: [52],
+            }),
+          ])
+        )
+      )
+    );
 
     renderWithThemeAndHookFormContext({
       component: <VPCTopSectionContent {...props} />,
diff --git a/packages/manager/src/features/VPCs/VPCCreate/FormComponents/VPCTopSectionContent.tsx b/packages/manager/src/features/VPCs/VPCCreate/FormComponents/VPCTopSectionContent.tsx
index 5911da09fa6..1303dcdcd83 100644
--- a/packages/manager/src/features/VPCs/VPCCreate/FormComponents/VPCTopSectionContent.tsx
+++ b/packages/manager/src/features/VPCs/VPCCreate/FormComponents/VPCTopSectionContent.tsx
@@ -1,3 +1,4 @@
+import { useRegionsVPCAvailabilitiesQuery } from '@linode/queries';
 import { useIsGeckoEnabled } from '@linode/shared';
 import {
   Box,
@@ -65,13 +66,21 @@ export const VPCTopSectionContent = (props: Props) => {
     name: 'subnets',
   });
 
-  const subnets = useWatch({ control, name: 'subnets' });
-  const vpcIPv6 = useWatch({ control, name: 'ipv6' });
+  const [subnets, vpcIPv6, regionId] = useWatch({
+    control,
+    name: ['subnets', 'ipv6', 'region'],
+  });
 
   const { data: permissions } = usePermissions('account', ['create_vpc']);
 
-  const { isDualStackEnabled, isDualStackSelected, isEnterpriseCustomer } =
-    useVPCDualStack(vpcIPv6);
+  const { isDualStackEnabled, isDualStackSelected } = useVPCDualStack(vpcIPv6);
+
+  const { data: regionsVPCAvailabilities } =
+    useRegionsVPCAvailabilitiesQuery(isDualStackEnabled);
+
+  const availableRegionIPv6PrefixLengths = regionsVPCAvailabilities?.find(
+    (region) => region.region === regionId
+  )?.available_ipv6_prefix_lengths;
 
   return (
     <>
@@ -204,7 +213,7 @@ export const VPCTopSectionContent = (props: Props) => {
                       sm: 12,
                       xs: 12,
                     }}
-                    heading="IPv4 + IPv6 (dual-stack)"
+                    heading="IPv4 + IPv6 (Dual Stack)"
                     onClick={() => {
                       field.onChange([
                         {
@@ -235,7 +244,9 @@ export const VPCTopSectionContent = (props: Props) => {
                             <Typography>
                               The VPC supports both IPv4 and IPv6 addresses.
                             </Typography>
-                            <Typography>{RFC1918HelperText}</Typography>
+                            <Typography>
+                              For IPv4, {RFC1918HelperText}
+                            </Typography>
                             <Typography>
                               For IPv6, the VPC is assigned an IPv6 prefix
                               length of <Code>/52</Code> by default.
@@ -255,45 +266,42 @@ export const VPCTopSectionContent = (props: Props) => {
           />
         </Box>
       )}
-      {isDualStackSelected && isEnterpriseCustomer && (
-        <Controller
-          control={control}
-          name="ipv6"
-          render={({ field, fieldState }) => (
-            <RadioGroup
-              onChange={(_, value) => field.onChange([{ range: value }])}
-              value={field.value}
-            >
-              <StyledFormLabel sx={{ marginTop: 1, marginBottom: 0 }}>
-                VPC IPv6 Prefix Length
-              </StyledFormLabel>
-              {errors.ipv6 && (
-                <Notice
-                  sx={{ marginTop: 1 }}
-                  text={fieldState.error?.message}
-                  variant="error"
-                />
-              )}
-              <>
-                <FormControlLabel
-                  checked={vpcIPv6 && vpcIPv6[0].range === '/52'}
-                  control={<Radio />}
-                  disabled={!permissions?.create_vpc}
-                  label="/52"
-                  value="/52"
-                />
-                <FormControlLabel
-                  checked={vpcIPv6 && vpcIPv6[0].range === '/48'}
-                  control={<Radio />}
-                  disabled={!permissions?.create_vpc}
-                  label="/48"
-                  value="/48"
-                />
-              </>
-            </RadioGroup>
-          )}
-        />
-      )}
+      {isDualStackSelected &&
+        availableRegionIPv6PrefixLengths &&
+        availableRegionIPv6PrefixLengths.length > 1 && ( // Hide /52 if it's the only prefix length
+          <Controller
+            control={control}
+            name="ipv6"
+            render={({ field, fieldState }) => (
+              <RadioGroup
+                onChange={(_, value) => field.onChange([{ range: value }])}
+                style={{ margin: 0 }}
+                value={field.value}
+              >
+                <StyledFormLabel sx={{ marginTop: 1, marginBottom: 0 }}>
+                  VPC IPv6 Prefix Length
+                </StyledFormLabel>
+                {errors.ipv6 && (
+                  <Notice
+                    sx={{ marginTop: 1 }}
+                    text={fieldState.error?.message}
+                    variant="error"
+                  />
+                )}
+                {availableRegionIPv6PrefixLengths.map((prefixLength) => (
+                  <FormControlLabel
+                    checked={vpcIPv6 && vpcIPv6[0].range === `/${prefixLength}`}
+                    control={<Radio />}
+                    disabled={!permissions?.create_vpc}
+                    key={prefixLength}
+                    label={`/${prefixLength}`}
+                    value={`/${prefixLength}`}
+                  />
+                ))}
+              </RadioGroup>
+            )}
+          />
+        )}
     </>
   );
 };
diff --git a/packages/manager/src/features/VPCs/VPCCreate/MultipleSubnetInput.test.tsx b/packages/manager/src/features/VPCs/VPCCreate/MultipleSubnetInput.test.tsx
index 6a2ed8e1d24..9e7d6199be0 100644
--- a/packages/manager/src/features/VPCs/VPCCreate/MultipleSubnetInput.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCCreate/MultipleSubnetInput.test.tsx
@@ -41,7 +41,7 @@ describe('MultipleSubnetInput', () => {
       });
 
     expect(getAllByText('Subnet Label')).toHaveLength(3);
-    expect(getAllByText('Subnet IP Address Range')).toHaveLength(3);
+    expect(getAllByText('Subnet IPv4 Range (CIDR)')).toHaveLength(3);
     getByDisplayValue('subnet 0');
     getByDisplayValue('subnet 1');
     getByDisplayValue('subnet 2');
diff --git a/packages/manager/src/features/VPCs/VPCCreate/SubnetNode.test.tsx b/packages/manager/src/features/VPCs/VPCCreate/SubnetNode.test.tsx
index b897c639fa7..e5e2482248a 100644
--- a/packages/manager/src/features/VPCs/VPCCreate/SubnetNode.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCCreate/SubnetNode.test.tsx
@@ -65,7 +65,7 @@ describe('SubnetNode', () => {
     });
 
     screen.getByText('Subnet Label');
-    screen.getByText('Subnet IP Address Range');
+    screen.getByText('Subnet IPv4 Range (CIDR)');
   });
 
   it('should show a removable button if not a drawer', () => {
@@ -133,7 +133,7 @@ describe('SubnetNode', () => {
       },
     });
 
-    expect(screen.getByText('IPv6 Prefix Length')).toBeVisible();
+    expect(screen.getByText('Subnet IPv6 Prefix Length')).toBeVisible();
     const select = screen.getByRole('combobox');
     expect(select).toHaveValue('/56');
   });
diff --git a/packages/manager/src/features/VPCs/VPCCreate/SubnetNode.tsx b/packages/manager/src/features/VPCs/VPCCreate/SubnetNode.tsx
index a0f1fbac83c..6476b71926c 100644
--- a/packages/manager/src/features/VPCs/VPCCreate/SubnetNode.tsx
+++ b/packages/manager/src/features/VPCs/VPCCreate/SubnetNode.tsx
@@ -78,7 +78,7 @@ export const SubnetNode = (props: Props) => {
                 errorText={fieldState.error?.message}
                 helperText={!shouldDisplayIPv6 && availableIPv4HelperText}
                 inputId={`subnet-ipv4-${idx}`}
-                label="Subnet IP Address Range"
+                label="Subnet IPv4 Range (CIDR)"
                 onBlur={field.onBlur}
                 onChange={field.onChange}
                 value={field.value}
@@ -96,11 +96,14 @@ export const SubnetNode = (props: Props) => {
                     numberOfAvailableIPv4Linodes,
                     calculateAvailableIPv6Linodes(field.value)
                   )}`}
-                  label="IPv6 Prefix Length"
+                  label="Subnet IPv6 Prefix Length"
                   onChange={(_, option) => field.onChange(option.value)}
                   options={SUBNET_IPV6_PREFIX_LENGTHS}
                   sx={{
                     width: 140,
+                    '& .MuiInputLabel-root': {
+                      overflow: 'visible',
+                    },
                   }}
                   value={SUBNET_IPV6_PREFIX_LENGTHS.find(
                     (option) => option.value === field.value
diff --git a/packages/manager/src/features/VPCs/VPCCreate/VPCCreate.test.tsx b/packages/manager/src/features/VPCs/VPCCreate/VPCCreate.test.tsx
index 868507687e7..d9b888e7cea 100644
--- a/packages/manager/src/features/VPCs/VPCCreate/VPCCreate.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCCreate/VPCCreate.test.tsx
@@ -34,7 +34,7 @@ describe('VPC create page', () => {
     expect(getByText('Description')).toBeVisible();
     expect(getByText('Subnets')).toBeVisible();
     expect(getByText('Subnet Label')).toBeVisible();
-    expect(getByText('Subnet IP Address Range')).toBeVisible();
+    expect(getByText('Subnet IPv4 Range (CIDR)')).toBeVisible();
     expect(getByText('Add another Subnet')).toBeVisible();
     expect(getByText('Create VPC')).toBeVisible();
   });
@@ -46,7 +46,7 @@ describe('VPC create page', () => {
     await userEvent.click(addSubnet);
 
     const subnetLabels = screen.getAllByText('Subnet Label');
-    const subnetIps = screen.getAllByText('Subnet IP Address Range');
+    const subnetIps = screen.getAllByText('Subnet IPv4 Range (CIDR)');
     expect(subnetLabels).toHaveLength(2);
     expect(subnetIps).toHaveLength(2);
 
@@ -55,14 +55,14 @@ describe('VPC create page', () => {
     await userEvent.click(deleteSubnet);
 
     const subnetLabelAfter = screen.getAllByText('Subnet Label');
-    const subnetIpsAfter = screen.getAllByText('Subnet IP Address Range');
+    const subnetIpsAfter = screen.getAllByText('Subnet IPv4 Range (CIDR)');
     expect(subnetLabelAfter).toHaveLength(1);
     expect(subnetIpsAfter).toHaveLength(1);
   });
 
   it('should display that a subnet ip is invalid and require a subnet label if a user adds an invalid subnet ip', async () => {
     renderWithTheme(<VPCCreate />);
-    const subnetIp = screen.getByText('Subnet IP Address Range');
+    const subnetIp = screen.getByText('Subnet IPv4 Range (CIDR)');
     expect(subnetIp).toBeInTheDocument();
     const createVPCButton = screen.getByText('Create VPC');
     expect(createVPCButton).toBeInTheDocument();
@@ -99,7 +99,7 @@ describe('VPC create page', () => {
     const description = screen.getByRole('textbox', { name: /description/i });
     expect(description).toBeDisabled();
     expect(getByLabelText('Subnet Label')).toBeDisabled();
-    expect(getByLabelText('Subnet IP Address Range')).toBeDisabled();
+    expect(getByLabelText('Subnet IPv4 Range (CIDR)')).toBeDisabled();
     expect(getByText('Add another Subnet')).toBeDisabled();
     expect(getByText('Create VPC')).toBeDisabled();
   });
@@ -117,7 +117,7 @@ describe('VPC create page', () => {
     const description = screen.getByRole('textbox', { name: /description/i });
     expect(description).toBeEnabled();
     expect(getByLabelText('Subnet Label')).toBeEnabled();
-    expect(getByLabelText('Subnet IP Address Range')).toBeEnabled();
+    expect(getByLabelText('Subnet IPv4 Range (CIDR)')).toBeEnabled();
     expect(getByText('Add another Subnet')).toBeEnabled();
     expect(getByText('Create VPC')).toBeEnabled();
   });
diff --git a/packages/manager/src/features/VPCs/VPCCreateDrawer/VPCCreateDrawer.test.tsx b/packages/manager/src/features/VPCs/VPCCreateDrawer/VPCCreateDrawer.test.tsx
index fff4e5bc42c..ba8c730315f 100644
--- a/packages/manager/src/features/VPCs/VPCCreateDrawer/VPCCreateDrawer.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCCreateDrawer/VPCCreateDrawer.test.tsx
@@ -38,7 +38,7 @@ describe('VPC Create Drawer', () => {
     expect(getByText('Description')).toBeVisible();
     expect(getByText('Subnets')).toBeVisible();
     expect(getByText('Subnet Label')).toBeVisible();
-    expect(getByText('Subnet IP Address Range')).toBeVisible();
+    expect(getByText('Subnet IPv4 Range (CIDR)')).toBeVisible();
     expect(getByText('Add another Subnet')).toBeVisible();
     expect(getByRole('button', { name: 'Create VPC' })).toBeVisible();
     expect(getByText('Cancel')).toBeVisible();
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetActionMenu.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetActionMenu.test.tsx
index 06ec7e74c87..945889997cf 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetActionMenu.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetActionMenu.test.tsx
@@ -7,6 +7,27 @@ import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { SubnetActionMenu } from './SubnetActionMenu';
 
+const queryMocks = vi.hoisted(() => ({
+  userPermissions: vi.fn(() => ({
+    data: {
+      update_linode: true,
+      delete_linode: true,
+      update_vpc: true,
+    },
+  })),
+  useQueryWithPermissions: vi.fn().mockReturnValue({
+    data: [
+      { id: 1, label: 'linode-1' },
+      { id: 2, label: 'linode-2' },
+    ],
+    isLoading: false,
+    isError: false,
+  }),
+}));
+vi.mock('src/features/IAM/hooks/usePermissions', () => ({
+  usePermissions: queryMocks.userPermissions,
+  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
+}));
 afterEach(() => {
   vi.clearAllMocks();
 });
@@ -105,4 +126,68 @@ describe('SubnetActionMenu', () => {
     await userEvent.click(assignButton);
     expect(props.handleAssignLinodes).toHaveBeenCalled();
   });
+
+  it('should disable the Assign Linodes button if user does not have update_linode permission', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        update_linode: false,
+        delete_linode: false,
+        update_vpc: false,
+      },
+    });
+    const view = renderWithTheme(<SubnetActionMenu {...props} />);
+    const actionMenu = view.getByLabelText(`Action menu for Subnet subnet-1`);
+    await userEvent.click(actionMenu);
+
+    const assignButton = view.getByRole('menuitem', { name: 'Assign Linodes' });
+    expect(assignButton).toHaveAttribute('aria-disabled', 'true');
+  });
+
+  it('should enable the Assign Linodes button if user has update_linode and update_vpc permissions', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        update_linode: true,
+        delete_linode: false,
+        update_vpc: true,
+      },
+    });
+    const view = renderWithTheme(<SubnetActionMenu {...props} />);
+    const actionMenu = view.getByLabelText(`Action menu for Subnet subnet-1`);
+    await userEvent.click(actionMenu);
+
+    const assignButton = view.getByRole('menuitem', { name: 'Assign Linodes' });
+    expect(assignButton).not.toHaveAttribute('aria-disabled', 'true');
+  });
+
+  it('should disable the Edit button if user does not have update_vpc permission', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        update_linode: false,
+        delete_linode: false,
+        update_vpc: false,
+      },
+    });
+    const view = renderWithTheme(<SubnetActionMenu {...props} />);
+    const actionMenu = view.getByLabelText(`Action menu for Subnet subnet-1`);
+    await userEvent.click(actionMenu);
+
+    const editButton = view.getByRole('menuitem', { name: 'Edit' });
+    expect(editButton).toHaveAttribute('aria-disabled', 'true');
+  });
+
+  it('should enable the Edit button if user has update_vpc permission', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        update_linode: false,
+        delete_linode: false,
+        update_vpc: true,
+      },
+    });
+    const view = renderWithTheme(<SubnetActionMenu {...props} />);
+    const actionMenu = view.getByLabelText(`Action menu for Subnet subnet-1`);
+    await userEvent.click(actionMenu);
+
+    const editButton = view.getByRole('menuitem', { name: 'Edit' });
+    expect(editButton).not.toHaveAttribute('aria-disabled', 'true');
+  });
 });
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetActionMenu.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetActionMenu.tsx
index 0fad2132dc0..347a70b52d2 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetActionMenu.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetActionMenu.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 
 import { ActionMenu } from 'src/components/ActionMenu/ActionMenu';
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 import { useIsNodebalancerVPCEnabled } from 'src/features/NodeBalancers/utils';
 
 import type { Subnet } from '@linode/api-v4';
@@ -29,31 +30,49 @@ export const SubnetActionMenu = (props: Props) => {
     numLinodes,
     numNodebalancers,
     subnet,
+    vpcId,
   } = props;
 
   const flags = useIsNodebalancerVPCEnabled();
 
+  const { data: permissions } = usePermissions('vpc', ['update_vpc'], vpcId);
+  const canUpdateVPC = permissions?.update_vpc;
+
   const actions: Action[] = [
     {
       onClick: () => {
         handleAssignLinodes(subnet);
       },
       title: 'Assign Linodes',
+      disabled: !canUpdateVPC,
+      tooltip: !canUpdateVPC
+        ? 'You do not have permission to assign Linode to this subnet.'
+        : undefined,
     },
     {
       onClick: () => {
         handleUnassignLinodes(subnet);
       },
       title: 'Unassign Linodes',
+      disabled: !canUpdateVPC,
+      tooltip: !canUpdateVPC
+        ? 'You do not have permission to unassign Linode from this subnet.'
+        : undefined,
     },
     {
       onClick: () => {
         handleEdit(subnet);
       },
       title: 'Edit',
+      // TODO: change to 'update_vpc_subnet' once it's available
+      disabled: !canUpdateVPC,
+      tooltip: !canUpdateVPC
+        ? 'You do not have permission to edit this subnet.'
+        : undefined,
     },
     {
-      disabled: numLinodes !== 0 || numNodebalancers !== 0,
+      // TODO: change to 'delete_vpc_subnet' once it's available
+      disabled: numLinodes !== 0 || numNodebalancers !== 0 || !canUpdateVPC,
       onClick: () => {
         handleDelete(subnet);
       },
@@ -61,7 +80,9 @@ export const SubnetActionMenu = (props: Props) => {
       tooltip:
         numLinodes > 0 || numNodebalancers > 0
           ? `${flags.isNodebalancerVPCEnabled ? 'Resources' : 'Linodes'} assigned to a subnet must be unassigned before the subnet can be deleted.`
-          : '',
+          : !canUpdateVPC
+            ? 'You do not have permission to delete this subnet.'
+            : undefined,
     },
   ];
 
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.test.tsx
index 549911f7cba..b744e8f27cb 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.test.tsx
@@ -59,9 +59,7 @@ describe('Subnet Assign Linodes Drawer', () => {
       <SubnetAssignLinodesDrawer {...props} />
     );
 
-    const header = getByText(
-      'Assign Linodes to subnet: subnet-1 (10.0.0.0/24)'
-    );
+    const header = getByText('Assign Linodes to subnet: subnet-1');
     expect(header).toBeVisible();
     const notice = getByTestId('subnet-linode-action-notice');
     expect(notice).toBeVisible();
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.tsx
index 563a51cccc7..ada602f3e86 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetAssignLinodesDrawer.tsx
@@ -4,8 +4,6 @@ import {
   getAllLinodeConfigs,
   useAllLinodesQuery,
   useFirewallSettingsQuery,
-  useGrants,
-  useProfile,
 } from '@linode/queries';
 import { LinodeSelect } from '@linode/shared';
 import {
@@ -26,15 +24,21 @@ import { useTheme } from '@mui/material/styles';
 import { useFormik } from 'formik';
 import * as React from 'react';
 
-import { Code } from 'src/components/Code/Code';
 import { DownloadCSV } from 'src/components/DownloadCSV/DownloadCSV';
 import { Link } from 'src/components/Link';
 import { RemovableSelectionsListTable } from 'src/components/RemovableSelectionsList/RemovableSelectionsListTable';
 import { FirewallSelect } from 'src/features/Firewalls/components/FirewallSelect';
+import {
+  usePermissions,
+  useQueryWithPermissions,
+} from 'src/features/IAM/hooks/usePermissions';
 import { getDefaultFirewallForInterfacePurpose } from 'src/features/Linodes/LinodeCreate/Networking/utilities';
 import {
   REMOVABLE_SELECTIONS_LINODES_TABLE_HEADERS,
   VPC_AUTO_ASSIGN_IPV4_TOOLTIP,
+  VPC_AUTO_ASSIGN_IPV6_TOOLTIP,
+  VPC_IPV4_INPUT_HELPER_TEXT,
+  VPC_IPV6_INPUT_HELPER_TEXT,
   VPC_MULTIPLE_CONFIGURATIONS_LEARN_MORE_LINK,
 } from 'src/features/VPCs/constants';
 import { useUnassignLinode } from 'src/hooks/useUnassignLinode';
@@ -48,7 +52,6 @@ import {
   REGIONAL_LINODE_MESSAGE,
 } from '../constants';
 import {
-  generateVPCIPv6InputHelperText,
   getLinodeInterfaceIPv4Ranges,
   getLinodeInterfacePrimaryIPv4,
   getVPCInterfacePayload,
@@ -146,16 +149,19 @@ export const SubnetAssignLinodesDrawer = (
   const [allowPublicIPv6Access, setAllowPublicIPv6Access] =
     React.useState<boolean>(false);
 
-  const { data: profile } = useProfile();
-  const { data: grants } = useGrants();
-  const vpcPermissions = grants?.vpc.find((v) => v.id === vpcId);
+  const { data: permissions } = usePermissions('vpc', ['update_vpc'], vpcId);
+  // TODO: change update_linode to create_linode_config_profile_interface once it's available
+  // TODO: change delete_linode to delete_linode_config_profile_interface once it's available
+  // TODO: refactor useQueryWithPermissions once API filter is available
+  const { data: filteredLinodes } = useQueryWithPermissions<Linode>(
+    useAllLinodesQuery(),
+    'linode',
+    ['update_linode', 'delete_linode'],
+    open
+  );
 
-  // @TODO VPC: this logic for vpc grants/perms appears a lot - commenting a todo here in case we want to move this logic to a parent component
-  // there isn't a 'view VPC/Subnet' grant that does anything, so all VPCs get returned even for restricted users
-  // with permissions set to 'None'. Therefore, we're treating those as read_only as well
-  const userCannotAssignLinodes =
-    Boolean(profile?.restricted) &&
-    (vpcPermissions?.permissions === 'read_only' || grants?.vpc.length === 0);
+  const userCanAssignLinodes =
+    permissions?.update_vpc && filteredLinodes?.length > 0;
 
   const downloadCSV = async () => {
     await getCSVData();
@@ -582,11 +588,9 @@ export const SubnetAssignLinodesDrawer = (
       isFetching={isFetching}
       onClose={handleOnClose}
       open={open}
-      title={`Assign Linodes to subnet: ${subnet?.label ?? 'Unknown'} (${
-        subnet?.ipv4 ?? subnet?.ipv6 ?? 'Unknown'
-      })`}
+      title={`Assign Linodes to subnet: ${subnet?.label ?? 'Unknown'}`}
     >
-      {userCannotAssignLinodes && (
+      {!userCanAssignLinodes && (
         <Notice
           text={`You don't have permissions to assign Linodes to ${subnet?.label}. Please contact an account administrator for details.`}
           variant="error"
@@ -600,7 +604,7 @@ export const SubnetAssignLinodesDrawer = (
         <Typography>{REGIONAL_LINODE_MESSAGE}</Typography>
         <LinodeSelect
           checkIsOptionEqualToValue
-          disabled={userCannotAssignLinodes}
+          disabled={!userCanAssignLinodes}
           label="Linode"
           onSelectionChange={(selected) => {
             setFieldValue('selectedLinode', selected);
@@ -633,38 +637,23 @@ export const SubnetAssignLinodesDrawer = (
                   />
                 }
                 data-testid="vpc-ipv4-checkbox"
-                disabled={userCannotAssignLinodes}
-                label={<Typography>Auto-assign VPC IPv4 address</Typography>}
+                disabled={!userCanAssignLinodes}
+                label={<Typography>Auto-assign VPC IPv4</Typography>}
                 sx={{ marginRight: 0 }}
               />
-              <TooltipIcon
-                status="info"
-                text={
-                  showIPv6Content ? (
-                    <Typography component="span">
-                      Automatically assign an IPv4 address as{' '}
-                      {showIPv6Content ? 'a' : 'the'} private IP address for
-                      this Linode in the VPC.
-                    </Typography>
-                  ) : (
-                    VPC_AUTO_ASSIGN_IPV4_TOOLTIP
-                  )
-                }
-              />
+              <TooltipIcon status="info" text={VPC_AUTO_ASSIGN_IPV4_TOOLTIP} />
             </Box>
             {!autoAssignVPCIPv4Address && (
               <TextField
-                disabled={userCannotAssignLinodes}
+                disabled={!userCanAssignLinodes}
                 errorText={assignLinodesErrors['ipv4.vpc']}
+                helperText={VPC_IPV4_INPUT_HELPER_TEXT}
                 label="VPC IPv4"
                 noMarginTop={showIPv6Content}
                 onChange={(e) => {
                   setFieldValue('chosenIPv4', e.target.value);
                   setAssignLinodesErrors({});
                 }}
-                style={{
-                  marginBottom: showIPv6Content ? theme.spacingFunction(24) : 0,
-                }}
                 value={values.chosenIPv4}
               />
             )}
@@ -692,30 +681,20 @@ export const SubnetAssignLinodesDrawer = (
                       />
                     }
                     data-testid="vpc-ipv6-checkbox"
-                    disabled={userCannotAssignLinodes}
-                    label={
-                      <Typography>Auto-assign VPC IPv6 address</Typography>
-                    }
+                    disabled={!userCanAssignLinodes}
+                    label={<Typography>Auto-assign VPC IPv6</Typography>}
                     sx={{ marginRight: 0 }}
                   />
                   <TooltipIcon
                     status="info"
-                    text={
-                      <Typography component="span">
-                        Automatically assign an IPv6 address as a private IP
-                        address for this Linode in the VPC. A <Code>/52</Code>{' '}
-                        IPv6 network prefix is allocated for the VPC.
-                      </Typography>
-                    }
+                    text={VPC_AUTO_ASSIGN_IPV6_TOOLTIP}
                   />
                 </Box>
                 {!autoAssignVPCIPv6Address && (
                   <TextField
-                    disabled={userCannotAssignLinodes}
+                    disabled={!userCanAssignLinodes}
                     errorText={assignLinodesErrors['vpc.ipv6.slaac[0].range']}
-                    helperText={generateVPCIPv6InputHelperText(
-                      subnet?.ipv6?.[0].range ?? ''
-                    )}
+                    helperText={VPC_IPV6_INPUT_HELPER_TEXT}
                     label="VPC IPv6"
                     noMarginTop
                     onChange={(e) => {
@@ -737,7 +716,7 @@ export const SubnetAssignLinodesDrawer = (
                   .
                 </Typography>
                 <Autocomplete
-                  disabled={userCannotAssignLinodes}
+                  disabled={!userCanAssignLinodes}
                   label={'Configuration profile'}
                   onChange={(_, value: Config) => {
                     setFieldValue('selectedConfig', value);
@@ -760,7 +739,7 @@ export const SubnetAssignLinodesDrawer = (
               }
               showIPv6Content={showIPv6Content}
               sx={{ margin: `${theme.spacingFunction(16)} 0` }}
-              userCannotAssignLinodes={userCannotAssignLinodes}
+              userCannotAssignLinodes={!userCanAssignLinodes}
             />
             {/* Display the 'Assign additional [IPv4] ranges' section if
                 the Configuration Profile section has been populated, or
@@ -801,7 +780,7 @@ export const SubnetAssignLinodesDrawer = (
           <Button
             buttonType="primary"
             disabled={
-              userCannotAssignLinodes ||
+              !userCanAssignLinodes ||
               !dirty ||
               !values.selectedLinode ||
               (!isLinodeInterface &&
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetCreateDrawer.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetCreateDrawer.test.tsx
index 1ee26eae11e..fb70c9cb76b 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetCreateDrawer.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetCreateDrawer.test.tsx
@@ -88,7 +88,7 @@ describe('Create Subnet Drawer', () => {
       },
     });
 
-    const ipv4Input = screen.getByText('Subnet IPv4 Address Range');
+    const ipv4Input = screen.getByText('Subnet IPv4 Range (CIDR)');
     expect(ipv4Input).toBeVisible();
     expect(ipv4Input).toBeEnabled();
 
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetCreateDrawer.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetCreateDrawer.tsx
index 6e6216a36e8..01f5155186f 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetCreateDrawer.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetCreateDrawer.tsx
@@ -1,10 +1,5 @@
 import { yupResolver } from '@hookform/resolvers/yup';
-import {
-  useCreateSubnetMutation,
-  useGrants,
-  useProfile,
-  useVPCQuery,
-} from '@linode/queries';
+import { useCreateSubnetMutation, useVPCQuery } from '@linode/queries';
 import {
   ActionsPanel,
   Drawer,
@@ -21,6 +16,7 @@ import {
 import * as React from 'react';
 import { Controller, useForm } from 'react-hook-form';
 
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 import { useVPCDualStack } from 'src/hooks/useVPCDualStack';
 import {
   calculateAvailableIPv4sRFC1918,
@@ -42,12 +38,15 @@ interface Props {
 export const SubnetCreateDrawer = (props: Props) => {
   const { onClose, open, vpcId } = props;
 
-  const { data: profile } = useProfile();
-  const { data: grants } = useGrants();
   const { data: vpc } = useVPCQuery(vpcId, open);
 
-  const userCannotAddSubnet = profile?.restricted && !grants?.global.add_vpcs;
+  const { data: permissions } = usePermissions(
+    'vpc',
+    ['create_vpc_subnet'],
+    vpcId
+  );
 
+  const canCreateSubnet = permissions?.create_vpc_subnet;
   const recommendedIPv4 = getRecommendedSubnetIPv4(
     DEFAULT_SUBNET_IPV4_VALUE,
     vpc?.subnets?.map((subnet: Subnet) => subnet.ipv4 ?? '') ?? []
@@ -110,7 +109,7 @@ export const SubnetCreateDrawer = (props: Props) => {
       {errors.root?.message && (
         <Notice spacingBottom={8} text={errors.root.message} variant="error" />
       )}
-      {userCannotAddSubnet && (
+      {!canCreateSubnet && (
         <Notice
           spacingBottom={8}
           spacingTop={16}
@@ -128,7 +127,7 @@ export const SubnetCreateDrawer = (props: Props) => {
             render={({ field, fieldState }) => (
               <TextField
                 aria-label="Enter a subnet label"
-                disabled={userCannotAddSubnet}
+                disabled={!canCreateSubnet}
                 errorText={fieldState.error?.message}
                 label="Subnet Label"
                 onBlur={field.onBlur}
@@ -144,11 +143,11 @@ export const SubnetCreateDrawer = (props: Props) => {
             render={({ field, fieldState }) => (
               <TextField
                 aria-label="Enter an IPv4"
-                disabled={userCannotAddSubnet}
+                disabled={!canCreateSubnet}
                 errorText={fieldState.error?.message}
                 label={
                   shouldDisplayIPv6
-                    ? 'Subnet IPv4 Address Range'
+                    ? 'Subnet IPv4 Range (CIDR)'
                     : 'Subnet IP Address Range'
                 }
                 onBlur={field.onBlur}
@@ -195,7 +194,7 @@ export const SubnetCreateDrawer = (props: Props) => {
         <ActionsPanel
           primaryButtonProps={{
             'data-testid': 'create-subnet-drawer-button',
-            disabled: !isDirty || userCannotAddSubnet,
+            disabled: !isDirty || !canCreateSubnet,
             label: 'Create Subnet',
             loading: isPending || isSubmitting,
             type: 'submit',
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetDeleteDialog.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetDeleteDialog.tsx
index 54d6257dd07..41261bb7233 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetDeleteDialog.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetDeleteDialog.tsx
@@ -1,8 +1,10 @@
 import { useDeleteSubnetMutation } from '@linode/queries';
+import { Notice } from '@linode/ui';
 import { useSnackbar } from 'notistack';
 import * as React from 'react';
 
 import { TypeToConfirmDialog } from 'src/components/TypeToConfirmDialog/TypeToConfirmDialog';
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 
 import type { APIError, Subnet } from '@linode/api-v4';
 
@@ -25,6 +27,9 @@ export const SubnetDeleteDialog = (props: Props) => {
     reset,
   } = useDeleteSubnetMutation(vpcId, subnet?.id ?? -1);
 
+  // TODO: change 'update_vpc' to 'delete_vpc_subnet' once it's available
+  const { data: permissions } = usePermissions('vpc', ['update_vpc'], vpcId);
+
   React.useEffect(() => {
     if (open) {
       reset();
@@ -41,6 +46,7 @@ export const SubnetDeleteDialog = (props: Props) => {
 
   return (
     <TypeToConfirmDialog
+      disableTypeToConfirmInput={!permissions.update_vpc}
       entity={{
         action: 'deletion',
         name: subnet?.label,
@@ -57,6 +63,13 @@ export const SubnetDeleteDialog = (props: Props) => {
       onClose={onClose}
       open={open}
       title={`Delete Subnet ${subnet?.label}`}
-    />
+    >
+      {!permissions.update_vpc && (
+        <Notice
+          text={`You don't have permissions to delete ${subnet?.label}. Please contact an account administrator for details.`}
+          variant="error"
+        />
+      )}
+    </TypeToConfirmDialog>
   );
 };
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.test.tsx
index 4c27edae4ea..56f79eb3363 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.test.tsx
@@ -1,9 +1,26 @@
+import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
 import { SubnetEditDrawer } from './SubnetEditDrawer';
 
+const queryMocks = vi.hoisted(() => ({
+  userPermissions: vi.fn(() => ({
+    data: {
+      update_vpc: true,
+    },
+  })),
+  useQueryWithPermissions: vi.fn().mockReturnValue({
+    data: [],
+    isLoading: false,
+    isError: false,
+  }),
+}));
+vi.mock('src/features/IAM/hooks/usePermissions', () => ({
+  usePermissions: queryMocks.userPermissions,
+  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
+}));
 describe('SubnetEditDrawer', () => {
   const props = {
     isFetching: false,
@@ -36,4 +53,32 @@ describe('SubnetEditDrawer', () => {
     expect(cancelBtn).not.toHaveAttribute('aria-disabled', 'true');
     expect(cancelBtn).toBeVisible();
   });
+
+  it('should disable the Label input when user does not have update_vpc permission', () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        update_vpc: false,
+      },
+    });
+    const { getByRole } = renderWithTheme(<SubnetEditDrawer {...props} />);
+    const labelInput = getByRole('textbox', { name: 'Label' });
+    expect(labelInput).toBeDisabled();
+  });
+
+  it('should enable the Label input when user does not have update_vpc permission', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        update_vpc: true,
+      },
+    });
+    const { getByRole, getByTestId } = renderWithTheme(
+      <SubnetEditDrawer {...props} />
+    );
+    const labelInput = getByRole('textbox', { name: 'Label' });
+    expect(labelInput).toBeEnabled();
+
+    await userEvent.type(labelInput, 'New label');
+    const saveButton = getByTestId('save-button');
+    expect(saveButton).toHaveAttribute('aria-disabled', 'false');
+  });
 });
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.tsx
index b5fa0d47ddf..39c8acc6872 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetEditDrawer.tsx
@@ -1,14 +1,12 @@
 import { yupResolver } from '@hookform/resolvers/yup';
-import {
-  useGrants,
-  useProfile,
-  useUpdateSubnetMutation,
-} from '@linode/queries';
+import { useUpdateSubnetMutation } from '@linode/queries';
 import { ActionsPanel, Drawer, Notice, TextField } from '@linode/ui';
 import { modifySubnetSchema } from '@linode/validation';
 import * as React from 'react';
 import { Controller, useForm } from 'react-hook-form';
 
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
+
 import type { APIError, ModifySubnetPayload, Subnet } from '@linode/api-v4';
 
 interface Props {
@@ -62,17 +60,8 @@ export const SubnetEditDrawer = (props: Props) => {
       }
     }
   };
-
-  const { data: profile } = useProfile();
-  const { data: grants } = useGrants();
-
-  const vpcPermissions = grants?.vpc.find((v) => v.id === vpcId);
-
-  // there isn't a 'view VPC/Subnet' grant that does anything, so all VPCs get returned even for restricted users
-  // with permissions set to 'None'. Therefore, we're treating those as read_only as well
-  const readOnly =
-    Boolean(profile?.restricted) &&
-    (vpcPermissions?.permissions === 'read_only' || grants?.vpc.length === 0);
+  // TODO: change 'update_vpc' to 'update_vpc_subnet' once it's available
+  const { data: permissions } = usePermissions('vpc', ['update_vpc'], vpcId);
 
   return (
     <Drawer
@@ -85,7 +74,7 @@ export const SubnetEditDrawer = (props: Props) => {
       {errors.root?.message && (
         <Notice text={errors.root.message} variant="error" />
       )}
-      {readOnly && (
+      {!permissions.update_vpc && (
         <Notice
           text={`You don't have permissions to edit ${subnet?.label}. Please contact an account administrator for details.`}
           variant="error"
@@ -97,7 +86,7 @@ export const SubnetEditDrawer = (props: Props) => {
           name="label"
           render={({ field, fieldState }) => (
             <TextField
-              disabled={readOnly}
+              disabled={!permissions.update_vpc}
               errorText={fieldState.error?.message}
               label="Label"
               name="label"
@@ -116,7 +105,7 @@ export const SubnetEditDrawer = (props: Props) => {
         <ActionsPanel
           primaryButtonProps={{
             'data-testid': 'save-button',
-            disabled: !isDirty || readOnly,
+            disabled: !isDirty || !permissions.update_vpc,
             label: 'Save',
             loading: isPending || isSubmitting,
             type: 'submit',
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeActionMenu.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeActionMenu.test.tsx
index 66bde85dbc3..5973b8a1452 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeActionMenu.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeActionMenu.test.tsx
@@ -3,10 +3,31 @@ import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
 import { subnetFactory } from 'src/factories';
-import { renderWithTheme } from 'src/utilities/testHelpers';
+import { mockMatchMedia, renderWithTheme } from 'src/utilities/testHelpers';
 
 import { SubnetLinodeActionMenu } from './SubnetLinodeActionMenu';
 
+beforeAll(() => mockMatchMedia());
+const queryMocks = vi.hoisted(() => ({
+  userPermissions: vi.fn(() => ({
+    data: {
+      reboot_linode: true,
+      boot_linode: true,
+      shutdown_linode: true,
+      delete_linode: true,
+      update_vpc: true,
+    },
+  })),
+  useQueryWithPermissions: vi.fn().mockReturnValue({
+    data: [],
+    isLoading: false,
+    isError: false,
+  }),
+}));
+vi.mock('src/features/IAM/hooks/usePermissions', () => ({
+  usePermissions: queryMocks.userPermissions,
+  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
+}));
 const props = {
   handlePowerActionsLinode: vi.fn(),
   handleUnassignLinode: vi.fn(),
@@ -15,6 +36,7 @@ const props = {
   isOffline: false,
   isRebootNeeded: false,
   showPowerButton: true,
+  canUpdateVPC: true,
 };
 
 describe('SubnetActionMenu', () => {
@@ -89,4 +111,51 @@ describe('SubnetActionMenu', () => {
     await userEvent.click(unassignButton);
     expect(props.handleUnassignLinode).toHaveBeenCalled();
   });
+  it('should disable the "Unassign Linode" and "Power On" buttons when user does not have permission', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        delete_linode: false,
+        reboot_linode: false,
+        boot_linode: false,
+        shutdown_linode: false,
+        update_vpc: false,
+      },
+    });
+    const { getByLabelText, getByTestId } = renderWithTheme(
+      <SubnetLinodeActionMenu {...props} isOffline={true} />
+    );
+    const actionMenu = getByLabelText(
+      `Action menu for Linodes in Subnet subnet-1`
+    );
+    await userEvent.click(actionMenu);
+
+    const unassignButton = getByTestId('Unassign Linode');
+    expect(unassignButton).toHaveAttribute('aria-disabled', 'true');
+
+    const powerOnButton = getByTestId('Power On');
+    expect(powerOnButton).toHaveAttribute('aria-disabled', 'true');
+  });
+  it('should enable the "Unassign Linode" and "Power On" buttons when user has permission', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        delete_linode: true,
+        reboot_linode: true,
+        boot_linode: true,
+        shutdown_linode: false,
+        update_vpc: true,
+      },
+    });
+    const { getByLabelText, getByTestId } = renderWithTheme(
+      <SubnetLinodeActionMenu {...props} isOffline={true} />
+    );
+    const actionMenu = getByLabelText(
+      `Action menu for Linodes in Subnet subnet-1`
+    );
+    await userEvent.click(actionMenu);
+
+    const unassignButton = getByTestId('Unassign Linode');
+    expect(unassignButton).not.toHaveAttribute('aria-disabled', 'true');
+    const powerOnButton = getByTestId('Power On');
+    expect(powerOnButton).not.toHaveAttribute('aria-disabled', 'true');
+  });
 });
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeActionMenu.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeActionMenu.tsx
index fa302d8bba3..8474b10fe0d 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeActionMenu.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeActionMenu.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 
 import { ActionMenu } from 'src/components/ActionMenu/ActionMenu';
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 
 import type { Linode, Subnet } from '@linode/api-v4';
 import type { Action as ActionMenuAction } from 'src/components/ActionMenu/ActionMenu';
@@ -21,6 +22,7 @@ interface Props extends SubnetLinodeActionHandlers {
   linode: Linode;
   showPowerButton: boolean;
   subnet: Subnet;
+  vpcId?: number;
 }
 
 export const SubnetLinodeActionMenu = (props: Props) => {
@@ -32,8 +34,17 @@ export const SubnetLinodeActionMenu = (props: Props) => {
     subnet,
     linode,
     showPowerButton,
+    vpcId,
   } = props;
 
+  const { data: permissions } = usePermissions('vpc', ['update_vpc'], vpcId);
+  // TODO: change 'delete_linode' to 'delete_linode_config_profile_interface' once it's available
+  const { data: linodePermissions } = usePermissions(
+    'linode',
+    ['reboot_linode', 'boot_linode', 'shutdown_linode', 'delete_linode'],
+    linode.id
+  );
+
   const actions: ActionMenuAction[] = [];
   if (isRebootNeeded) {
     actions.push({
@@ -41,6 +52,10 @@ export const SubnetLinodeActionMenu = (props: Props) => {
         handlePowerActionsLinode(linode, 'Reboot', subnet);
       },
       title: 'Reboot',
+      disabled: !(linodePermissions?.reboot_linode && permissions?.update_vpc),
+      tooltip: !(linodePermissions?.reboot_linode && permissions?.update_vpc)
+        ? 'You do not have permission to reboot this Linode.'
+        : undefined,
     });
   }
 
@@ -53,6 +68,14 @@ export const SubnetLinodeActionMenu = (props: Props) => {
           subnet
         );
       },
+      disabled: isOffline
+        ? !(linodePermissions?.boot_linode && permissions?.update_vpc)
+        : !(linodePermissions?.shutdown_linode && permissions?.update_vpc),
+      tooltip: !(linodePermissions?.boot_linode && permissions?.update_vpc)
+        ? 'You do not have permission to power on this Linode.'
+        : !(linodePermissions?.shutdown_linode && permissions?.update_vpc)
+          ? 'You do not have permission to power off this Linode.'
+          : undefined,
       title: isOffline ? 'Power On' : 'Power Off',
     });
   }
@@ -62,6 +85,10 @@ export const SubnetLinodeActionMenu = (props: Props) => {
       handleUnassignLinode(linode, subnet);
     },
     title: 'Unassign Linode',
+    disabled: !(linodePermissions?.delete_linode && permissions?.update_vpc),
+    tooltip: !(linodePermissions?.delete_linode && permissions?.update_vpc)
+      ? 'You do not have permission to unassign this Linode.'
+      : undefined,
   });
 
   return (
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeRow.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeRow.test.tsx
index af01d0421ca..e6a223140c4 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeRow.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeRow.test.tsx
@@ -103,6 +103,7 @@ describe('SubnetLinodeRow', () => {
           subnet={subnetFactory.build()}
           subnetId={0}
           subnetInterfaces={[{ active: true, config_id: 1, id: 1 }]}
+          vpcId={1}
         />
       )
     );
@@ -135,6 +136,7 @@ describe('SubnetLinodeRow', () => {
             subnet={subnetFactory1}
             subnetId={1}
             subnetInterfaces={[{ active: true, config_id: config.id, id: 1 }]}
+            vpcId={1}
           />,
           { flags: { vpcIpv6: false } }
         )
@@ -192,6 +194,7 @@ describe('SubnetLinodeRow', () => {
           subnet={subnetFactory.build()}
           subnetId={1}
           subnetInterfaces={[{ active: true, config_id: null, id: 1 }]}
+          vpcId={1}
         />
       )
     );
@@ -238,6 +241,7 @@ describe('SubnetLinodeRow', () => {
           subnet={subnetFactory1}
           subnetId={1}
           subnetInterfaces={[{ active: true, config_id: config.id, id: 1 }]}
+          vpcId={1}
         />,
         {
           flags: { vpcIpv6: true },
@@ -281,6 +285,7 @@ describe('SubnetLinodeRow', () => {
           subnetInterfaces={[
             { active: true, config_id: null, id: vpcLinodeInterface.id },
           ]}
+          vpcId={1}
         />,
         {
           flags: { vpcIpv6: true },
@@ -324,6 +329,7 @@ describe('SubnetLinodeRow', () => {
           subnetInterfaces={[
             { active: true, config_id: config.id, id: vpcInterface.id },
           ]}
+          vpcId={1}
         />
       )
     );
@@ -381,6 +387,7 @@ describe('SubnetLinodeRow', () => {
           subnet={subnet}
           subnetId={subnet.id}
           subnetInterfaces={[{ active: true, config_id: 1, id: 1 }]}
+          vpcId={1}
         />
       )
     );
@@ -409,6 +416,7 @@ describe('SubnetLinodeRow', () => {
           subnet={subnet}
           subnetId={subnet.id}
           subnetInterfaces={[{ active: true, config_id: 1, id: 1 }]}
+          vpcId={1}
         />
       )
     );
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeRow.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeRow.tsx
index da111cf93e8..24f5cfed09d 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeRow.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeRow.tsx
@@ -56,6 +56,7 @@ interface Props {
   subnet: Subnet;
   subnetId: number;
   subnetInterfaces: SubnetLinodeInterfaceData[];
+  vpcId: number;
 }
 
 export const SubnetLinodeRow = (props: Props) => {
@@ -68,6 +69,7 @@ export const SubnetLinodeRow = (props: Props) => {
     subnet,
     subnetId,
     subnetInterfaces,
+    vpcId,
   } = props;
 
   const { isDualStackEnabled } = useVPCDualStack();
@@ -274,6 +276,7 @@ export const SubnetLinodeRow = (props: Props) => {
           linode={linode}
           showPowerButton={showPowerButton}
           subnet={subnet}
+          vpcId={vpcId}
         />
       </TableCell>
     </TableRow>
@@ -382,9 +385,7 @@ const getIPRangesCellContents = (
       determineNoneSingleOrMultipleWithChip(ipv6Ranges);
 
     // For IPv6 columns, we want to display em dashes instead of 'None' in the cells to help indicate the VPC/subnet does not support IPv6
-    return noneSingleOrMultipleWithChipIPV6 === 'None'
-      ? '—'
-      : noneSingleOrMultipleWithChipIPV6;
+    return !interfaceData.ipv6 ? '—' : noneSingleOrMultipleWithChipIPV6;
   } else {
     const linodeInterfaceVPCRanges =
       ipType === 'ipv4'
@@ -396,7 +397,7 @@ const getIPRangesCellContents = (
     );
 
     // For IPv6 columns, we want to display em dashes instead of 'None' in the cells to help indicate the VPC/subnet does not support IPv6
-    return ipType === 'ipv6' && noneSingleOrMultipleWithChip === 'None'
+    return ipType === 'ipv6' && !interfaceData.vpc?.ipv6
       ? '—'
       : noneSingleOrMultipleWithChip;
   }
diff --git a/packages/manager/src/features/VPCs/VPCDetail/SubnetUnassignLinodesDrawer.tsx b/packages/manager/src/features/VPCs/VPCDetail/SubnetUnassignLinodesDrawer.tsx
index 65ce867cf54..419b13481e1 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/SubnetUnassignLinodesDrawer.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/SubnetUnassignLinodesDrawer.tsx
@@ -1,9 +1,4 @@
-import {
-  linodeQueries,
-  useAllLinodesQuery,
-  useGrants,
-  useProfile,
-} from '@linode/queries';
+import { linodeQueries, useAllLinodesQuery } from '@linode/queries';
 import {
   ActionsPanel,
   Autocomplete,
@@ -20,6 +15,10 @@ import * as React from 'react';
 
 import { DownloadCSV } from 'src/components/DownloadCSV/DownloadCSV';
 import { RemovableSelectionsListTable } from 'src/components/RemovableSelectionsList/RemovableSelectionsListTable';
+import {
+  usePermissions,
+  useQueryWithPermissions,
+} from 'src/features/IAM/hooks/usePermissions';
 import { REMOVABLE_SELECTIONS_LINODES_TABLE_HEADERS } from 'src/features/VPCs/constants';
 import { useUnassignLinode } from 'src/hooks/useUnassignLinode';
 import { useVPCDualStack } from 'src/hooks/useVPCDualStack';
@@ -74,16 +73,12 @@ export const SubnetUnassignLinodesDrawer = React.memo(
     subnetError,
     vpcId,
   }: Props) => {
-    const { data: profile } = useProfile();
-    const { data: grants } = useGrants();
-
     const { isDualStackEnabled } = useVPCDualStack(subnet?.ipv6 ?? []);
     const showIPv6Content =
       isDualStackEnabled &&
       Boolean(subnet?.ipv6?.length && subnet?.ipv6?.length > 0);
 
     const subnetId = subnet?.id;
-    const vpcPermissions = grants?.vpc.find((v) => v.id === vpcId);
 
     const queryClient = useQueryClient();
     const { setUnassignLinodesErrors, unassignLinode, unassignLinodesErrors } =
@@ -110,10 +105,6 @@ export const SubnetUnassignLinodesDrawer = React.memo(
 
     const { linodes: subnetLinodeIds } = subnet || {};
 
-    const userCannotUnassignLinodes =
-      Boolean(profile?.restricted) &&
-      (vpcPermissions?.permissions === 'read_only' || grants?.vpc.length === 0);
-
     // 1. We need to get all the linodes.
     const {
       data: linodes,
@@ -130,6 +121,16 @@ export const SubnetUnassignLinodesDrawer = React.memo(
       });
     }, [linodes, subnetLinodeIds]);
 
+    const { data: permissions } = usePermissions('vpc', ['update_vpc'], vpcId);
+    // TODO: change to 'delete_linode_config_profile_interface' once it's available
+    const { data: filteredLinodes } = useQueryWithPermissions(
+      useAllLinodesQuery(),
+      'linode',
+      ['delete_linode']
+    );
+    const userCanUnassignLinodes =
+      permissions.update_vpc && filteredLinodes?.length > 0;
+
     React.useEffect(() => {
       if (linodes) {
         setLinodeOptionsToUnassign(findAssignedLinodes() ?? []);
@@ -337,7 +338,7 @@ export const SubnetUnassignLinodesDrawer = React.memo(
           subnet?.ipv4 ?? subnet?.ipv6 ?? 'Unknown'
         })`}
       >
-        {userCannotUnassignLinodes && (
+        {!userCanUnassignLinodes && linodeOptionsToUnassign.length > 0 && (
           <Notice
             text={`You don't have permissions to unassign Linodes from ${subnet?.label}. Please contact an account administrator for details.`}
             variant="error"
@@ -357,7 +358,7 @@ export const SubnetUnassignLinodesDrawer = React.memo(
           <Stack marginTop={!singleLinodeToBeUnassigned ? 0 : 3} spacing={3}>
             {!singleLinodeToBeUnassigned && (
               <Autocomplete
-                disabled={userCannotUnassignLinodes}
+                disabled={!userCanUnassignLinodes}
                 errorText={linodesError ? linodesError[0].reason : undefined}
                 label="Linodes"
                 multiple
@@ -420,7 +421,8 @@ export const SubnetUnassignLinodesDrawer = React.memo(
               <ActionsPanel
                 primaryButtonProps={{
                   'data-testid': 'unassign-submit-button',
-                  disabled: interfacesToDelete.length === 0,
+                  disabled:
+                    interfacesToDelete.length === 0 || !userCanUnassignLinodes,
                   label: 'Unassign Linodes',
                   loading: isSubmitting,
                   type: 'submit',
diff --git a/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.styles.ts b/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.styles.ts
index 3200024fb40..b87918de68d 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.styles.ts
+++ b/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.styles.ts
@@ -5,7 +5,7 @@ import { styled } from '@mui/material/styles';
 export const StyledActionButton = styled(Button, {
   label: 'StyledActionButton',
 })(({ theme }) => ({
-  '&:hover': {
+  '&:not([aria-disabled="true"]):hover': {
     backgroundColor: theme.color.blue,
     color: theme.tokens.color.Neutrals.White,
   },
diff --git a/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.test.tsx
index dcfdb252c5d..1a708ced2b6 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.test.tsx
@@ -16,6 +16,17 @@ const queryMocks = vi.hoisted(() => ({
   useVPCQuery: vi.fn().mockReturnValue({}),
   useFirewallSettingsQuery: vi.fn().mockReturnValue({}),
   useRegionsQuery: vi.fn().mockReturnValue({}),
+  userPermissions: vi.fn(() => ({
+    data: {
+      update_vpc: true,
+      delete_vpc: true,
+    },
+  })),
+  useQueryWithPermissions: vi.fn().mockReturnValue({
+    data: [],
+    isLoading: false,
+    isError: false,
+  }),
 }));
 
 vi.mock('@linode/queries', async () => {
@@ -39,6 +50,10 @@ vi.mock('@tanstack/react-router', async () => {
   };
 });
 
+vi.mock('src/features/IAM/hooks/usePermissions', () => ({
+  usePermissions: queryMocks.userPermissions,
+  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
+}));
 beforeAll(() => mockMatchMedia());
 
 describe('VPC Detail Summary section', () => {
@@ -192,4 +207,31 @@ describe('VPC Detail Summary section', () => {
       )
     ).toBeVisible();
   });
+  it('should disable actions if user does not have "update_vpc" or "delete_vpc" permissions', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        update_vpc: false,
+        delete_vpc: false,
+      },
+    });
+
+    const { getByText } = renderWithTheme(<VPCDetail />);
+
+    expect(getByText('Edit')).toBeDisabled();
+    expect(getByText('Delete')).toBeDisabled();
+  });
+
+  it('should enable actions if user has "update_vpc" or "delete_vpc" permissions', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        update_vpc: true,
+        delete_vpc: true,
+      },
+    });
+
+    const { getByText } = renderWithTheme(<VPCDetail />);
+
+    expect(getByText('Edit')).toBeEnabled();
+    expect(getByText('Delete')).toBeEnabled();
+  });
 });
diff --git a/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.tsx b/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.tsx
index 295b7bec2f1..db6c3f55310 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/VPCDetail.tsx
@@ -15,6 +15,7 @@ import { DismissibleBanner } from 'src/components/DismissibleBanner/DismissibleB
 import { DocumentTitleSegment } from 'src/components/DocumentTitle';
 import { EntityHeader } from 'src/components/EntityHeader/EntityHeader';
 import { LandingHeader } from 'src/components/LandingHeader';
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 import { LKE_ENTERPRISE_AUTOGEN_VPC_WARNING } from 'src/features/Kubernetes/constants';
 import { useIsNodebalancerVPCEnabled } from 'src/features/NodeBalancers/utils';
 import { VPC_DOCS_LINK, VPC_LABEL } from 'src/features/VPCs/constants';
@@ -54,6 +55,12 @@ const VPCDetail = () => {
 
   const { data: regions } = useRegionsQuery();
 
+  const { data: permissions } = usePermissions(
+    'vpc',
+    ['update_vpc', 'delete_vpc'],
+    vpcId
+  );
+
   const handleEditVPC = (vpc: VPC) => {
     navigate({
       params: { action: 'edit', vpcId: vpc.id },
@@ -166,10 +173,26 @@ const VPCDetail = () => {
           </Typography>
         </Box>
         <Box display="flex" justifyContent="end">
-          <StyledActionButton onClick={() => handleEditVPC(vpc)}>
+          <StyledActionButton
+            disabled={!permissions.update_vpc}
+            onClick={() => handleEditVPC(vpc)}
+            tooltipText={
+              !permissions.update_vpc
+                ? 'You do not have permission to edit this VPC.'
+                : undefined
+            }
+          >
             Edit
           </StyledActionButton>
-          <StyledActionButton onClick={() => handleDeleteVPC(vpc)}>
+          <StyledActionButton
+            disabled={!permissions.delete_vpc}
+            onClick={() => handleDeleteVPC(vpc)}
+            tooltipText={
+              !permissions.delete_vpc
+                ? 'You do not have permission to delete this VPC.'
+                : undefined
+            }
+          >
             Delete
           </StyledActionButton>
         </Box>
diff --git a/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.test.tsx b/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.test.tsx
index 9f15d1cd65a..27781782729 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.test.tsx
@@ -18,6 +18,16 @@ const queryMocks = vi.hoisted(() => ({
   useSearch: vi.fn().mockReturnValue({ query: undefined }),
   useSubnetsQuery: vi.fn().mockReturnValue({}),
   useFirewallSettingsQuery: vi.fn().mockReturnValue({}),
+  userPermissions: vi.fn(() => ({
+    data: {
+      create_vpc_subnet: true,
+    },
+  })),
+  useQueryWithPermissions: vi.fn().mockReturnValue({
+    data: [],
+    isLoading: false,
+    isError: false,
+  }),
 }));
 
 vi.mock('@tanstack/react-router', async () => {
@@ -36,7 +46,10 @@ vi.mock('@linode/queries', async () => {
     useFirewallSettingsQuery: queryMocks.useFirewallSettingsQuery,
   };
 });
-
+vi.mock('src/features/IAM/hooks/usePermissions', () => ({
+  usePermissions: queryMocks.userPermissions,
+  useQueryWithPermissions: queryMocks.useQueryWithPermissions,
+}));
 const loadingTestId = 'circle-progress';
 
 describe('VPC Subnets table', () => {
@@ -283,4 +296,43 @@ describe('VPC Subnets table', () => {
     },
     { timeout: 15_000 }
   );
+
+  it('should disable "Create Subnet" button when user does not have create_vpc_subnet permission', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        create_vpc_subnet: false,
+      },
+    });
+
+    const { getByText } = renderWithTheme(
+      <VPCSubnetsTable
+        isVPCLKEEnterpriseCluster={false}
+        vpcId={1}
+        vpcRegion=""
+      />
+    );
+
+    expect(getByText('Create Subnet')).toHaveAttribute('aria-disabled', 'true');
+  });
+
+  it('should enable "Create Subnet" button when user has create_vpc_subnet permission', async () => {
+    queryMocks.userPermissions.mockReturnValue({
+      data: {
+        create_vpc_subnet: true,
+      },
+    });
+
+    const { getByText } = renderWithTheme(
+      <VPCSubnetsTable
+        isVPCLKEEnterpriseCluster={false}
+        vpcId={1}
+        vpcRegion=""
+      />
+    );
+
+    expect(getByText('Create Subnet')).not.toHaveAttribute(
+      'aria-disabled',
+      'true'
+    );
+  });
 });
diff --git a/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.tsx b/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.tsx
index d5007bf2507..1447e41d0b4 100644
--- a/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.tsx
+++ b/packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.tsx
@@ -25,6 +25,7 @@ import { TableHead } from 'src/components/TableHead';
 import { TableRow } from 'src/components/TableRow';
 import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { TableSortCell } from 'src/components/TableSortCell';
+import { usePermissions } from 'src/features/IAM/hooks/usePermissions';
 import { PowerActionsDialog } from 'src/features/Linodes/PowerActionsDialogOrDrawer';
 import { useIsNodebalancerVPCEnabled } from 'src/features/NodeBalancers/utils';
 import { SubnetActionMenu } from 'src/features/VPCs/VPCDetail/SubnetActionMenu';
@@ -90,6 +91,12 @@ export const VPCSubnetsTable = (props: Props) => {
   const { isNodebalancerVPCEnabled } = useIsNodebalancerVPCEnabled();
   const { isDualStackEnabled } = useVPCDualStack();
 
+  const { data: permissions } = usePermissions(
+    'vpc',
+    ['create_vpc_subnet'],
+    vpcId
+  );
+
   const pagination = usePaginationV2({
     currentRoute: VPC_DETAILS_ROUTE,
     preferenceKey,
@@ -359,6 +366,7 @@ export const VPCSubnetsTable = (props: Props) => {
                     subnet={subnet}
                     subnetId={subnet.id}
                     subnetInterfaces={linodeInfo.interfaces}
+                    vpcId={vpcId}
                   />
                 ))
               ) : (
@@ -422,10 +430,16 @@ export const VPCSubnetsTable = (props: Props) => {
         />
         <Button
           buttonType="primary"
+          disabled={!permissions.create_vpc_subnet}
           onClick={handleSubnetCreate}
           sx={{
             marginBottom: theme.spacingFunction(16),
           }}
+          tooltipText={
+            !permissions.create_vpc_subnet
+              ? 'You do not have permission to create a VPC subnet.'
+              : undefined
+          }
         >
           Create Subnet
         </Button>
diff --git a/packages/manager/src/features/VPCs/VPCLanding/VPCRow.test.tsx b/packages/manager/src/features/VPCs/VPCLanding/VPCRow.test.tsx
index 3da8b5343c7..32f2f31e0cd 100644
--- a/packages/manager/src/features/VPCs/VPCLanding/VPCRow.test.tsx
+++ b/packages/manager/src/features/VPCs/VPCLanding/VPCRow.test.tsx
@@ -25,11 +25,11 @@ vi.mock('src/features/IAM/hooks/usePermissions', () => ({
 }));
 
 describe('VPC Table Row', () => {
-  it('should render a VPC row', () => {
+  it('should render a VPC row', async () => {
     const vpc = vpcFactory.build({ id: 24, subnets: [subnetFactory.build()] });
     resizeScreenSize(1600);
 
-    const { getByText } = renderWithTheme(
+    const { getByText, getByLabelText } = renderWithTheme(
       wrapWithTableBody(
         <VPCRow
           handleDeleteVPC={vi.fn()}
@@ -40,6 +40,8 @@ describe('VPC Table Row', () => {
       )
     );
 
+    const actionMenu = getByLabelText(`Action menu for VPC ${vpc.label}`);
+    await userEvent.click(actionMenu);
     // Check to see if the row rendered some data
     expect(getByText(vpc.label)).toBeVisible();
     expect(getByText(vpc.id)).toBeVisible();
@@ -52,7 +54,7 @@ describe('VPC Table Row', () => {
   it('should have a delete button that calls the provided callback when clicked', async () => {
     const vpc = vpcFactory.build();
     const handleDelete = vi.fn();
-    const { getByTestId } = renderWithTheme(
+    const { getByTestId, getByLabelText } = renderWithTheme(
       wrapWithTableBody(
         <VPCRow
           handleDeleteVPC={handleDelete}
@@ -62,6 +64,9 @@ describe('VPC Table Row', () => {
         />
       )
     );
+    const actionMenu = getByLabelText(`Action menu for VPC ${vpc.label}`);
+    await userEvent.click(actionMenu);
+
     const deleteBtn = getByTestId('Delete');
     await userEvent.click(deleteBtn);
     expect(handleDelete).toHaveBeenCalled();
@@ -70,7 +75,7 @@ describe('VPC Table Row', () => {
   it('should have an edit button that calls the provided callback when clicked', async () => {
     const vpc = vpcFactory.build();
     const handleEdit = vi.fn();
-    const { getByTestId } = renderWithTheme(
+    const { getByTestId, getByLabelText } = renderWithTheme(
       wrapWithTableBody(
         <VPCRow
           handleDeleteVPC={vi.fn()}
@@ -80,6 +85,9 @@ describe('VPC Table Row', () => {
         />
       )
     );
+    const actionMenu = getByLabelText(`Action menu for VPC ${vpc.label}`);
+    await userEvent.click(actionMenu);
+
     const editButton = getByTestId('Edit');
     await userEvent.click(editButton);
     expect(handleEdit).toHaveBeenCalled();
@@ -94,7 +102,7 @@ describe('VPC Table Row', () => {
     });
     const vpc = vpcFactory.build();
     const handleEdit = vi.fn();
-    const { getByTestId } = renderWithTheme(
+    const { getByTestId, getByLabelText } = renderWithTheme(
       wrapWithTableBody(
         <VPCRow
           handleDeleteVPC={vi.fn()}
@@ -104,10 +112,13 @@ describe('VPC Table Row', () => {
         />
       )
     );
+    const actionMenu = getByLabelText(`Action menu for VPC ${vpc.label}`);
+    await userEvent.click(actionMenu);
+
     const editButton = getByTestId('Edit');
-    expect(editButton).toBeDisabled();
+    expect(editButton).toHaveAttribute('aria-disabled', 'true');
     const deleteButton = getByTestId('Delete');
-    expect(deleteButton).toBeDisabled();
+    expect(deleteButton).toHaveAttribute('aria-disabled', 'true');
   });
   it('should enable "Edit" and "Delete" button if user has "update_vpc" and "delete_vpc" permissions', async () => {
     queryMocks.userPermissions.mockReturnValue({
@@ -118,7 +129,7 @@ describe('VPC Table Row', () => {
     });
     const vpc = vpcFactory.build();
     const handleEdit = vi.fn();
-    const { getByTestId } = renderWithTheme(
+    const { getByTestId, getByLabelText } = renderWithTheme(
       wrapWithTableBody(
         <VPCRow
           handleDeleteVPC={vi.fn()}
@@ -128,6 +139,9 @@ describe('VPC Table Row', () => {
         />
       )
     );
+    const actionMenu = getByLabelText(`Action menu for VPC ${vpc.label}`);
+    await userEvent.click(actionMenu);
+
     const editButton = getByTestId('Edit');
     expect(editButton).toBeEnabled();
     const deleteButton = getByTestId('Delete');
diff --git a/packages/manager/src/features/VPCs/VPCLanding/VPCRow.tsx b/packages/manager/src/features/VPCs/VPCLanding/VPCRow.tsx
index ad7ac6e70ca..eae57e2347a 100644
--- a/packages/manager/src/features/VPCs/VPCLanding/VPCRow.tsx
+++ b/packages/manager/src/features/VPCs/VPCLanding/VPCRow.tsx
@@ -2,7 +2,7 @@ import { useRegionsQuery } from '@linode/queries';
 import { Hidden } from '@linode/ui';
 import * as React from 'react';
 
-import { InlineMenuAction } from 'src/components/InlineMenuAction/InlineMenuAction';
+import { type Action, ActionMenu } from 'src/components/ActionMenu/ActionMenu';
 import { Link } from 'src/components/Link';
 import { TableCell } from 'src/components/TableCell';
 import { TableRow } from 'src/components/TableRow';
@@ -15,7 +15,6 @@ import {
 } from '../utils';
 
 import type { VPC } from '@linode/api-v4/lib/vpcs/types';
-import type { Action } from 'src/components/ActionMenu/ActionMenu';
 
 interface Props {
   handleDeleteVPC: () => void;
@@ -33,15 +32,18 @@ export const VPCRow = ({
   const { id, label, subnets } = vpc;
   const { data: regions } = useRegionsQuery();
 
+  const [isOpen, setIsOpen] = React.useState<boolean>(false);
+
   const regionLabel = regions?.find((r) => r.id === vpc.region)?.label ?? '';
   const numResources = isNodebalancerVPCEnabled
     ? getUniqueResourcesFromSubnets(vpc.subnets)
     : getUniqueLinodesFromSubnets(vpc.subnets);
 
-  const { data: permissions } = usePermissions(
+  const { data: permissions, isLoading } = usePermissions(
     'vpc',
     ['update_vpc', 'delete_vpc'],
-    vpc.id
+    vpc.id,
+    isOpen
   );
 
   const actions: Action[] = [
@@ -87,16 +89,12 @@ export const VPCRow = ({
         <TableCell>{numResources}</TableCell>
       </Hidden>
       <TableCell actionCell>
-        {actions.map((action) => (
-          <InlineMenuAction
-            actionText={action.title}
-            data-testid={action.title}
-            disabled={action.disabled}
-            key={action.title}
-            onClick={action.onClick}
-            tooltip={action.tooltip}
-          />
-        ))}
+        <ActionMenu
+          actionsList={actions}
+          ariaLabel={`Action menu for VPC ${vpc.label}`}
+          loading={isLoading}
+          onOpen={() => setIsOpen(true)}
+        />
       </TableCell>
     </TableRow>
   );
diff --git a/packages/manager/src/features/VPCs/components/VPCRangesDescription.tsx b/packages/manager/src/features/VPCs/components/VPCRangesDescription.tsx
index 4c1ee246cb8..e6d0b4df449 100644
--- a/packages/manager/src/features/VPCs/components/VPCRangesDescription.tsx
+++ b/packages/manager/src/features/VPCs/components/VPCRangesDescription.tsx
@@ -39,8 +39,8 @@ export const VPCIPv6RangesDescription = (props: TypographyProps) => {
 export const DualStackVPCRangesDescription = (props: TypographyProps) => {
   return (
     <Typography {...props}>
-      If you need more IPs, you can add IPv4 and IPv6 address ranges to let your
-      VPC connect to services running on this Linode.{' '}
+      You can add IPv4 and IPv6 address ranges to let your VPC connect to
+      services running on this Linode.{' '}
       <Link to={ASSIGN_COMPUTE_INSTANCE_TO_VPC_LINK}>Learn more</Link>.
     </Typography>
   );
diff --git a/packages/manager/src/features/VPCs/constants.tsx b/packages/manager/src/features/VPCs/constants.tsx
index 6a40c4217c4..2bb73f1fd31 100644
--- a/packages/manager/src/features/VPCs/constants.tsx
+++ b/packages/manager/src/features/VPCs/constants.tsx
@@ -1,4 +1,4 @@
-import { Typography } from '@linode/ui';
+import { Stack, Typography } from '@linode/ui';
 import React from 'react';
 
 import { Code } from 'src/components/Code/Code';
@@ -31,18 +31,20 @@ export const MULTIPLE_CONFIGURATIONS_MESSAGE =
 export const VPC_AUTO_ASSIGN_IPV4_TOOLTIP =
   'Automatically assign an IPv4 address as the private IP address for this Linode in the VPC.';
 
-export const VPC_AUTO_ASSIGN_IPV6_TOOLTIP = (
-  <Typography>
-    Automatically assign an IPv6 address from the subnet&rsquo;s allocated{' '}
-    <Code>/64</Code> prefix block.
-  </Typography>
-);
+export const VPC_IPV4_INPUT_HELPER_TEXT =
+  'Define an IP address derived from the subnet IPv4 range.';
+
+export const VPC_AUTO_ASSIGN_IPV6_TOOLTIP =
+  'Automatically assign an IPv6 address for this Linode in the VPC.';
+
+export const VPC_IPV6_INPUT_HELPER_TEXT =
+  'Define a /64 prefix derived from the subnet IPv6 range.';
 
 export const CANNOT_CREATE_VPC_MESSAGE =
   "You don't have permissions to create a new VPC. Please contact an account administrator for details.";
 
 export const VPC_CREATE_FORM_SUBNET_HELPER_TEXT =
-  'Each VPC can further segment itself into distinct networks through the use of multiple subnets. These subnets can isolate various functionality of an application.';
+  'A VPC can be divided into multiple subnets to create isolated network segments. Subnets help separate different parts of your application, such as databases, frontend services, and backend services.';
 
 export const VPC_CREATE_FORM_VPC_HELPER_TEXT =
   'A VPC is an isolated network that enables private communication between Compute Instances within the same data center.';
@@ -59,11 +61,27 @@ export const ASSIGN_IP_RANGES_TITLE = 'Assign additional IP ranges';
 export const PUBLIC_IPV4_ACCESS_CHECKBOX_TOOLTIP =
   'Allow IPv4 access to the internet using 1:1 NAT on the VPC interface.';
 
-export const PUBLIC_IPV6_ACCESS_CHECKBOX_TOOLTIP =
-  "To enable IPv6 internet access, assign a globally routed IPv6 prefix to the subnet and enable the interface's Public setting.";
+export const PUBLIC_IPV6_ACCESS_CHECKBOX_TOOLTIP = (
+  <Stack spacing={2}>
+    <Typography component="span">
+      Enable to allow two-way IPv6 traffic between your VPC and the internet.
+    </Typography>
+    <Typography component="span">
+      Disable to restrict IPv6 traffic to within the VPC.
+    </Typography>
+    <Typography component="span">
+      When enabled, Linodes will be publicly reachable over IPv6 unless
+      restricted by a Cloud Firewall.
+    </Typography>
+  </Stack>
+);
 
-export const RFC1918HelperText =
-  'The VPC can use the entire RFC 1918 specified range for subnetting except for 192.168.128.0/17.';
+export const RFC1918HelperText = (
+  <Typography component="span">
+    VPCs can use the full RFC 1918 private IP address range for subnetting,
+    except for <Code>192.168.128.0/17</Code>, which is reserved.
+  </Typography>
+);
 
 // Linode Config dialog helper text for unrecommended configurations
 export const LINODE_UNREACHABLE_HELPER_TEXT =
diff --git a/packages/manager/src/features/VPCs/utils.test.ts b/packages/manager/src/features/VPCs/utils.test.ts
index bf5e3997a9b..0d6682a0337 100644
--- a/packages/manager/src/features/VPCs/utils.test.ts
+++ b/packages/manager/src/features/VPCs/utils.test.ts
@@ -12,7 +12,6 @@ import {
 } from 'src/factories/subnets';
 
 import {
-  generateVPCIPv6InputHelperText,
   getLinodeInterfaceIPv4Ranges,
   getLinodeInterfacePrimaryIPv4,
   getUniqueLinodesFromSubnets,
@@ -385,18 +384,3 @@ describe('transformLinodeInterfaceErrorsToFormikErrors', () => {
     ]);
   });
 });
-
-describe('generateVPCIPv6InputHelperText', () => {
-  it('returns null when subnetIPv6Range is falsy', () => {
-    expect(generateVPCIPv6InputHelperText(undefined)).toBeNull();
-    expect(generateVPCIPv6InputHelperText('')).toBeNull();
-  });
-
-  it('returns helper text that correctly represents the number of fixed hextets', () => {
-    const result = generateVPCIPv6InputHelperText('2600:3c03::/64');
-    expect(result).toBe('The first 4 hextets of 2600:3c03::/64 are fixed.');
-
-    const result2 = generateVPCIPv6InputHelperText('2600:3c03::/56');
-    expect(result2).toBe('The first 3.5 hextets of 2600:3c03::/56 are fixed.');
-  });
-});
diff --git a/packages/manager/src/features/VPCs/utils.ts b/packages/manager/src/features/VPCs/utils.ts
index 6d4057c487a..5e96fb4388e 100644
--- a/packages/manager/src/features/VPCs/utils.ts
+++ b/packages/manager/src/features/VPCs/utils.ts
@@ -240,15 +240,3 @@ export const transformLinodeInterfaceErrorsToFormikErrors = (
 
   return errors;
 };
-
-export const generateVPCIPv6InputHelperText = (subnetIPv6Range?: string) => {
-  if (!subnetIPv6Range) {
-    return null;
-  }
-
-  const [, ipv6Mask] = subnetIPv6Range.split('/');
-
-  const fixedHextets = Number(ipv6Mask) / 16;
-
-  return `The first ${fixedHextets} hextets of ${subnetIPv6Range} are fixed.`;
-};
diff --git a/packages/manager/src/features/Volumes/Dialogs/DeleteVolumeDialog.tsx b/packages/manager/src/features/Volumes/Dialogs/DeleteVolumeDialog.tsx
index 13c4a5b65e4..938da3ddabf 100644
--- a/packages/manager/src/features/Volumes/Dialogs/DeleteVolumeDialog.tsx
+++ b/packages/manager/src/features/Volumes/Dialogs/DeleteVolumeDialog.tsx
@@ -9,13 +9,15 @@ import type { APIError, Volume } from '@linode/api-v4';
 interface Props {
   isFetching?: boolean;
   onClose: () => void;
+  onDeleteSuccess?: () => void;
   open: boolean;
   volume: undefined | Volume;
   volumeError?: APIError[] | null;
 }
 
 export const DeleteVolumeDialog = (props: Props) => {
-  const { isFetching, onClose, open, volume, volumeError } = props;
+  const { isFetching, onClose, onDeleteSuccess, open, volume, volumeError } =
+    props;
 
   const {
     error,
@@ -27,7 +29,12 @@ export const DeleteVolumeDialog = (props: Props) => {
 
   const onDelete = () => {
     deleteVolume({ id: volume?.id ?? -1 }).then(() => {
-      onClose();
+      if (onDeleteSuccess) {
+        onDeleteSuccess();
+      } else {
+        onClose();
+      }
+
       checkForNewEvents();
     });
   };
diff --git a/packages/manager/src/features/Volumes/Partials/VolumesActionMenu.tsx b/packages/manager/src/features/Volumes/Partials/VolumesActionMenu.tsx
index 2452ba4f9b2..5da3152a1ae 100644
--- a/packages/manager/src/features/Volumes/Partials/VolumesActionMenu.tsx
+++ b/packages/manager/src/features/Volumes/Partials/VolumesActionMenu.tsx
@@ -72,6 +72,13 @@ export const VolumesActionMenu = (props: Props) => {
       disabled: !volumePermissions?.update_volume,
       onClick: handlers.handleManageTags,
       title: 'Manage Tags',
+      tooltip: !volumePermissions?.update_volume
+        ? getRestrictedResourceText({
+            action: 'edit',
+            isSingular: true,
+            resourceType: 'Volumes',
+          })
+        : undefined,
     },
     RESIZE: {
       disabled: !volumePermissions?.resize_volume,
diff --git a/packages/manager/src/features/Volumes/VolumeCreate.tsx b/packages/manager/src/features/Volumes/VolumeCreate.tsx
index 498c5995610..a49d2a1d4e6 100644
--- a/packages/manager/src/features/Volumes/VolumeCreate.tsx
+++ b/packages/manager/src/features/Volumes/VolumeCreate.tsx
@@ -170,22 +170,6 @@ export const VolumeCreate = () => {
       )
       .map((thisRegion) => thisRegion.id) ?? [];
 
-  const renderSelectTooltip = (tooltipText: string) => {
-    return (
-      <TooltipIcon
-        classes={{ popper: classes.tooltip }}
-        status="info"
-        sxTooltipIcon={{
-          marginBottom: '6px',
-          marginLeft: theme.spacing(),
-          padding: 0,
-        }}
-        text={tooltipText}
-        tooltipPosition="right"
-      />
-    );
-  };
-
   const { enqueueSnackbar } = useSnackbar();
 
   const {
@@ -426,12 +410,10 @@ export const VolumeCreate = () => {
                 onBlur={handleBlur}
                 onChange={(e, region) => handleRegionChange(region)}
                 regions={regions ?? []}
+                tooltipText="Volumes must be created in a region. You can choose to create a Volume in a region and attach it later to a Linode in the same region."
                 value={values.region}
                 width={400}
               />
-              {renderSelectTooltip(
-                'Volumes must be created in a region. You can choose to create a Volume in a region and attach it later to a Linode in the same region.'
-              )}
             </Box>
             <Box
               alignItems="baseline"
@@ -472,9 +454,12 @@ export const VolumeCreate = () => {
                     }}
                     value={values.linode_id}
                   />
-                  {renderSelectTooltip(
-                    'If you select a Linode, the Volume will be automatically created in that Linode’s region and attached upon creation.'
-                  )}
+                  <TooltipIcon
+                    placement="right"
+                    status="info"
+                    sxTooltipIcon={{ position: 'relative', top: 4 }}
+                    text="If you select a Linode, the Volume will be automatically created in that Linode’s region and attached upon creation."
+                  />
                 </Box>
                 {shouldDisplayClientLibraryCopy &&
                   values.encryption === 'enabled' && (
diff --git a/packages/manager/src/features/Volumes/VolumeDetails/VolumeDetails.tsx b/packages/manager/src/features/Volumes/VolumeDetails/VolumeDetails.tsx
index d29983324a9..9a500492981 100644
--- a/packages/manager/src/features/Volumes/VolumeDetails/VolumeDetails.tsx
+++ b/packages/manager/src/features/Volumes/VolumeDetails/VolumeDetails.tsx
@@ -36,6 +36,13 @@ export const VolumeDetails = () => {
     return <CircleProgress />;
   }
 
+  const navigateToVolumes = () => {
+    navigate({
+      search: (prev) => prev,
+      to: '/volumes',
+    });
+  };
+
   const navigateToVolumeSummary = () => {
     navigate({
       search: (prev) => prev,
@@ -62,7 +69,10 @@ export const VolumeDetails = () => {
         </React.Suspense>
       </Tabs>
 
-      <VolumeDrawers onCloseHandler={navigateToVolumeSummary} />
+      <VolumeDrawers
+        onCloseHandler={navigateToVolumeSummary}
+        onDeleteSuccessHandler={navigateToVolumes}
+      />
     </>
   );
 };
diff --git a/packages/manager/src/features/Volumes/VolumeDetails/VolumeDetailsHeader.tsx b/packages/manager/src/features/Volumes/VolumeDetails/VolumeDetailsHeader.tsx
index a717462fd9f..8420243d2cb 100644
--- a/packages/manager/src/features/Volumes/VolumeDetails/VolumeDetailsHeader.tsx
+++ b/packages/manager/src/features/Volumes/VolumeDetails/VolumeDetailsHeader.tsx
@@ -28,7 +28,7 @@ export const VolumeDetailsHeader = ({ volume }: Props) => {
         pathname: `/volumes/${volume.label}`,
       }}
       docsLabel="Getting Started"
-      docsLink="https://techdocs.akamai.com/cloud-computing/docs/faqs-for-compute-instances"
+      docsLink="https://techdocs.akamai.com/cloud-computing/docs/block-storage"
       entity="Volume"
       spacingBottom={16}
     />
diff --git a/packages/manager/src/features/Volumes/VolumeDrawers/VolumeDrawers.tsx b/packages/manager/src/features/Volumes/VolumeDrawers/VolumeDrawers.tsx
index 409617819e7..6745c377f16 100644
--- a/packages/manager/src/features/Volumes/VolumeDrawers/VolumeDrawers.tsx
+++ b/packages/manager/src/features/Volumes/VolumeDrawers/VolumeDrawers.tsx
@@ -14,9 +14,13 @@ import { VolumeDetailsDrawer } from './VolumeDetailsDrawer';
 
 interface Props {
   onCloseHandler: () => void;
+  onDeleteSuccessHandler: () => void;
 }
 
-export const VolumeDrawers = ({ onCloseHandler }: Props) => {
+export const VolumeDrawers = ({
+  onCloseHandler,
+  onDeleteSuccessHandler,
+}: Props) => {
   const params = useParams({ strict: false });
 
   const {
@@ -85,6 +89,7 @@ export const VolumeDrawers = ({ onCloseHandler }: Props) => {
       <DeleteVolumeDialog
         isFetching={isFetchingVolume}
         onClose={onCloseHandler}
+        onDeleteSuccess={onDeleteSuccessHandler}
         open={params.action === 'delete'}
         volume={selectedVolume}
         volumeError={selectedVolumeError}
diff --git a/packages/manager/src/features/Volumes/VolumesLanding.tsx b/packages/manager/src/features/Volumes/VolumesLanding.tsx
index 6f68d9814ab..cf19495a868 100644
--- a/packages/manager/src/features/Volumes/VolumesLanding.tsx
+++ b/packages/manager/src/features/Volumes/VolumesLanding.tsx
@@ -235,7 +235,10 @@ export const VolumesLanding = () => {
         pageSize={pagination.pageSize}
       />
 
-      <VolumeDrawers onCloseHandler={navigateToVolumes} />
+      <VolumeDrawers
+        onCloseHandler={navigateToVolumes}
+        onDeleteSuccessHandler={navigateToVolumes}
+      />
     </Stack>
   );
 };
diff --git a/packages/manager/src/mocks/mockState.ts b/packages/manager/src/mocks/mockState.ts
index 2a6d78f4d1e..c6b05eacaee 100644
--- a/packages/manager/src/mocks/mockState.ts
+++ b/packages/manager/src/mocks/mockState.ts
@@ -22,11 +22,14 @@ export const getStateSeederGroups = (
 };
 
 export const emptyStore: MockState = {
+  childAccounts: [],
   cloudnats: [],
   configInterfaces: [],
+  delegations: [],
   destinations: [],
   domainRecords: [],
   domains: [],
+  entities: [],
   eventQueue: [],
   firewallDevices: [],
   firewalls: [],
diff --git a/packages/manager/src/mocks/presets/baseline/crud.ts b/packages/manager/src/mocks/presets/baseline/crud.ts
index 51b4519e118..c6140d30212 100644
--- a/packages/manager/src/mocks/presets/baseline/crud.ts
+++ b/packages/manager/src/mocks/presets/baseline/crud.ts
@@ -6,7 +6,9 @@ import {
 import { linodeCrudPreset } from 'src/mocks/presets/crud/linodes';
 
 import { cloudNATCrudPreset } from '../crud/cloudnats';
+import { childAccountsCrudPreset } from '../crud/delegation';
 import { domainCrudPreset } from '../crud/domains';
+import { entityCrudPreset } from '../crud/entities';
 import { firewallCrudPreset } from '../crud/firewalls';
 import { kubernetesCrudPreset } from '../crud/kubernetes';
 import { nodeBalancerCrudPreset } from '../crud/nodebalancers';
@@ -21,9 +23,11 @@ import type { MockPresetBaseline } from 'src/mocks/types';
 export const baselineCrudPreset: MockPresetBaseline = {
   group: { id: 'General' },
   handlers: [
+    ...childAccountsCrudPreset.handlers,
     ...cloudNATCrudPreset.handlers,
     ...domainCrudPreset.handlers,
     ...deliveryCrudPreset.handlers,
+    ...entityCrudPreset.handlers,
     ...firewallCrudPreset.handlers,
     ...kubernetesCrudPreset.handlers,
     ...linodeCrudPreset.handlers,
diff --git a/packages/manager/src/mocks/presets/crud/delegation.ts b/packages/manager/src/mocks/presets/crud/delegation.ts
new file mode 100644
index 00000000000..fc3a6ad52b6
--- /dev/null
+++ b/packages/manager/src/mocks/presets/crud/delegation.ts
@@ -0,0 +1,24 @@
+import {
+  childAccountDelegates,
+  defaultDelegationAccess,
+  delegatedChildAccounts,
+  generateChildAccountToken,
+  getChildAccounts,
+  getDelegatedChildAccountsForUser,
+} from 'src/mocks/presets/crud/handlers/delegation';
+
+import type { MockPresetCrud } from 'src/mocks/types';
+
+export const childAccountsCrudPreset: MockPresetCrud = {
+  group: { id: 'Child Accounts' },
+  handlers: [
+    getChildAccounts,
+    getDelegatedChildAccountsForUser,
+    childAccountDelegates,
+    delegatedChildAccounts,
+    generateChildAccountToken,
+    defaultDelegationAccess,
+  ],
+  id: 'child-accounts:crud',
+  label: 'Child Accounts CRUD',
+};
diff --git a/packages/manager/src/mocks/presets/crud/entities.ts b/packages/manager/src/mocks/presets/crud/entities.ts
new file mode 100644
index 00000000000..fa735b49440
--- /dev/null
+++ b/packages/manager/src/mocks/presets/crud/entities.ts
@@ -0,0 +1,10 @@
+import { getEntities } from 'src/mocks/presets/crud/handlers/entities';
+
+import type { MockPresetCrud } from 'src/mocks/types';
+
+export const entityCrudPreset: MockPresetCrud = {
+  group: { id: 'Entities' },
+  handlers: [getEntities],
+  id: 'entities:crud',
+  label: 'Entities CRUD',
+};
diff --git a/packages/manager/src/mocks/presets/crud/handlers/delegation.ts b/packages/manager/src/mocks/presets/crud/handlers/delegation.ts
new file mode 100644
index 00000000000..35901534041
--- /dev/null
+++ b/packages/manager/src/mocks/presets/crud/handlers/delegation.ts
@@ -0,0 +1,318 @@
+import { http } from 'msw';
+
+import { accountFactory } from 'src/factories/account';
+import { mswDB } from 'src/mocks/indexedDB';
+import {
+  makeNotFoundResponse,
+  makePaginatedResponse,
+  makeResponse,
+} from 'src/mocks/utilities/response';
+
+import type {
+  Account,
+  ChildAccount,
+  IamUserRoles,
+  Token,
+} from '@linode/api-v4';
+import type { StrictResponse } from 'msw';
+import type { MockState } from 'src/mocks/types';
+import type {
+  APIErrorResponse,
+  APIPaginatedResponse,
+} from 'src/mocks/utilities/response';
+
+export const getChildAccounts = () => [
+  http.get(
+    '*/v4*/iam/delegation/child-accounts*',
+    async ({
+      request,
+    }): Promise<
+      StrictResponse<APIErrorResponse | APIPaginatedResponse<ChildAccount>>
+    > => {
+      const childAccounts = await mswDB.getAll('childAccounts');
+      const delegations = await mswDB.getAll('delegations');
+      const withUsers = request.url.includes('users=true');
+
+      if (!childAccounts || !delegations) {
+        return makeNotFoundResponse();
+      }
+
+      return makePaginatedResponse({
+        data: childAccounts.map((account) => ({
+          ...account,
+          users: withUsers
+            ? delegations
+                .filter((d) => d.childAccountEuuid === account.euuid)
+                .map((d) => d.username)
+            : undefined,
+        })),
+        request,
+      });
+    }
+  ),
+
+  http.get(
+    '*/v4*/iam/delegation/child-accounts/:id',
+    async ({
+      params,
+    }): Promise<StrictResponse<APIErrorResponse | ChildAccount>> => {
+      const id = Number(params.id);
+      const entity = await mswDB.get('childAccounts', id);
+
+      if (!entity) {
+        return makeNotFoundResponse();
+      }
+
+      return makeResponse(entity);
+    }
+  ),
+];
+
+export const getDelegatedChildAccountsForUser = () => [
+  http.get(
+    '*/v4*/iam/delegation/users/:username/child-accounts',
+    async ({
+      params,
+      request,
+    }): Promise<
+      StrictResponse<APIErrorResponse | APIPaginatedResponse<ChildAccount>>
+    > => {
+      const username = params.username;
+      const delegations = await mswDB.getAll('delegations');
+      const childAccounts = await mswDB.getAll('childAccounts');
+
+      if (!childAccounts || !delegations) {
+        return makeNotFoundResponse();
+      }
+
+      const userDelegations = delegations.filter(
+        (d) => d.username === username
+      );
+
+      return makePaginatedResponse({
+        data: childAccounts.filter((account) =>
+          userDelegations.some((d) => d.childAccountEuuid === account.euuid)
+        ),
+        request,
+      });
+    }
+  ),
+];
+
+export const childAccountDelegates = (mockState: MockState) => [
+  http.get(
+    '*/v4*/iam/delegation/child-accounts/:euuid/users',
+    async ({
+      params,
+      request,
+    }): Promise<
+      StrictResponse<APIErrorResponse | APIPaginatedResponse<string>>
+    > => {
+      const euuid = params.euuid as string;
+      const delegations = await mswDB.getAll('delegations');
+
+      if (!delegations) {
+        return makeNotFoundResponse();
+      }
+
+      // Get all usernames delegated to this specific child account
+      const delegateUsernames = delegations
+        .filter((d) => d.childAccountEuuid === euuid)
+        .map((d) => d.username);
+
+      return makePaginatedResponse({
+        data: delegateUsernames,
+        request,
+      });
+    }
+  ),
+
+  http.put(
+    '*/v4*/iam/delegation/child-accounts/:euuid/users',
+    async ({
+      params,
+      request,
+    }): Promise<
+      StrictResponse<APIErrorResponse | APIPaginatedResponse<string>>
+    > => {
+      const euuid = params.euuid as string;
+      const requestData = (await request.json()) as { users: string[] };
+      const newUsernames = requestData?.users || [];
+
+      // Get current delegations
+      const allDelegations = await mswDB.getAll('delegations');
+      if (!allDelegations) {
+        return makeNotFoundResponse();
+      }
+
+      // Find and delete delegations for this child account
+      const delegationsToDelete = allDelegations.filter(
+        (d) => d.childAccountEuuid === euuid
+      );
+
+      for (const delegation of delegationsToDelete) {
+        await mswDB.delete('delegations', delegation.id, mockState);
+      }
+
+      // Add new delegations
+      for (const username of newUsernames) {
+        await mswDB.add(
+          'delegations',
+          {
+            childAccountEuuid: euuid,
+            username,
+            id: Math.floor(Math.random() * 1000000),
+          },
+          mockState
+        );
+      }
+
+      return makePaginatedResponse({
+        data: newUsernames,
+        request,
+      });
+    }
+  ),
+];
+
+export const delegatedChildAccounts = () => [
+  http.get(
+    '*/v4*/iam/delegation/profile/child-accounts',
+    async ({
+      request,
+    }): Promise<
+      StrictResponse<APIErrorResponse | APIPaginatedResponse<Account>>
+    > => {
+      // For mocking purposes, we'll simulate getting the current user's delegated accounts
+      // In real implementation, this would use authentication context
+      const delegations = await mswDB.getAll('delegations');
+      const childAccounts = await mswDB.getAll('childAccounts');
+
+      if (!childAccounts) {
+        return makeNotFoundResponse();
+      }
+
+      const allDelegations = await mswDB.getAll('delegations');
+      const mockCurrentUser = allDelegations?.[0]?.username || 'mockuser';
+      const userDelegations = delegations?.filter(
+        (d) => d.username === mockCurrentUser
+      );
+
+      const delegatedAccounts = childAccounts
+        .filter((account) =>
+          userDelegations?.some((d) => d.childAccountEuuid === account.euuid)
+        )
+        .map((childAccount) => ({
+          ...accountFactory.build({
+            company: childAccount.company,
+            euuid: childAccount.euuid,
+          }),
+          ...childAccount,
+        }));
+
+      return makePaginatedResponse({
+        data: delegatedAccounts,
+        request,
+      });
+    }
+  ),
+
+  http.get(
+    '*/v4*/iam/delegation/profile/child-accounts/:euuid',
+    async ({ params }): Promise<StrictResponse<Account | APIErrorResponse>> => {
+      const euuid = params.euuid as string;
+      const childAccount = await mswDB.getAll('childAccounts');
+
+      if (!childAccount) {
+        return makeNotFoundResponse();
+      }
+
+      const account = childAccount.find((acc) => acc.euuid === euuid);
+
+      if (!account) {
+        return makeNotFoundResponse();
+      }
+
+      // Convert ChildAccount to full Account
+      const fullAccount = {
+        ...accountFactory.build({
+          company: account.company,
+          euuid: account.euuid,
+        }),
+        ...account,
+      };
+
+      return makeResponse(fullAccount);
+    }
+  ),
+];
+
+export const generateChildAccountToken = () => [
+  http.post(
+    '*/v4*/iam/delegation/profile/child-accounts/:euuid/token',
+    async ({ params }): Promise<StrictResponse<APIErrorResponse | Token>> => {
+      const euuid = params.euuid as string;
+
+      // Verify the child account exists
+      const childAccounts = await mswDB.getAll('childAccounts');
+      if (!childAccounts?.some((acc) => acc.euuid === euuid)) {
+        return makeNotFoundResponse();
+      }
+
+      // Generate mock token
+      const mockToken: Token = {
+        id: Math.floor(Math.random() * 10000),
+        created: new Date().toISOString(),
+        expiry: new Date(Date.now() + 24 * 60 * 60 * 1000).toISOString(), // 24 hours
+        label: `Child Account Token - ${euuid}`,
+        scopes: '*',
+        token: `mock_token_${euuid}_${Date.now()}`,
+      };
+
+      return makeResponse(mockToken);
+    }
+  ),
+];
+
+export const defaultDelegationAccess = () => [
+  http.get(
+    '*/v4*/iam/delegation/default-role-permissions',
+    async (): Promise<StrictResponse<APIErrorResponse | IamUserRoles>> => {
+      // Mock default delegation access
+      const mockDefaultAccess: IamUserRoles = {
+        account_access: [
+          'account_linode_admin',
+          'account_linode_creator',
+          'account_firewall_creator',
+        ],
+        entity_access: [
+          {
+            id: 12345678,
+            type: 'linode' as const,
+            roles: ['linode_contributor'],
+          },
+          {
+            id: 45678901,
+            type: 'firewall' as const,
+            roles: ['firewall_admin'],
+          },
+        ],
+      };
+
+      return makeResponse(mockDefaultAccess);
+    }
+  ),
+
+  http.put(
+    '*/v4*/iam/delegation/default-role-permissions',
+    async ({
+      request,
+    }): Promise<StrictResponse<APIErrorResponse | IamUserRoles>> => {
+      const requestData = (await request.json()) as IamUserRoles;
+
+      // In a real implementation, you'd validate and store this
+      // For mocking, just return what was sent
+      return makeResponse(requestData);
+    }
+  ),
+];
diff --git a/packages/manager/src/mocks/presets/crud/handlers/delivery.ts b/packages/manager/src/mocks/presets/crud/handlers/delivery.ts
index c7ae5c8ad5b..b8dcf4a8cd0 100644
--- a/packages/manager/src/mocks/presets/crud/handlers/delivery.ts
+++ b/packages/manager/src/mocks/presets/crud/handlers/delivery.ts
@@ -1,3 +1,4 @@
+import { destinationType } from '@linode/api-v4';
 import { DateTime } from 'luxon';
 import { http } from 'msw';
 
@@ -11,7 +12,12 @@ import {
   makeResponse,
 } from 'src/mocks/utilities/response';
 
-import type { Destination, Stream } from '@linode/api-v4';
+import type {
+  CreateDestinationPayload,
+  Destination,
+  LinodeObjectStorageDetails,
+  Stream,
+} from '@linode/api-v4';
 import type { StrictResponse } from 'msw';
 import type { MockState } from 'src/mocks/types';
 import type {
@@ -67,7 +73,7 @@ export const createStreams = (mockState: MockState) => [
         destinations: payload['destinations'].map((destinationId: number) =>
           destinations?.find(({ id }) => id === destinationId)
         ),
-        details: payload['details'],
+        details: payload['details'] ?? null,
         created: DateTime.now().toISO(),
         updated: DateTime.now().toISO(),
       });
@@ -214,11 +220,17 @@ export const createDestinations = (mockState: MockState) => [
     async ({
       request,
     }): Promise<StrictResponse<APIErrorResponse | Destination>> => {
-      const payload = await request.clone().json();
+      const payload: CreateDestinationPayload = await request.clone().json();
+      const details = payload.details;
       const destination = destinationFactory.build({
-        label: payload['label'],
-        type: payload['type'],
-        details: payload['details'],
+        label: payload.label,
+        type: payload.type,
+        details: {
+          ...details,
+          ...(payload.type === destinationType.LinodeObjectStorage
+            ? { path: (details as LinodeObjectStorageDetails).path ?? null }
+            : {}),
+        },
         created: DateTime.now().toISO(),
         updated: DateTime.now().toISO(),
       });
diff --git a/packages/manager/src/mocks/presets/crud/handlers/entities.ts b/packages/manager/src/mocks/presets/crud/handlers/entities.ts
new file mode 100644
index 00000000000..f39ae9e6b81
--- /dev/null
+++ b/packages/manager/src/mocks/presets/crud/handlers/entities.ts
@@ -0,0 +1,50 @@
+import { http } from 'msw';
+
+import { mswDB } from 'src/mocks/indexedDB';
+import {
+  makeNotFoundResponse,
+  makePaginatedResponse,
+  makeResponse,
+} from 'src/mocks/utilities/response';
+
+import type { Entity } from '@linode/api-v4';
+import type { StrictResponse } from 'msw';
+import type {
+  APIErrorResponse,
+  APIPaginatedResponse,
+} from 'src/mocks/utilities/response';
+
+export const getEntities = () => [
+  http.get(
+    '*/v4*/entities',
+    async ({
+      request,
+    }): Promise<
+      StrictResponse<APIErrorResponse | APIPaginatedResponse<Entity>>
+    > => {
+      const entities = await mswDB.getAll('entities');
+
+      if (!entities) {
+        return makeNotFoundResponse();
+      }
+      return makePaginatedResponse({
+        data: entities,
+        request,
+      });
+    }
+  ),
+
+  http.get(
+    '*/v4*/entities/:id',
+    async ({ params }): Promise<StrictResponse<APIErrorResponse | Entity>> => {
+      const id = Number(params.id);
+      const entity = await mswDB.get('entities', id);
+
+      if (!entity) {
+        return makeNotFoundResponse();
+      }
+
+      return makeResponse(entity);
+    }
+  ),
+];
diff --git a/packages/manager/src/mocks/presets/crud/seeds/delegation.ts b/packages/manager/src/mocks/presets/crud/seeds/delegation.ts
new file mode 100644
index 00000000000..b35a6d8a2f5
--- /dev/null
+++ b/packages/manager/src/mocks/presets/crud/seeds/delegation.ts
@@ -0,0 +1,57 @@
+import {
+  childAccountFactory,
+  mockDelegateUsersList,
+  pickRandomMultiple,
+} from '@linode/utilities';
+
+import { getSeedsCountMap } from 'src/dev-tools/utils';
+import { mswDB } from 'src/mocks/indexedDB';
+
+import type { MockSeeder, MockState } from 'src/mocks/types';
+
+export const delegationSeeder: MockSeeder = {
+  canUpdateCount: true,
+  desc: 'Child Accounts and Delegations Seeds',
+  group: { id: 'Child Accounts' },
+  id: 'child-accounts:crud',
+  label: 'Child Accounts & Delegations',
+
+  seeder: async (mockState: MockState) => {
+    const seedsCountMap = getSeedsCountMap();
+    const count = seedsCountMap[delegationSeeder.id] ?? 3; // Default to 3 child accounts
+
+    // 1. Seed Child Accounts (basic account info only)
+    const childAccounts = childAccountFactory.buildList(count);
+
+    // 2. Seed Delegations (many-to-many relationships)
+    const delegations = [];
+    let delegationId = 1;
+
+    for (const childAccount of childAccounts) {
+      // Randomly assign 1-3 users to each child account
+      const numDelegates = Math.floor(Math.random() * 3) + 1;
+      const selectedUsers = pickRandomMultiple(
+        mockDelegateUsersList,
+        numDelegates
+      );
+
+      for (const username of selectedUsers) {
+        delegations.push({
+          id: delegationId++,
+          childAccountEuuid: childAccount.euuid,
+          username,
+        });
+      }
+    }
+
+    const updatedMockState = {
+      ...mockState,
+      childAccounts: mockState.childAccounts.concat(childAccounts),
+      delegations: mockState.delegations.concat(delegations),
+    };
+
+    await mswDB.saveStore(updatedMockState, 'seedState');
+
+    return updatedMockState;
+  },
+};
diff --git a/packages/manager/src/mocks/presets/crud/seeds/entities.ts b/packages/manager/src/mocks/presets/crud/seeds/entities.ts
new file mode 100644
index 00000000000..7bbfd8c9cbc
--- /dev/null
+++ b/packages/manager/src/mocks/presets/crud/seeds/entities.ts
@@ -0,0 +1,28 @@
+import { getSeedsCountMap } from 'src/dev-tools/utils';
+import { entityFactory } from 'src/factories';
+import { mswDB } from 'src/mocks/indexedDB';
+
+import type { MockSeeder, MockState } from 'src/mocks/types';
+
+export const entitiesSeeder: MockSeeder = {
+  canUpdateCount: true,
+  desc: 'Entities Seeds',
+  group: { id: 'Entities' },
+  id: 'entities:crud',
+  label: 'Entities',
+
+  seeder: async (mockState: MockState) => {
+    const seedsCountMap = getSeedsCountMap();
+    const count = seedsCountMap[entitiesSeeder.id] ?? 0;
+    const entities = entityFactory.buildList(count);
+
+    const updatedMockState = {
+      ...mockState,
+      entities: mockState.entities.concat(entities),
+    };
+
+    await mswDB.saveStore(updatedMockState, 'seedState');
+
+    return updatedMockState;
+  },
+};
diff --git a/packages/manager/src/mocks/presets/crud/seeds/index.ts b/packages/manager/src/mocks/presets/crud/seeds/index.ts
index c46a700914a..6d82f0d18f1 100644
--- a/packages/manager/src/mocks/presets/crud/seeds/index.ts
+++ b/packages/manager/src/mocks/presets/crud/seeds/index.ts
@@ -1,5 +1,7 @@
 import { cloudNATSeeder } from './cloudnats';
+import { delegationSeeder } from './delegation';
 import { domainSeeder } from './domains';
+import { entitiesSeeder } from './entities';
 import { firewallSeeder } from './firewalls';
 import { kubernetesSeeder } from './kubernetes';
 import { linodesSeeder } from './linodes';
@@ -12,7 +14,9 @@ import { vpcSeeder } from './vpcs';
 
 export const dbSeeders = [
   cloudNATSeeder,
+  delegationSeeder,
   domainSeeder,
+  entitiesSeeder,
   firewallSeeder,
   ipAddressSeeder,
   kubernetesSeeder,
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index 35dab25ceb8..f7871b31f79 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -195,9 +195,17 @@ const makeMockDatabase = (params: PathParams): Database => {
     db.ssl_connection = true;
   }
   const database = databaseFactory.build(db);
+
   if (database.platform !== 'rdbms-default') {
     delete database.private_network;
   }
+
+  if (database.platform === 'rdbms-default' && !!database.private_network) {
+    // When a database is configured with a VPC, the primary host is prepended with 'private-'
+    const privateHost = `private-${database.hosts.primary}`;
+    database.hosts.primary = privateHost;
+  }
+
   return database;
 };
 
@@ -1008,8 +1016,8 @@ export const handlers = [
           label: 'aclp-supported-region-linode-1',
           region: 'us-iad',
           alerts: {
-            user: [21, 22, 23, 24, 25],
-            system: [19, 20],
+            user_alerts: [21, 22, 23, 24, 25],
+            system_alerts: [19, 20],
             cpu: 0,
             io: 0,
             network_in: 0,
@@ -1024,8 +1032,8 @@ export const handlers = [
           label: 'aclp-supported-region-linode-2',
           region: 'us-east',
           alerts: {
-            user: [],
-            system: [],
+            user_alerts: [],
+            system_alerts: [],
             cpu: 10,
             io: 10000,
             network_in: 0,
@@ -1043,8 +1051,8 @@ export const handlers = [
           label: 'aclp-supported-region-linode-3',
           region: 'us-iad',
           alerts: {
-            user: [],
-            system: [],
+            user_alerts: [],
+            system_alerts: [],
             cpu: 0,
             io: 0,
             network_in: 0,
@@ -1340,6 +1348,16 @@ export const handlers = [
         region: 'us-mia',
         s3_endpoint: 'us-mia-1.linodeobjects.com',
       }),
+      objectStorageEndpointsFactory.build({
+        endpoint_type: 'E3',
+        region: 'ap-west',
+        s3_endpoint: 'ap-west-1.linodeobjects.com',
+      }),
+      objectStorageEndpointsFactory.build({
+        endpoint_type: 'E3',
+        region: 'us-iad',
+        s3_endpoint: 'us-iad-1.linodeobjects.com',
+      }),
     ];
     return HttpResponse.json(makeResourcePage(endpoints));
   }),
@@ -1441,14 +1459,49 @@ export const handlers = [
       Math.random() * 4
     )}` as ObjectStorageEndpointTypes;
 
-    const buckets = objectStorageBucketFactoryGen2.buildList(1, {
-      cluster: `${region}-1`,
-      endpoint_type: randomEndpointType,
-      hostname: `obj-bucket-${randomBucketNumber}.${region}.linodeobjects.com`,
-      label: `obj-bucket-${randomBucketNumber}`,
-      region,
-    });
-
+    const buckets =
+      region !== 'ap-west' && region !== 'us-iad'
+        ? objectStorageBucketFactoryGen2.buildList(1, {
+            cluster: `${region}-1`,
+            endpoint_type: randomEndpointType,
+            hostname: `obj-bucket-${randomBucketNumber}.${region}.linodeobjects.com`,
+            label: `obj-bucket-${randomBucketNumber}`,
+            region,
+          })
+        : [];
+    if (region === 'ap-west') {
+      buckets.push(
+        objectStorageBucketFactoryGen2.build({
+          cluster: `ap-west-1`,
+          endpoint_type: 'E3',
+          s3_endpoint: 'ap-west-1.linodeobjects.com',
+          hostname: `obj-bucket-804.ap-west.linodeobjects.com`,
+          label: `obj-bucket-804`,
+          region,
+        })
+      );
+      buckets.push(
+        objectStorageBucketFactoryGen2.build({
+          cluster: `ap-west-1`,
+          endpoint_type: 'E3',
+          s3_endpoint: 'ap-west-1.linodeobjects.com',
+          hostname: `obj-bucket-902.ap-west.linodeobjects.com`,
+          label: `obj-bucket-902`,
+          region,
+        })
+      );
+    }
+    if (region === 'us-iad')
+      buckets.push(
+        objectStorageBucketFactoryGen2.build({
+          cluster: `us-iad-1`,
+          endpoint_type: 'E3',
+          s3_endpoint: 'us-iad-1.linodeobjects.com',
+          hostname: `obj-bucket-230.us-iad.linodeobjects.com`,
+          label: `obj-bucket-230`,
+          region,
+        })
+      );
     return HttpResponse.json({
       data: buckets.slice(
         (page - 1) * pageSize,
@@ -2865,6 +2918,13 @@ export const handlers = [
             scope: 'region',
             regions: ['us-east'],
           }),
+          ...alertFactory.buildList(6, {
+            service_type: serviceType === 'dbaas' ? 'dbaas' : 'linode',
+            type: 'user',
+            scope: 'entity',
+            regions: ['us-east'],
+            entity_ids: ['5', '6'],
+          }),
         ],
       });
     }
@@ -2934,6 +2994,13 @@ export const handlers = [
           rules: [firewallMetricRulesFactory.build()],
         },
       }),
+      alertFactory.build({
+        id: 550,
+        label: 'Object Storage - testing',
+        type: 'user',
+        service_type: 'objectstorage',
+        entity_ids: ['obj-bucket-804.ap-west.linodeobjects.com'],
+      }),
     ];
     return HttpResponse.json(makeResourcePage(alerts));
   }),
@@ -2954,6 +3021,17 @@ export const handlers = [
           })
         );
       }
+      if (params.id === '550' && params.serviceType === 'objectstorage') {
+        return HttpResponse.json(
+          alertFactory.build({
+            id: 550,
+            type: 'user',
+            label: 'object-storage -testing',
+            service_type: 'objectstorage',
+            entity_ids: ['obj-bucket-804.ap-west.linodeobjects.com'],
+          })
+        );
+      }
       if (params.id !== undefined) {
         return HttpResponse.json(
           alertFactory.build({
@@ -3041,6 +3119,12 @@ export const handlers = [
           regions: 'us-iad,us-east',
           alert: serviceAlertFactory.build({ scope: ['entity'] }),
         }),
+        serviceTypesFactory.build({
+          label: 'Object Storage',
+          service_type: 'objectstorage',
+          regions: 'us-iad,us-east',
+          alert: serviceAlertFactory.build({ scope: ['entity'] }),
+        }),
       ],
     };
 
@@ -3053,6 +3137,7 @@ export const handlers = [
       dbaas: 'Databases',
       nodebalancer: 'NodeBalancers',
       firewall: 'Firewalls',
+      objectstorage: 'Object Storage',
     };
     const response = serviceTypesFactory.build({
       service_type: `${serviceType}`,
@@ -3060,6 +3145,7 @@ export const handlers = [
       alert: serviceAlertFactory.build({
         evaluation_period_seconds: [300],
         polling_interval_seconds: [300],
+        scope: ['entity'],
       }),
     });
 
@@ -3128,6 +3214,16 @@ export const handlers = [
       );
     }
 
+    if (params.serviceType === 'objectstorage') {
+      response.data.push(
+        dashboardFactory.build({
+          id: 6,
+          label: 'Object Storage Dashboard',
+          service_type: 'objectstorage',
+        })
+      );
+    }
+
     return HttpResponse.json(response);
   }),
   http.get(
@@ -3414,6 +3510,9 @@ export const handlers = [
     } else if (id === '4') {
       serviceType = 'firewall';
       dashboardLabel = 'Firewall Service I/O Statistics';
+    } else if (id === '6') {
+      serviceType = 'objectstorage';
+      dashboardLabel = 'Object Storage Service I/O Statistics';
     } else {
       serviceType = 'linode';
       dashboardLabel = 'Linode Service I/O Statistics';
@@ -3554,9 +3653,8 @@ export const handlers = [
           },
           {
             metric: {
-              entity_id: '789',
+              entity_id: 'obj-bucket-383.ap-west.linodeobjects.com',
               metric_name: 'average_cpu_usage',
-              node_id: 'primary-3',
             },
             values: [
               [1721854379, '0.3744841110560275'],
diff --git a/packages/manager/src/mocks/types.ts b/packages/manager/src/mocks/types.ts
index 5b13155d66c..36b6d539767 100644
--- a/packages/manager/src/mocks/types.ts
+++ b/packages/manager/src/mocks/types.ts
@@ -1,9 +1,11 @@
 import type {
+  ChildAccount,
   CloudNAT,
   Config,
   Destination,
   Domain,
   DomainRecord,
+  Entity,
   Event,
   Firewall,
   FirewallDevice,
@@ -120,9 +122,11 @@ export interface MockPresetExtra extends MockPresetBase {
  */
 export type MockPresetCrudGroup = {
   id:
+    | 'Child Accounts'
     | 'CloudNATs'
     | 'Delivery'
     | 'Domains'
+    | 'Entities'
     | 'Firewalls'
     | 'IP Addresses'
     | 'Kubernetes'
@@ -135,9 +139,12 @@ export type MockPresetCrudGroup = {
     | 'VPCs';
 };
 export type MockPresetCrudId =
+  | 'child-accounts-for-user:crud'
+  | 'child-accounts:crud'
   | 'cloudnats:crud'
   | 'delivery:crud'
   | 'domains:crud'
+  | 'entities:crud'
   | 'firewalls:crud'
   | 'ip-addresses:crud'
   | 'kubernetes:crud'
@@ -156,15 +163,24 @@ export interface MockPresetCrud extends MockPresetBase {
 
 export type MockHandler = (mockState: MockState) => HttpHandler[];
 
+interface Delegation {
+  childAccountEuuid: string;
+  id: number;
+  username: string;
+}
+
 /**
  * Stateful data shared among mocks.
  */
 export interface MockState {
+  childAccounts: ChildAccount[];
   cloudnats: CloudNAT[];
   configInterfaces: [number, Interface][]; // number is Config ID
+  delegations: Delegation[];
   destinations: Destination[];
   domainRecords: DomainRecord[];
   domains: Domain[];
+  entities: Entity[];
   eventQueue: Event[];
   firewallDevices: [number, FirewallDevice][]; // number is Firewall ID
   firewalls: Firewall[];
diff --git a/packages/manager/src/queries/cloudpulse/alerts.ts b/packages/manager/src/queries/cloudpulse/alerts.ts
index 8b78ef91fa8..c0ea1b86b13 100644
--- a/packages/manager/src/queries/cloudpulse/alerts.ts
+++ b/packages/manager/src/queries/cloudpulse/alerts.ts
@@ -15,6 +15,7 @@ import {
 } from '@tanstack/react-query';
 
 import { queryFactory } from './queries';
+import { invalidateAclpAlerts } from './useAlertsMutation';
 
 import type {
   Alert,
@@ -248,48 +249,12 @@ export const useServiceAlertsMutation = (
   entityId: string
 ) => {
   const queryClient = useQueryClient();
-  return useMutation<{}, APIError[], CloudPulseAlertsPayload>({
+  return useMutation<Alert, APIError[], CloudPulseAlertsPayload>({
     mutationFn: (payload: CloudPulseAlertsPayload) => {
       return updateServiceAlerts(serviceType, entityId, payload);
     },
     onSuccess(_, payload) {
-      const allAlerts = queryClient.getQueryData<Alert[]>(
-        queryFactory.alerts._ctx.all().queryKey
-      );
-
-      // Get alerts previously enabled for this entity
-      const oldEnabledAlertIds =
-        allAlerts
-          ?.filter((alert) => alert.entity_ids.includes(entityId))
-          .map((alert) => alert.id) || [];
-
-      // Combine enabled user and system alert IDs from payload
-      const newEnabledAlertIds = [
-        ...(payload.user ?? []),
-        ...(payload.system ?? []),
-      ];
-
-      // Get unique list of all enabled alert IDs for cache invalidation
-      const alertIdsToInvalidate = Array.from(
-        new Set([...oldEnabledAlertIds, ...newEnabledAlertIds])
-      );
-
-      queryClient.invalidateQueries({
-        queryKey: queryFactory.resources(serviceType).queryKey,
-      });
-
-      queryClient.invalidateQueries({
-        queryKey: queryFactory.alerts._ctx.all().queryKey,
-      });
-
-      alertIdsToInvalidate.forEach((alertId) => {
-        queryClient.invalidateQueries({
-          queryKey: queryFactory.alerts._ctx.alertByServiceTypeAndId(
-            serviceType,
-            String(alertId)
-          ).queryKey,
-        });
-      });
+      invalidateAclpAlerts(queryClient, serviceType, entityId, payload);
     },
   });
 };
diff --git a/packages/manager/src/queries/cloudpulse/queries.ts b/packages/manager/src/queries/cloudpulse/queries.ts
index d53fedbfb23..78f5cb06872 100644
--- a/packages/manager/src/queries/cloudpulse/queries.ts
+++ b/packages/manager/src/queries/cloudpulse/queries.ts
@@ -16,6 +16,11 @@ import {
 } from '@linode/queries';
 import { createQueryKeys } from '@lukemorales/query-key-factory';
 
+import { objectStorageQueries } from '../object-storage/queries';
+import {
+  getAllBucketsFromEndpoints,
+  getAllObjectStorageEndpoints,
+} from '../object-storage/requests';
 import { fetchCloudPulseMetrics } from './metrics';
 import {
   getAllAlertsRequest,
@@ -121,12 +126,18 @@ export const queryFactory = createQueryKeys(key, {
           queryFn: () => getAllLinodesRequest(params, filters), // since we don't have query factory implementation, in linodes.ts, once it is ready we will reuse that, untill then we will use same query keys
           queryKey: ['linodes', params, filters],
         };
-
       case 'nodebalancer':
         return nodebalancerQueries.nodebalancers._ctx.all(params, filters);
+      case 'objectstorage':
+        return {
+          queryFn: () => getAllBuckets(),
+          queryKey: [
+            ...objectStorageQueries.endpoints.queryKey,
+            objectStorageQueries.buckets.queryKey[1],
+          ],
+        };
       case 'volumes':
         return volumeQueries.lists._ctx.all(params, filters); // in this we don't need to define our own query factory, we will reuse existing implementation in volumes.ts
-
       default:
         return volumeQueries.lists._ctx.all(params, filters); // default to volumes
     }
@@ -134,6 +145,23 @@ export const queryFactory = createQueryKeys(key, {
 
   token: (serviceType: string | undefined, request: JWETokenPayLoad) => ({
     queryFn: () => getJWEToken(request, serviceType!),
-    queryKey: [serviceType, { resource_ids: request.entity_ids.sort() }],
+    queryKey: [serviceType, { resource_ids: request.entity_ids?.sort() }],
   }),
 });
+
+const getAllBuckets = async () => {
+  const endpoints = await getAllObjectStorageEndpoints();
+
+  // Get all the buckets from the endpoints
+  const allBuckets = await getAllBucketsFromEndpoints(endpoints);
+
+  // Throw the error if we encounter any error for any single call.
+  if (allBuckets.errors.length) {
+    throw new Error('Unable to fetch the data.');
+  }
+
+  // Filter the E0, E1 endpoint_type out and return the buckets
+  return allBuckets.buckets.filter(
+    (bucket) => bucket.endpoint_type !== 'E0' && bucket.endpoint_type !== 'E1'
+  );
+};
diff --git a/packages/manager/src/queries/cloudpulse/resources.ts b/packages/manager/src/queries/cloudpulse/resources.ts
index 4fa2e79d4eb..074c6c98eb9 100644
--- a/packages/manager/src/queries/cloudpulse/resources.ts
+++ b/packages/manager/src/queries/cloudpulse/resources.ts
@@ -14,7 +14,11 @@ export const useResourcesQuery = (
   useQuery<any[], unknown, CloudPulseResources[]>({
     ...queryFactory.resources(resourceType, params, filters),
     enabled,
+    retry: resourceType === 'objectstorage' ? false : 3,
     select: (resources) => {
+      if (!enabled) {
+        return []; // Return empty array if the query is not enabled
+      }
       return resources.map((resource) => {
         const entities: Record<string, string> = {};
 
@@ -33,13 +37,18 @@ export const useResourcesQuery = (
             }
           });
         }
+        const id =
+          resourceType === 'objectstorage'
+            ? resource.hostname
+            : String(resource.id);
         return {
           engineType: resource.engine,
-          id: String(resource.id),
-          label: resource.label,
+          id,
+          label: resourceType === 'objectstorage' ? id : resource.label,
           region: resource.region,
           regions: resource.regions ? resource.regions : [],
           tags: resource.tags,
+          endpoint: resource.s3_endpoint,
           entities,
           clusterSize: resource.cluster_size,
         };
diff --git a/packages/manager/src/queries/cloudpulse/services.ts b/packages/manager/src/queries/cloudpulse/services.ts
index b85b82ee659..583a395b317 100644
--- a/packages/manager/src/queries/cloudpulse/services.ts
+++ b/packages/manager/src/queries/cloudpulse/services.ts
@@ -1,3 +1,4 @@
+import { queryPresets } from '@linode/queries';
 import { keepPreviousData, useQuery } from '@tanstack/react-query';
 
 import { queryFactory } from './queries';
@@ -23,6 +24,8 @@ export const useGetCloudPulseMetricDefinitionsByServiceType = (
   return useQuery<ResourcePage<MetricDefinition>, APIError[]>({
     ...queryFactory.metricsDefinitons(serviceType, params, filter),
     enabled,
+    ...queryPresets.oneTimeFetch, // It is a configuration and not need to be refetched
+    retry: 2,
   });
 };
 
diff --git a/packages/manager/src/queries/cloudpulse/useAlertsMutation.ts b/packages/manager/src/queries/cloudpulse/useAlertsMutation.ts
new file mode 100644
index 00000000000..49ff9f3a751
--- /dev/null
+++ b/packages/manager/src/queries/cloudpulse/useAlertsMutation.ts
@@ -0,0 +1,122 @@
+import {
+  type CloudPulseAlertsPayload,
+  type CloudPulseServiceType,
+  type DeepPartial,
+  type Linode,
+} from '@linode/api-v4';
+import { useLinodeUpdateMutation } from '@linode/queries';
+
+import { queryFactory } from './queries';
+
+import type { Alert, LinodeAlerts } from '@linode/api-v4/lib/cloudpulse';
+import type { QueryClient } from '@linode/queries';
+
+/**
+ * The alert type overrides for a given service type.
+ * It contains the payload transformer function type and the response type.
+ * This is used for types only, not to be used anywhere else.
+ */
+interface AlertTypeOverrides {
+  linode: (basePayload: LinodeAlerts) => DeepPartial<Linode>;
+  // Future overrides go here (e.g. dbaas, ...)
+}
+
+/**
+ * The type of the payload transformer function for a given service type.
+ */
+type AlertPayloadTransformerFn<T extends CloudPulseServiceType> =
+  T extends keyof AlertTypeOverrides
+    ? AlertTypeOverrides[T]
+    : (basePayload: CloudPulseAlertsPayload) => CloudPulseAlertsPayload;
+
+/**
+ * Type of the service payload transformer map
+ */
+export type ServicePayloadTransformerMap = Partial<{
+  [K in CloudPulseServiceType]: AlertPayloadTransformerFn<K>;
+}>;
+
+/**
+ * Service payload transformer map
+ */
+export const servicePayloadTransformerMap: ServicePayloadTransformerMap = {
+  linode: (basePayload: LinodeAlerts) => ({ alerts: basePayload }),
+  // Future transformers go here (e.g. dbaas, ...)
+};
+
+/**
+ *
+ * @param serviceType service type
+ * @param entityId entity id
+ * @returns alerts mutation
+ */
+export const useAlertsMutation = (
+  serviceType: CloudPulseServiceType,
+  entityId: string
+) => {
+  // linode api alerts mutation
+  const { mutateAsync: updateLinode } = useLinodeUpdateMutation(
+    Number(entityId)
+  );
+
+  switch (serviceType) {
+    case 'linode':
+      return updateLinode;
+    default:
+      return (_payload: CloudPulseAlertsPayload) =>
+        Promise.reject(new Error('Error encountered'));
+  }
+};
+
+/**
+ * Invalidates the alerts cache
+ * @param qc The query client
+ * @param serviceType The service type
+ * @param entityId The entity id
+ * @param payload The payload
+ */
+export const invalidateAclpAlerts = (
+  queryClient: QueryClient,
+  serviceType: string,
+  entityId: string | undefined,
+  payload: CloudPulseAlertsPayload
+) => {
+  if (!entityId) return;
+
+  const allAlerts = queryClient.getQueryData<Alert[]>(
+    queryFactory.alerts._ctx.alertsByServiceType(serviceType).queryKey
+  );
+
+  // Get alerts previously enabled for this entity
+  const oldEnabledAlertIds =
+    allAlerts
+      ?.filter((alert) => alert.entity_ids.includes(entityId))
+      .map((alert) => alert.id) || [];
+
+  // Combine enabled user and system alert IDs from payload
+  const newEnabledAlertIds = [
+    ...(payload.user_alerts ?? []),
+    ...(payload.system_alerts ?? []),
+  ];
+
+  // Get unique list of all enabled alert IDs for cache invalidation
+  const alertIdsToInvalidate = [...oldEnabledAlertIds, ...newEnabledAlertIds];
+
+  queryClient.invalidateQueries({
+    queryKey: queryFactory.alerts._ctx.all().queryKey,
+  });
+
+  queryClient.invalidateQueries({
+    queryKey:
+      queryFactory.alerts._ctx.alertsByServiceType(serviceType).queryKey,
+  });
+
+  alertIdsToInvalidate.forEach((alertId) => {
+    queryClient.invalidateQueries({
+      queryKey: queryFactory.alerts._ctx.alertByServiceTypeAndId(
+        serviceType,
+        String(alertId)
+      ).queryKey,
+    });
+  });
+};
diff --git a/packages/manager/src/queries/entities/entities.ts b/packages/manager/src/queries/entities/entities.ts
index 0f3dc308d1d..50e6fe5525a 100644
--- a/packages/manager/src/queries/entities/entities.ts
+++ b/packages/manager/src/queries/entities/entities.ts
@@ -3,11 +3,26 @@ import { useQuery } from '@tanstack/react-query';
 
 import { entitiesQueries } from './queries';
 
-import type { AccountEntity, APIError, ResourcePage } from '@linode/api-v4';
+import type {
+  AccountEntity,
+  APIError,
+  Filter,
+  Params,
+  ResourcePage,
+} from '@linode/api-v4';
 
-export const useAccountEntities = () => {
-  return useQuery<ResourcePage<AccountEntity>, APIError[]>({
-    ...entitiesQueries.entities,
+export const useAllAccountEntities = ({
+  enabled = true,
+  filter = {},
+  params = {},
+}) =>
+  useQuery<AccountEntity[], APIError[]>({
+    enabled,
+    ...entitiesQueries.all(params, filter),
+  });
+
+export const useAccountEntities = (params: Params, filter: Filter) =>
+  useQuery<ResourcePage<AccountEntity>, APIError[]>({
+    ...entitiesQueries.paginated(params, filter),
     ...queryPresets.shortLived,
   });
-};
diff --git a/packages/manager/src/queries/entities/queries.ts b/packages/manager/src/queries/entities/queries.ts
index e5d237dbe58..00e76fcff89 100644
--- a/packages/manager/src/queries/entities/queries.ts
+++ b/packages/manager/src/queries/entities/queries.ts
@@ -1,10 +1,26 @@
 import { getAccountEntities } from '@linode/api-v4';
+import { getAll } from '@linode/utilities';
 import { createQueryKeys } from '@lukemorales/query-key-factory';
 
+import type { AccountEntity, Filter, Params } from '@linode/api-v4';
+
+// TODO: Temporary—use getAll since API can’t filter yet.
+// Switch to paginated + API filtering (X-Filter) when supported.
+const getAllAccountEntitiesRequest = (
+  _params: Params = {},
+  _filter: Filter = {}
+) =>
+  getAll<AccountEntity>((params) =>
+    getAccountEntities({ ...params, ..._params })
+  )().then((data) => data.data);
+
 export const entitiesQueries = createQueryKeys('entities', {
-  entities: {
-    queryFn: ({ pageParam }) =>
-      getAccountEntities({ page: pageParam as number, page_size: 500 }),
-    queryKey: null,
-  },
+  all: (params: Params = {}, filter: Filter = {}) => ({
+    queryFn: () => getAllAccountEntitiesRequest(params, filter),
+    queryKey: [params, filter],
+  }),
+  paginated: (params: Params, filter: Filter) => ({
+    queryFn: () => getAccountEntities(params),
+    queryKey: [params, filter],
+  }),
 });
diff --git a/packages/manager/src/queries/kubernetes.ts b/packages/manager/src/queries/kubernetes.ts
index ecd0c84e735..5cbdbfa53fd 100644
--- a/packages/manager/src/queries/kubernetes.ts
+++ b/packages/manager/src/queries/kubernetes.ts
@@ -1,21 +1,16 @@
 import {
   createKubernetesCluster,
-  createKubernetesClusterBeta,
   createNodePool,
   deleteKubernetesCluster,
   deleteNodePool,
   getKubeConfig,
   getKubernetesCluster,
-  getKubernetesClusterBeta,
   getKubernetesClusterControlPlaneACL,
   getKubernetesClusterDashboard,
   getKubernetesClusterEndpoints,
   getKubernetesClusters,
-  getKubernetesClustersBeta,
-  getKubernetesTieredVersionsBeta,
+  getKubernetesTieredVersions,
   getKubernetesTypes,
-  getKubernetesTypesBeta,
-  getKubernetesVersions,
   getNodePool,
   getNodePools,
   recycleAllNodes,
@@ -46,7 +41,6 @@ import type {
   KubernetesDashboardResponse,
   KubernetesEndpointResponse,
   KubernetesTieredVersion,
-  KubernetesVersion,
   UpdateNodePoolData,
 } from '@linode/api-v4';
 import type {
@@ -64,12 +58,10 @@ export const kubernetesQueries = createQueryKeys('kubernetes', {
         queryFn: () => getKubernetesClusterControlPlaneACL(id),
         queryKey: [id],
       },
-      cluster: (isUsingBetaEndpoint: boolean = false) => ({
-        queryFn: isUsingBetaEndpoint
-          ? () => getKubernetesClusterBeta(id)
-          : () => getKubernetesCluster(id),
-        queryKey: [isUsingBetaEndpoint ? 'v4beta' : 'v4'],
-      }),
+      cluster: {
+        queryFn: () => getKubernetesCluster(id),
+        queryKey: null,
+      },
       dashboard: {
         queryFn: () => getKubernetesClusterDashboard(id),
         queryKey: null,
@@ -146,44 +138,28 @@ export const kubernetesQueries = createQueryKeys('kubernetes', {
   }),
   lists: {
     contextQueries: {
-      all: (isUsingBetaEndpoint: boolean = false) => ({
-        queryFn: () =>
-          isUsingBetaEndpoint
-            ? getAllKubernetesClustersBeta()
-            : getAllKubernetesClusters(),
-        queryKey: [isUsingBetaEndpoint ? 'v4beta' : 'v4'],
-      }),
+      all: {
+        queryFn: () => getAllKubernetesClusters(),
+        queryKey: null,
+      },
       infinite: (filter: Filter = {}) => ({
         queryFn: ({ pageParam }) =>
           getKubernetesClusters({ page: pageParam as number }, filter),
         queryKey: [filter],
       }),
-      paginated: (
-        params: Params,
-        filter: Filter,
-        isUsingBetaEndpoint: boolean = false
-      ) => ({
-        queryFn: () =>
-          isUsingBetaEndpoint
-            ? getKubernetesClustersBeta(params, filter)
-            : getKubernetesClusters(params, filter),
-        queryKey: [params, filter, isUsingBetaEndpoint ? 'v4beta' : 'v4'],
+      paginated: (params: Params, filter: Filter) => ({
+        queryFn: () => getKubernetesClusters(params, filter),
+        queryKey: [params, filter],
       }),
     },
     queryKey: null,
   },
   tieredVersions: (tier: string) => ({
-    queryFn: () => getAllKubernetesTieredVersionsBeta(tier),
+    queryFn: () => getAllKubernetesTieredVersions(tier),
     queryKey: [tier],
   }),
-  types: (isUsingBetaEndpoint: boolean = false) => ({
-    queryFn: isUsingBetaEndpoint
-      ? getAllKubernetesTypesBeta
-      : () => getAllKubernetesTypes(),
-    queryKey: [isUsingBetaEndpoint ? 'v4beta' : 'v4'],
-  }),
-  versions: {
-    queryFn: () => getAllKubernetesVersions(),
+  types: {
+    queryFn: () => getAllKubernetesTypes(),
     queryKey: null,
   },
 });
@@ -191,11 +167,10 @@ export const kubernetesQueries = createQueryKeys('kubernetes', {
 export const useKubernetesClusterQuery = ({
   enabled = true,
   id = -1,
-  isUsingBetaEndpoint = false,
   options = {},
 }) => {
   return useQuery<KubernetesCluster, APIError[]>({
-    ...kubernetesQueries.cluster(id)._ctx.cluster(isUsingBetaEndpoint),
+    ...kubernetesQueries.cluster(id),
     enabled,
     ...options,
   });
@@ -222,7 +197,6 @@ export const useKubernetesClustersInfiniteQuery = (
 interface KubernetesClustersQueryOptions {
   enabled?: boolean;
   filter: Filter;
-  isUsingBetaEndpoint: boolean;
   params: Params;
 }
 
@@ -230,14 +204,9 @@ export const useKubernetesClustersQuery = ({
   enabled = true,
   filter,
   params,
-  isUsingBetaEndpoint = false,
 }: KubernetesClustersQueryOptions) => {
   return useQuery<ResourcePage<KubernetesCluster>, APIError[]>({
-    ...kubernetesQueries.lists._ctx.paginated(
-      params,
-      filter,
-      isUsingBetaEndpoint
-    ),
+    ...kubernetesQueries.lists._ctx.paginated(params, filter),
     enabled,
     placeholderData: keepPreviousData,
   });
@@ -255,14 +224,9 @@ export const useKubernetesClusterMutation = (id: number) => {
         queryClient.invalidateQueries({
           queryKey: kubernetesQueries.cluster(id)._ctx.acl.queryKey,
         });
-        // queryClient.setQueryData<KubernetesCluster>(
-        //   kubernetesQueries.cluster(id).queryKey,
-        //   data
-        // );
-        // Temporary cache update logic for APL
-        queryClient.setQueriesData<KubernetesCluster>(
-          { queryKey: kubernetesQueries.cluster(id)._ctx.cluster._def },
-          (oldData) => ({ ...oldData, ...data })
+        queryClient.setQueryData<KubernetesCluster>(
+          kubernetesQueries.cluster(id).queryKey,
+          data
         );
       },
     }
@@ -342,27 +306,6 @@ export const useCreateKubernetesClusterMutation = () => {
   });
 };
 
-/**
- * duplicated function of useCreateKubernetesClusterMutation
- * necessary to call BETA_API_ROOT in a separate function based on feature flag
- */
-
-export const useCreateKubernetesClusterBetaMutation = () => {
-  const queryClient = useQueryClient();
-  return useMutation<KubernetesCluster, APIError[], CreateKubeClusterPayload>({
-    mutationFn: createKubernetesClusterBeta,
-    onSuccess() {
-      queryClient.invalidateQueries({
-        queryKey: kubernetesQueries.lists.queryKey,
-      });
-      // If a restricted user creates an entity, we must make sure grants are up to date.
-      queryClient.invalidateQueries({
-        queryKey: profileQueries.grants.queryKey,
-      });
-    },
-  });
-};
-
 export const useCreateNodePoolMutation = (clusterId: number) => {
   const queryClient = useQueryClient();
   return useMutation<KubeNodePoolResponse, APIError[], CreateNodePoolData>({
@@ -468,12 +411,6 @@ export const useKubernetesDashboardQuery = (
   });
 };
 
-export const useKubernetesVersionQuery = () =>
-  useQuery<KubernetesVersion[], APIError[]>({
-    ...kubernetesQueries.versions,
-    ...queryPresets.oneTimeFetch,
-  });
-
 export const useKubernetesTieredVersionsQuery = (
   tier: string,
   enabled = true
@@ -489,12 +426,9 @@ export const useKubernetesTieredVersionsQuery = (
  * Avoiding fetching all Kubernetes Clusters if possible.
  * Before you use this, consider implementing infinite scroll instead.
  */
-export const useAllKubernetesClustersQuery = ({
-  enabled = false,
-  isUsingBetaEndpoint = false,
-}) => {
+export const useAllKubernetesClustersQuery = ({ enabled = false }) => {
   return useQuery<KubernetesCluster[], APIError[]>({
-    ...kubernetesQueries.lists._ctx.all(isUsingBetaEndpoint),
+    ...kubernetesQueries.lists._ctx.all,
     enabled,
   });
 };
@@ -537,19 +471,9 @@ const getAllKubernetesClusters = () =>
     getKubernetesClusters(params, filters)
   )().then((data) => data.data);
 
-const getAllKubernetesClustersBeta = () =>
-  getAll<KubernetesCluster>((params, filters) =>
-    getKubernetesClustersBeta(params, filters)
-  )().then((data) => data.data);
-
-const getAllKubernetesVersions = () =>
-  getAll<KubernetesVersion>((params, filters) =>
-    getKubernetesVersions(params, filters)
-  )().then((data) => data.data);
-
-const getAllKubernetesTieredVersionsBeta = (tier: string) =>
+const getAllKubernetesTieredVersions = (tier: string) =>
   getAll<KubernetesTieredVersion>((params, filters) =>
-    getKubernetesTieredVersionsBeta(tier, params, filters)
+    getKubernetesTieredVersions(tier, params, filters)
   )().then((data) => data.data);
 
 const getAllAPIEndpointsForCluster = (clusterId: number) =>
@@ -562,13 +486,8 @@ const getAllKubernetesTypes = () =>
     (results) => results.data
   );
 
-const getAllKubernetesTypesBeta = () =>
-  getAll<PriceType>((params) => getKubernetesTypesBeta(params))().then(
-    (results) => results.data
-  );
-
-export const useKubernetesTypesQuery = (isUsingBetaEndpoint?: boolean) =>
+export const useKubernetesTypesQuery = () =>
   useQuery<PriceType[], APIError[]>({
     ...queryPresets.oneTimeFetch,
-    ...kubernetesQueries.types(isUsingBetaEndpoint),
+    ...kubernetesQueries.types,
   });
diff --git a/packages/queries/CHANGELOG.md b/packages/queries/CHANGELOG.md
index 98ff6d86594..6906ca12c33 100644
--- a/packages/queries/CHANGELOG.md
+++ b/packages/queries/CHANGELOG.md
@@ -1,3 +1,26 @@
+## [2025-10-07] - v0.15.0
+
+
+### Added:
+
+- IAM RBAC: useAllAccountEntities to fetch all pages client-side via getAll, preventing missing items on large accounts ([#12888](https://github.com/linode/manager/pull/12888))
+- IAM Parent/Child - Implement new delegation query hooks ([#12895](https://github.com/linode/manager/pull/12895))
+- IAM Delegation: useAllListMyDelegatedChildAccountsQuery to fetch all data ([#12913](https://github.com/linode/manager/pull/12913))
+- Region VPC availability queries ([#12919](https://github.com/linode/manager/pull/12919))
+
+### Changed:
+
+- ACLP: update metric definition queries cache time to inifinity ([#12887](https://github.com/linode/manager/pull/12887))
+
+### Removed:
+
+- `isUsingBetaEndpoint` logic for kubernetes queries since all kubernetes endpoints
+now use /v4beta ([#12867](https://github.com/linode/manager/pull/12867))
+
+### Upcoming Features:
+
+- Logs Delivery Streams/Destinations update useAll queries ([#12802](https://github.com/linode/manager/pull/12802))
+
 ## [2025-09-23] - v0.14.0
 
 ### Upcoming Features:
diff --git a/packages/queries/package.json b/packages/queries/package.json
index da2ebc09b46..283eddb8e89 100644
--- a/packages/queries/package.json
+++ b/packages/queries/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@linode/queries",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "Linode Utility functions library",
   "main": "src/index.js",
   "module": "src/index.ts",
diff --git a/packages/queries/src/account/account.ts b/packages/queries/src/account/account.ts
index 6f554902b29..735fe1c87c5 100644
--- a/packages/queries/src/account/account.ts
+++ b/packages/queries/src/account/account.ts
@@ -31,17 +31,22 @@ export const useMutateAccount = () =>
     mutationFn: updateAccountInfo,
   });
 
-export const useChildAccountsInfiniteQuery = (options: RequestOptions) => {
+export const useChildAccountsInfiniteQuery = (
+  options: RequestOptions,
+  enabled = true,
+) => {
   const { data: profile } = useProfile();
   const { data: grants } = useGrants();
   const hasExplicitAuthToken = Boolean(options.headers?.Authorization);
-  const enabled =
-    (Boolean(profile?.user_type === 'parent') && !profile?.restricted) ||
-    Boolean(grants?.global?.child_account_access) ||
-    hasExplicitAuthToken;
+
+  const isEnabled = enabled
+    ? (Boolean(profile?.user_type === 'parent') && !profile?.restricted) ||
+      Boolean(grants?.global?.child_account_access) ||
+      hasExplicitAuthToken
+    : false;
 
   return useInfiniteQuery<ResourcePage<Account>, APIError[]>({
-    enabled,
+    enabled: isEnabled,
     getNextPageParam: ({ page, pages }) => {
       if (page === pages) {
         return undefined;
diff --git a/packages/queries/src/delivery/delivery.ts b/packages/queries/src/delivery/delivery.ts
index 314656eed11..503947d666b 100644
--- a/packages/queries/src/delivery/delivery.ts
+++ b/packages/queries/src/delivery/delivery.ts
@@ -33,7 +33,6 @@ import type {
   UpdateDestinationPayloadWithId,
   UpdateStreamPayloadWithId,
 } from '@linode/api-v4';
-import type { GetAllData } from '@linode/utilities';
 
 export const getAllStreams = (
   passedParams: Params = {},
@@ -41,7 +40,7 @@ export const getAllStreams = (
 ) =>
   getAll<Stream>((params, filter) =>
     getStreams({ ...params, ...passedParams }, { ...filter, ...passedFilter }),
-  )();
+  )().then((data) => data.data);
 
 export const getAllDestinations = (
   passedParams: Params = {},
@@ -52,7 +51,7 @@ export const getAllDestinations = (
       { ...params, ...passedParams },
       { ...filter, ...passedFilter },
     ),
-  )();
+  )().then((data) => data.data);
 
 export const deliveryQueries = createQueryKeys('delivery', {
   stream: (id: number) => ({
@@ -111,7 +110,7 @@ export const useAllStreamsQuery = (
   filter: Filter = {},
   enabled = true,
 ) =>
-  useQuery<GetAllData<Stream>, APIError[]>({
+  useQuery<Stream[], APIError[]>({
     ...deliveryQueries.streams._ctx.all(params, filter),
     enabled,
   });
@@ -209,7 +208,7 @@ export const useAllDestinationsQuery = (
   filter: Filter = {},
   enabled = true,
 ) =>
-  useQuery<GetAllData<Destination>, APIError[]>({
+  useQuery<Destination[], APIError[]>({
     ...deliveryQueries.destinations._ctx.all(params, filter),
     enabled,
   });
diff --git a/packages/queries/src/iam/delegation.ts b/packages/queries/src/iam/delegation.ts
new file mode 100644
index 00000000000..41a3f51499e
--- /dev/null
+++ b/packages/queries/src/iam/delegation.ts
@@ -0,0 +1,269 @@
+import {
+  generateChildAccountToken,
+  getChildAccountDelegates,
+  getChildAccountsIam,
+  getDefaultDelegationAccess,
+  getDelegatedChildAccount,
+  getDelegatedChildAccountsForUser,
+  getMyDelegatedChildAccounts,
+  updateChildAccountDelegates,
+  updateDefaultDelegationAccess,
+} from '@linode/api-v4';
+import { getAll } from '@linode/utilities';
+import { createQueryKeys } from '@lukemorales/query-key-factory';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+
+import type {
+  Account,
+  APIError,
+  ChildAccount,
+  ChildAccountWithDelegates,
+  GetChildAccountDelegatesParams,
+  GetChildAccountsIamParams,
+  GetDelegatedChildAccountsForUserParams,
+  IamUserRoles,
+  Params,
+  ResourcePage,
+  Token,
+} from '@linode/api-v4';
+import type { UseMutationResult, UseQueryResult } from '@tanstack/react-query';
+
+export const delegationQueries = createQueryKeys('delegation', {
+  childAccounts: ({ params, users }: GetChildAccountsIamParams) => ({
+    queryFn: () => getChildAccountsIam({ params, users }),
+    queryKey: [params],
+  }),
+  delegatedChildAccountsForUser: ({
+    username,
+    params,
+  }: GetDelegatedChildAccountsForUserParams) => ({
+    queryFn: () => getDelegatedChildAccountsForUser({ username, params }),
+    queryKey: [username, params],
+  }),
+  childAccountDelegates: ({
+    euuid,
+    params,
+  }: GetChildAccountDelegatesParams) => ({
+    queryFn: () => getChildAccountDelegates({ euuid, params }),
+    queryKey: [euuid, params],
+  }),
+  myDelegatedChildAccounts: {
+    contextQueries: {
+      all: (params: Params) => ({
+        queryFn: () => getAllMyDelegatedChildAccounts(params),
+        queryKey: [params],
+      }),
+      paginated: (params: Params) => ({
+        queryFn: () => getMyDelegatedChildAccounts({ params }),
+        queryKey: [params],
+      }),
+    },
+    queryKey: null,
+  },
+  delegatedChildAccount: (euuid: string) => ({
+    queryFn: () => getDelegatedChildAccount({ euuid }),
+    queryKey: [euuid],
+  }),
+  defaultAccess: {
+    queryFn: getDefaultDelegationAccess,
+    queryKey: null,
+  },
+});
+
+/**
+ * List all child accounts (gets all child accounts from customerParentChild table for the parent account)
+ * - Purpose: Get ALL child accounts under a parent account, optionally with their delegate users
+ * - Scope: All child accounts for the parent (inventory view)
+ * - Audience: Parent account administrators managing delegation.
+ * - CRUD: GET /iam/delegation/child-accounts?users=true (optional)
+ */
+export const useGetChildAccountsQuery = ({
+  params,
+  users,
+}: GetChildAccountsIamParams): UseQueryResult<
+  ResourcePage<ChildAccount | ChildAccountWithDelegates>,
+  APIError[]
+> => {
+  return useQuery({
+    ...delegationQueries.childAccounts({ params, users }),
+  });
+};
+
+/**
+ * List delegated child accounts for a user
+ * - Purpose: Get child accounts that a SPECIFIC user is delegated to manage (which child accounts a specific user can access)
+ * - Scope: Filtered by username - only child accounts where that user has active delegation
+ * - Audience: Parent account administrators auditing a user’s delegated access.
+ * - CRUD: GET /iam/delegation/users/:username/child-accounts
+ */
+export const useGetDelegatedChildAccountsForUserQuery = ({
+  username,
+  params,
+}: GetDelegatedChildAccountsForUserParams): UseQueryResult<
+  ResourcePage<ChildAccount>,
+  APIError[]
+> => {
+  return useQuery({
+    ...delegationQueries.delegatedChildAccountsForUser({ username, params }),
+  });
+};
+
+/**
+ * List delegates for a child account
+ * - Purpose: Get all delegate users for a SPECIFIC child account
+ * - Scope: Filtered by child account euuid - only users delegated to that account
+ * - Audience: Parent account administrators managing delegates for a SPECIFIC child account.
+ * - CRUD: GET /iam/delegation/child-accounts/:euuid/users
+ */
+export const useGetChildAccountDelegatesQuery = ({
+  euuid,
+  params,
+}: GetChildAccountDelegatesParams): UseQueryResult<
+  ResourcePage<string[]>,
+  APIError[]
+> => {
+  return useQuery({
+    ...delegationQueries.childAccountDelegates({
+      euuid,
+      params,
+    }),
+  });
+};
+
+/**
+ * Update delegates for a child account
+ * - Purpose: Replace the full set of parent users delegated to a child account.
+ * - Scope: Requires parent-account context, valid parent→child relationship, and authorization; payload must be non-empty.
+ * - Audience: Parent account administrators assigning/removing delegates for a SPECIFIC child account.
+ * - CRUD: PUT /iam/delegation/child-accounts/:euuid/users
+ */
+export const useUpdateChildAccountDelegatesQuery = (): UseMutationResult<
+  ResourcePage<string>,
+  APIError[],
+  { data: string[]; euuid: string }
+> => {
+  const queryClient = useQueryClient();
+  return useMutation<
+    ResourcePage<string>,
+    APIError[],
+    { data: string[]; euuid: string }
+  >({
+    mutationFn: updateChildAccountDelegates,
+    onSuccess(_data, { euuid }) {
+      // Invalidate all child account delegates
+      queryClient.invalidateQueries({
+        queryKey: delegationQueries.childAccountDelegates({ euuid }).queryKey,
+      });
+    },
+  });
+};
+
+/**
+ * List my delegated child accounts (gets child accounts where user has view_child_account permission).
+ * - Purpose: Get child accounts that the current authenticated user can manage via delegation.
+ * - Scope: Only child accounts where the caller has an active delegate and required view permission.
+ * - Audience: Needing to return accounts the caller can actually access.
+ * - CRUD: GET /iam/delegation/profile/child-accounts
+ */
+export const useGetMyDelegatedChildAccountsQuery = (
+  params: Params,
+): UseQueryResult<ResourcePage<Account>, APIError[]> => {
+  return useQuery({
+    ...delegationQueries.myDelegatedChildAccounts._ctx.paginated(params),
+  });
+};
+
+/**
+ * List all my delegated child accounts (fetches all pages of child accounts where user has view_child_account permission)
+ * - Purpose: Retrieve the full list of child accounts the current caller can manage via delegation, across all pages.
+ * - Scope: Only child accounts where the caller has an active delegate and required view permission; returns all results, not paginated.
+ * - Audience: Callers needing the complete set of accessible accounts for the current user.
+ * - Data: Account[] (limited profile fields) for `GET /iam/delegation/profile/child-accounts` (all pages).
+ * - Usage: Pass `enabled` to control query activation (e.g., only if IAM Delegation is enabled).
+ */
+export const useAllListMyDelegatedChildAccountsQuery = ({
+  params = {},
+  enabled = true,
+}) => {
+  return useQuery({
+    enabled,
+    ...delegationQueries.myDelegatedChildAccounts._ctx.all(params),
+  });
+};
+
+/**
+ * Get child account
+ * - Purpose: Get SPECIFIC child account that the current authenticated user can manage via delegation.
+ * - Scope: Only child accounts where the caller has active delegation and required view permission.
+ * - Audience: The current user needing to see which accounts they can actually access.
+ * - CRUD: GET /iam/delegation/profile/child-accounts/:euuid
+ */
+export const useGetChildAccountQuery = (
+  euuid: string,
+): UseQueryResult<Account, APIError[]> => {
+  return useQuery({
+    ...delegationQueries.delegatedChildAccount(euuid),
+  });
+};
+
+/**
+ * Create child account token
+ * - Purpose: Create a short‑lived bearer token to act on a child account as a proxy/delegate.
+ * - Scope: For a parent user delegated on the target child account identified by `euuid`.
+ * - Audience: Clients that need temporary auth to perform actions in the child account.
+ * - Data: Token for `POST /iam/delegation/child-accounts/:euuid/token`.
+ */
+export const useGenerateChildAccountTokenQuery = (): UseMutationResult<
+  Token,
+  APIError[],
+  { euuid: string }
+> => {
+  return useMutation<Token, APIError[], { euuid: string }>({
+    mutationFn: generateChildAccountToken,
+  });
+};
+
+/**
+ * Get default delegation access
+ * - Purpose: View the default access (roles/permissions) applied to new delegates on this child account.
+ * - Scope: Child-account context; restricted to authorized, non-delegate callers.
+ * - Audience: Child account administrators reviewing default delegate access.
+ * - Data: IamUserRoles with `account_access` and `entity_access` for `GET /iam/delegation/default-role-permissions`.
+ */
+export const useGetDefaultDelegationAccessQuery = (): UseQueryResult<
+  IamUserRoles,
+  APIError[]
+> => {
+  return useQuery<IamUserRoles, APIError[]>({
+    ...delegationQueries.defaultAccess,
+  });
+};
+
+/**
+ * Update default delegation access
+ * - Purpose: Update the default access (roles/permissions) applied to new delegates on this child account.
+ * - Scope: Child-account context; restricted to authorized, non-delegate callers; validates entity IDs.
+ * - Audience: Child account administrators configuring default delegate access.
+ * - Data: Request/Response IamUserRoles for `PUT /iam/delegation/default-role-permissions`.
+ */
+export const useUpdateDefaultDelegationAccessQuery = (): UseMutationResult<
+  IamUserRoles,
+  APIError[],
+  IamUserRoles
+> => {
+  const queryClient = useQueryClient();
+  return useMutation<IamUserRoles, APIError[], IamUserRoles>({
+    mutationFn: updateDefaultDelegationAccess,
+    onSuccess(data) {
+      queryClient.setQueryData(delegationQueries.defaultAccess.queryKey, data);
+    },
+  });
+};
+
+/**
+ * Fetches all my delegated child accounts for the current user (all pages).
+ */
+const getAllMyDelegatedChildAccounts = (_params: Params = {}) =>
+  getAll<Account>((params) =>
+    getMyDelegatedChildAccounts({ params: { ...params, ..._params } }),
+  )().then((data) => data.data);
diff --git a/packages/queries/src/iam/index.ts b/packages/queries/src/iam/index.ts
index cb812bcecee..8af2cd08614 100644
--- a/packages/queries/src/iam/index.ts
+++ b/packages/queries/src/iam/index.ts
@@ -1,2 +1,3 @@
+export * from './delegation';
 export * from './iam';
 export * from './keys';
diff --git a/packages/queries/src/regions/regions.ts b/packages/queries/src/regions/regions.ts
index 1377c5c4b6f..0a735b36aaf 100644
--- a/packages/queries/src/regions/regions.ts
+++ b/packages/queries/src/regions/regions.ts
@@ -1,4 +1,8 @@
-import { getRegion, getRegionAvailability } from '@linode/api-v4/lib/regions';
+import {
+  getRegion,
+  getRegionAvailability,
+  getRegionVPCAvailability,
+} from '@linode/api-v4/lib/regions';
 import { getNewRegionLabel } from '@linode/utilities';
 import { createQueryKeys } from '@lukemorales/query-key-factory';
 import { queryOptions, useQuery, useQueryClient } from '@tanstack/react-query';
@@ -7,9 +11,14 @@ import { queryPresets } from '../base';
 import {
   getAllRegionAvailabilitiesRequest,
   getAllRegionsRequest,
+  getAllRegionVPCAvailabilitiesRequest,
 } from './requests';
 
-import type { Region, RegionAvailability } from '@linode/api-v4/lib/regions';
+import type {
+  Region,
+  RegionAvailability,
+  RegionVPCAvailability,
+} from '@linode/api-v4/lib/regions';
 import type { APIError } from '@linode/api-v4/lib/types';
 
 export const regionQueries = createQueryKeys('regions', {
@@ -23,6 +32,19 @@ export const regionQueries = createQueryKeys('regions', {
         queryFn: () => getRegionAvailability(regionId),
         queryKey: [regionId],
       }),
+      vpc: {
+        contextQueries: {
+          all: {
+            queryFn: getAllRegionVPCAvailabilitiesRequest,
+            queryKey: null,
+          },
+          region: (regionId: string) => ({
+            queryFn: () => getRegionVPCAvailability(regionId),
+            queryKey: [regionId],
+          }),
+        },
+        queryKey: null,
+      },
     },
     queryKey: null,
   },
@@ -80,3 +102,19 @@ export const useRegionAvailabilityQuery = (
     enabled,
   });
 };
+
+export const useRegionsVPCAvailabilitiesQuery = (enabled: boolean = false) =>
+  useQuery<RegionVPCAvailability[], APIError[]>({
+    ...regionQueries.availability._ctx.vpc._ctx.all,
+    enabled,
+  });
+
+export const useRegionVPCAvailabilityQuery = (
+  regionId: string,
+  enabled: boolean = false,
+) => {
+  return useQuery<RegionVPCAvailability, APIError[]>({
+    ...regionQueries.availability._ctx.vpc._ctx.region(regionId),
+    enabled,
+  });
+};
diff --git a/packages/queries/src/regions/requests.ts b/packages/queries/src/regions/requests.ts
index 490101e19c3..74e0575aaff 100644
--- a/packages/queries/src/regions/requests.ts
+++ b/packages/queries/src/regions/requests.ts
@@ -1,7 +1,15 @@
-import { getRegionAvailabilities, getRegions } from '@linode/api-v4';
+import {
+  getRegionAvailabilities,
+  getRegions,
+  getRegionsVPCAvailabilities,
+} from '@linode/api-v4';
 import { getAll } from '@linode/utilities';
 
-import type { Region, RegionAvailability } from '@linode/api-v4';
+import type {
+  Region,
+  RegionAvailability,
+  RegionVPCAvailability,
+} from '@linode/api-v4';
 
 export const getAllRegionsRequest = () =>
   getAll<Region>((params) => getRegions(params))().then((data) => data.data);
@@ -10,3 +18,8 @@ export const getAllRegionAvailabilitiesRequest = () =>
   getAll<RegionAvailability>((params, filters) =>
     getRegionAvailabilities(params, filters),
   )().then((data) => data.data);
+
+export const getAllRegionVPCAvailabilitiesRequest = () =>
+  getAll<RegionVPCAvailability>((params, filters) =>
+    getRegionsVPCAvailabilities(params, filters),
+  )().then((data) => data.data);
diff --git a/packages/shared/CHANGELOG.md b/packages/shared/CHANGELOG.md
index dc146b6d71c..fbc2689765d 100644
--- a/packages/shared/CHANGELOG.md
+++ b/packages/shared/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [2025-10-07] - v0.9.0
+
+### Changed:
+
+- Update `useIsLinodeAclpSubscribed` to reflect updated API fields ([#12870](https://github.com/linode/manager/pull/12870))
+
 ## [2025-09-09] - v0.8.0
 
 ### Tests:
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 781bde21a8d..f586871fe92 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@linode/shared",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Linode shared feature component library",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -49,4 +49,4 @@
     "@types/react-dom": "^19.1.6",
     "vite-plugin-svgr": "^3.2.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/shared/src/hooks/useIsLinodeAclpSubscribed.test.ts b/packages/shared/src/hooks/useIsLinodeAclpSubscribed.test.ts
index 1c9aac39bb5..acb95442383 100644
--- a/packages/shared/src/hooks/useIsLinodeAclpSubscribed.test.ts
+++ b/packages/shared/src/hooks/useIsLinodeAclpSubscribed.test.ts
@@ -47,8 +47,8 @@ describe('useIsLinodeAclpSubscribed', () => {
           network_in: 0,
           network_out: 0,
           transfer_quota: 0,
-          system: [],
-          user: [],
+          system_alerts: [],
+          user_alerts: [],
         },
       },
     });
@@ -67,8 +67,8 @@ describe('useIsLinodeAclpSubscribed', () => {
           network_in: 0,
           network_out: 0,
           transfer_quota: 0,
-          system: [],
-          user: [],
+          system_alerts: [],
+          user_alerts: [],
         },
       },
     });
@@ -87,8 +87,8 @@ describe('useIsLinodeAclpSubscribed', () => {
           network_in: 0,
           network_out: 0,
           transfer_quota: 0,
-          system: [],
-          user: [],
+          system_alerts: [],
+          user_alerts: [],
         },
       },
     });
@@ -107,8 +107,8 @@ describe('useIsLinodeAclpSubscribed', () => {
           network_in: 0,
           network_out: 0,
           transfer_quota: 0,
-          system: [100],
-          user: [],
+          system_alerts: [100],
+          user_alerts: [],
         },
       },
     });
@@ -127,8 +127,8 @@ describe('useIsLinodeAclpSubscribed', () => {
           network_in: 0,
           network_out: 0,
           transfer_quota: 0,
-          system: [100],
-          user: [200],
+          system_alerts: [100],
+          user_alerts: [200],
         },
       },
     });
diff --git a/packages/shared/src/hooks/useIsLinodeAclpSubscribed.ts b/packages/shared/src/hooks/useIsLinodeAclpSubscribed.ts
index df71aa5b692..a2667c199e2 100644
--- a/packages/shared/src/hooks/useIsLinodeAclpSubscribed.ts
+++ b/packages/shared/src/hooks/useIsLinodeAclpSubscribed.ts
@@ -39,8 +39,8 @@ export const useIsLinodeAclpSubscribed = (
     (linode.alerts.transfer_quota ?? 0) > 0;
 
   const hasAclpAlerts =
-    (linode.alerts.system?.length ?? 0) > 0 ||
-    (linode.alerts.user?.length ?? 0) > 0;
+    (linode.alerts.system_alerts?.length ?? 0) > 0 ||
+    (linode.alerts.user_alerts?.length ?? 0) > 0;
 
   // Always subscribed if ACLP alerts exist. For GA stage, default to subscribed if no alerts exist.
   return (
diff --git a/packages/utilities/CHANGELOG.md b/packages/utilities/CHANGELOG.md
index 8dd220b6fb8..45657d0fdc0 100644
--- a/packages/utilities/CHANGELOG.md
+++ b/packages/utilities/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [2025-10-07] - v0.10.0
+
+
+### Added:
+
+- Added `regionVPCAvailabilityFactory` in regions.ts ([#12919](https://github.com/linode/manager/pull/12919))
+
 ## [2025-09-23] - v0.9.0
 
 ### Changed:
diff --git a/packages/utilities/package.json b/packages/utilities/package.json
index 0de28898e10..1d7b0441c4f 100644
--- a/packages/utilities/package.json
+++ b/packages/utilities/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@linode/utilities",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Linode Utility functions library",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -46,4 +46,4 @@
     "@types/react-dom": "^19.1.6",
     "factory.ts": "^0.5.1"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/utilities/src/__data__/regionsData.ts b/packages/utilities/src/__data__/regionsData.ts
index 84587c53e5c..371d18f1a66 100644
--- a/packages/utilities/src/__data__/regionsData.ts
+++ b/packages/utilities/src/__data__/regionsData.ts
@@ -13,6 +13,7 @@ export const regions: Region[] = [
       'VPCs',
       'Block Storage Migrations',
       'Managed Databases',
+      'Object Storage',
     ],
     country: 'in',
     id: 'ap-west',
@@ -27,7 +28,10 @@ export const regions: Region[] = [
     },
     site_type: 'core',
     status: 'ok',
-    monitors: { alerts: ['Cloud Firewall'], metrics: [] },
+    monitors: {
+      alerts: ['Cloud Firewall', 'Object Storage'],
+      metrics: ['Object Storage'],
+    },
   },
   {
     capabilities: [
@@ -113,7 +117,7 @@ export const regions: Region[] = [
     },
     site_type: 'core',
     status: 'ok',
-    monitors: { alerts: ['Linodes'], metrics: ['Linodes'] },
+    monitors: { alerts: ['Linodes', 'Object Storage'], metrics: ['Linodes'] },
   },
   {
     capabilities: [
diff --git a/packages/utilities/src/factories/delegation.ts b/packages/utilities/src/factories/delegation.ts
new file mode 100644
index 00000000000..d57349eac7e
--- /dev/null
+++ b/packages/utilities/src/factories/delegation.ts
@@ -0,0 +1,89 @@
+import { Factory } from './factoryProxy';
+
+import type {
+  Account,
+  ChildAccount,
+  ChildAccountWithDelegates,
+  IamUserRoles,
+} from '@linode/api-v4';
+
+export const mockDelegateUsersList = [
+  'John Doe',
+  'Jill Smith',
+  'Jack Black',
+  'Barbara White',
+  'Tom Brown',
+  'Sam Davis',
+  'Alice Wilson',
+  'Bob Taylor',
+  'Charlie Moore',
+  'Diana Harris',
+  'Ethan Clark',
+  'Fiona Scott',
+  'George Green',
+  'Hannah Brown',
+  'Isaac Lee',
+  'Julia Davis',
+  'Kevin Wilson',
+  'Linda Moore',
+  'Michael Harris',
+  'Nancy Taylor',
+  'Oliver Clark',
+  'Patricia Scott',
+  'Quincy Green',
+];
+
+export const childAccountFactory = Factory.Sync.makeFactory<ChildAccount>({
+  company: Factory.each((i) => `child-account-${i}`),
+  euuid: Factory.each(() => window.crypto.randomUUID()),
+});
+
+export const childAccountWithDelegatesFactory =
+  Factory.Sync.makeFactory<ChildAccountWithDelegates>({
+    company: Factory.each((i) => `child-account-${i}`),
+    euuid: Factory.each(() => window.crypto.randomUUID()),
+    users: [],
+  });
+
+export const delegatedChildAccountsForUserFactory =
+  Factory.Sync.makeFactory<ChildAccount>({
+    company: Factory.each((i) => `child-account-${i}`),
+    euuid: Factory.each(() => window.crypto.randomUUID()),
+  });
+
+export const childAccountDelegatesFactory = Factory.Sync.makeFactory<string[]>(
+  [],
+);
+
+export const myDelegatedChildAccountsFactory =
+  Factory.Sync.makeFactory<Account>({
+    euuid: Factory.each(() => window.crypto.randomUUID()),
+    active_promotions: [],
+    active_since: '',
+    address_1: '',
+    address_2: '',
+    balance: 0,
+    balance_uninvoiced: 0,
+    billing_source: 'linode',
+    capabilities: [],
+    city: '',
+    company: 'Parent Account Company',
+    country: '',
+    credit_card: {
+      expiry: '',
+      last_four: '',
+    },
+    email: 'parent@acme.com',
+    first_name: 'Parent',
+    last_name: 'Account',
+    phone: '',
+    state: '',
+    tax_id: '',
+    zip: '',
+  });
+
+export const delegateDefaultAccessFactory =
+  Factory.Sync.makeFactory<IamUserRoles>({
+    account_access: [],
+    entity_access: [],
+  });
diff --git a/packages/utilities/src/factories/index.ts b/packages/utilities/src/factories/index.ts
index c4fb376173f..7faf7f76996 100644
--- a/packages/utilities/src/factories/index.ts
+++ b/packages/utilities/src/factories/index.ts
@@ -1,6 +1,7 @@
 export * from './accountAvailability';
 export * from './betas';
 export * from './config';
+export * from './delegation';
 export * from './factoryProxy';
 export * from './grants';
 export * from './linodeConfigInterface';
diff --git a/packages/utilities/src/factories/regions.ts b/packages/utilities/src/factories/regions.ts
index 27b3b6ee165..adf4f746459 100644
--- a/packages/utilities/src/factories/regions.ts
+++ b/packages/utilities/src/factories/regions.ts
@@ -5,6 +5,7 @@ import type {
   DNSResolvers,
   Region,
   RegionAvailability,
+  RegionVPCAvailability,
 } from '@linode/api-v4/lib/regions/types';
 
 export const resolverFactory = Factory.Sync.makeFactory<DNSResolvers>({
@@ -59,3 +60,10 @@ export const regionAvailabilityFactory =
     plan: 'g6-standard-7',
     region: 'us-east',
   });
+
+export const regionVPCAvailabilityFactory =
+  Factory.Sync.makeFactory<RegionVPCAvailability>({
+    available: true,
+    available_ipv6_prefix_lengths: [52],
+    region: 'us-east',
+  });
diff --git a/packages/utilities/src/helpers/grants.test.ts b/packages/utilities/src/helpers/grants.test.ts
deleted file mode 100644
index ac5ad7f5fbf..00000000000
--- a/packages/utilities/src/helpers/grants.test.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import { grantsFactory } from '../factories';
-import { getEntityIdsByPermission } from './grants';
-
-const grants = grantsFactory.build({
-  linode: [
-    { id: 0, permissions: 'read_only' },
-    { id: 1, permissions: 'read_write' },
-    { id: 2, permissions: 'read_only' },
-    { id: 3, permissions: null },
-  ],
-});
-
-describe('getEntityIdsByPermission', () => {
-  it('should return an empty array when there is no grant data', () => {
-    expect(getEntityIdsByPermission(undefined, 'linode', 'read_write')).toEqual(
-      [],
-    );
-  });
-  it('should return read-only entity ids with read_only permission', () => {
-    expect(getEntityIdsByPermission(grants, 'linode', 'read_only')).toEqual([
-      0, 2,
-    ]);
-  });
-  it('should return all entity ids if a permission level is omitted', () => {
-    expect(getEntityIdsByPermission(grants, 'linode')).toEqual([0, 1, 2, 3]);
-  });
-});
diff --git a/packages/utilities/src/helpers/grants.ts b/packages/utilities/src/helpers/grants.ts
deleted file mode 100644
index 7ff57f237f6..00000000000
--- a/packages/utilities/src/helpers/grants.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type { GrantLevel, Grants, GrantType } from '@linode/api-v4';
-
-/**
- * Gets entity ids for a specified permission level given a user's grants
- * @param grants user grants (probably from React Query)
- * @param entity the entity type you want grants for
- * @param permission the level of permission you want ids for. Omit this for all entity ids.
- * @returns a list of entity ids that match given paramaters
- */
-export const getEntityIdsByPermission = (
-  grants: Grants | undefined,
-  entity: GrantType,
-  permission?: GrantLevel,
-) => {
-  if (!grants) {
-    return [];
-  }
-
-  if (permission === undefined) {
-    return grants[entity].map((grant) => grant.id);
-  }
-
-  return grants[entity]
-    .filter((grant) => grant.permissions === permission)
-    .map((grant) => grant.id);
-};
diff --git a/packages/utilities/src/helpers/index.ts b/packages/utilities/src/helpers/index.ts
index 6ccb85f515f..4e9ff3495d1 100644
--- a/packages/utilities/src/helpers/index.ts
+++ b/packages/utilities/src/helpers/index.ts
@@ -24,7 +24,6 @@ export * from './getDisplayName';
 export * from './getIsLegacyInterfaceArray';
 export * from './getNewRegionLabel';
 export * from './getUserTimezone';
-export * from './grants';
 export * from './groupByTags';
 export * from './initWindows';
 export * from './isNilOrEmpty';
diff --git a/packages/utilities/src/helpers/random.ts b/packages/utilities/src/helpers/random.ts
index c780a7d4bca..b263bdcf813 100644
--- a/packages/utilities/src/helpers/random.ts
+++ b/packages/utilities/src/helpers/random.ts
@@ -10,6 +10,17 @@ export const pickRandom = <T>(items: T[]): T => {
   return items[Math.floor(Math.random() * items.length)];
 };
 
+/**
+ * Similar to pickRandom, but picks multiple items from an array
+ * @param items { T[] } an array of any kind
+ * @param count { number } the number of items to pick
+ * @returns {T[]} an array of the given type
+ */
+export const pickRandomMultiple = <T>(items: T[], count: number): T[] => {
+  // eslint-disable-next-line sonarjs/pseudo-random
+  return items.sort(() => Math.random() - 0.5).slice(0, count);
+};
+
 /**
  * Generates a random date between two dates
  * @param start {Date} the start date
diff --git a/packages/validation/CHANGELOG.md b/packages/validation/CHANGELOG.md
index 704ffd9b103..1381f78933a 100644
--- a/packages/validation/CHANGELOG.md
+++ b/packages/validation/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [2025-10-07] - v0.76.0
+
+
+### Upcoming Features:
+
+- Update validation schema for Destination - Details - Path ([#12851](https://github.com/linode/manager/pull/12851))
+- Logs Delivery Stream and Destination details validation change for Update schemas ([#12898](https://github.com/linode/manager/pull/12898))
+
 ## [2025-09-23] - v0.75.0
 
 ### Changed:
diff --git a/packages/validation/package.json b/packages/validation/package.json
index 00692ae8baa..14e7040c24c 100644
--- a/packages/validation/package.json
+++ b/packages/validation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@linode/validation",
-  "version": "0.75.0",
+  "version": "0.76.0",
   "description": "Yup validation schemas for use with the Linode APIv4",
   "type": "module",
   "main": "lib/index.cjs",
diff --git a/packages/validation/src/delivery.schema.ts b/packages/validation/src/delivery.schema.ts
index 05dc69d2cd6..28203983c26 100644
--- a/packages/validation/src/delivery.schema.ts
+++ b/packages/validation/src/delivery.schema.ts
@@ -1,4 +1,4 @@
-import { array, boolean, mixed, number, object, string } from 'yup';
+import { array, boolean, lazy, mixed, number, object, string } from 'yup';
 
 import type { InferType, MixedSchema, Schema } from 'yup';
 
@@ -57,7 +57,7 @@ const customHTTPsDetailsSchema = object({
   endpoint_url: string().max(maxLength, maxLengthMessage).required(),
 });
 
-const linodeObjectStorageDetailsSchema = object({
+const linodeObjectStorageDetailsBaseSchema = object({
   host: string().max(maxLength, maxLengthMessage).required('Host is required.'),
   bucket_name: string()
     .max(maxLength, maxLengthMessage)
@@ -65,7 +65,7 @@ const linodeObjectStorageDetailsSchema = object({
   region: string()
     .max(maxLength, maxLengthMessage)
     .required('Region is required.'),
-  path: string().max(maxLength, maxLengthMessage).required('Path is required.'),
+  path: string().max(maxLength, maxLengthMessage).defined(),
   access_key_id: string()
     .max(maxLength, maxLengthMessage)
     .required('Access Key ID is required.'),
@@ -74,24 +74,69 @@ const linodeObjectStorageDetailsSchema = object({
     .required('Access Key Secret is required.'),
 });
 
-export const destinationSchema = object().shape({
+const linodeObjectStorageDetailsPayloadSchema =
+  linodeObjectStorageDetailsBaseSchema.shape({
+    path: string().max(maxLength, maxLengthMessage).optional(),
+  });
+
+const destinationSchemaBase = object().shape({
   label: string()
     .max(maxLength, maxLengthMessage)
     .required('Destination name is required.'),
   type: string().oneOf(['linode_object_storage', 'custom_https']).required(),
   details: mixed<
     | InferType<typeof customHTTPsDetailsSchema>
-    | InferType<typeof linodeObjectStorageDetailsSchema>
+    | InferType<typeof linodeObjectStorageDetailsBaseSchema>
+  >()
+    .defined()
+    .required()
+    .when('type', {
+      is: 'linode_object_storage',
+      then: () => linodeObjectStorageDetailsBaseSchema,
+      otherwise: () => customHTTPsDetailsSchema,
+    }),
+});
+
+export const destinationFormSchema = destinationSchemaBase;
+
+export const createDestinationSchema = destinationSchemaBase.shape({
+  details: mixed<
+    | InferType<typeof customHTTPsDetailsSchema>
+    | InferType<typeof linodeObjectStorageDetailsPayloadSchema>
   >()
     .defined()
     .required()
     .when('type', {
       is: 'linode_object_storage',
-      then: () => linodeObjectStorageDetailsSchema,
+      then: () => linodeObjectStorageDetailsPayloadSchema,
       otherwise: () => customHTTPsDetailsSchema,
     }),
 });
 
+export const updateDestinationSchema = createDestinationSchema
+  .omit(['type'])
+  .shape({
+    details: lazy((value) => {
+      if ('bucket_name' in value) {
+        return linodeObjectStorageDetailsPayloadSchema.noUnknown(
+          'Object contains unknown fields for Linode Object Storage Details.',
+        );
+      }
+      if ('client_certificate_details' in value) {
+        return customHTTPsDetailsSchema.noUnknown(
+          'Object contains unknown fields for Custom HTTPS Details.',
+        );
+      }
+
+      // fallback schema: force error
+      return mixed().test({
+        name: 'details-schema',
+        message: 'Details object does not match any known schema.',
+        test: () => false,
+      });
+    }),
+  });
+
 // Logs Delivery Stream
 
 const streamDetailsBase = object({
@@ -111,13 +156,13 @@ const streamDetailsSchema = streamDetailsBase.test(
   },
 );
 
-const detailsShouldBeEmpty = (schema: MixedSchema) =>
+const detailsShouldNotExistOrBeNull = (schema: MixedSchema) =>
   schema
-    .defined()
+    .nullable()
     .test(
-      'details-should-be-empty',
-      'Empty details for type `audit_logs`',
-      (value) => Object.keys(value).length === 0,
+      'details-should-not-exist',
+      'Details should be null or no details passed for type `audit_logs`',
+      (value, ctx) => !('details' in ctx) || value === null,
     );
 
 const streamSchemaBase = object({
@@ -130,35 +175,49 @@ const streamSchemaBase = object({
     .oneOf(['audit_logs', 'lke_audit_logs'])
     .required('Stream type is required.'),
   destinations: array().of(number().defined()).ensure().min(1).required(),
-  details: mixed<InferType<typeof streamDetailsSchema> | object>()
-    .when('type', {
-      is: 'lke_audit_logs',
-      then: () => streamDetailsSchema.required(),
-      otherwise: detailsShouldBeEmpty,
-    })
-    .required(),
+  details: mixed().when('type', {
+    is: 'lke_audit_logs',
+    then: () => streamDetailsSchema.required(),
+    otherwise: detailsShouldNotExistOrBeNull,
+  }),
 });
 
 export const createStreamSchema = streamSchemaBase;
 
-export const updateStreamSchema = streamSchemaBase.shape({
-  status: mixed<'active' | 'inactive'>()
-    .oneOf(['active', 'inactive'])
-    .required(),
-});
+export const updateStreamSchema = streamSchemaBase
+  .omit(['type'])
+  .shape({
+    status: mixed<'active' | 'inactive'>()
+      .oneOf(['active', 'inactive'])
+      .required(),
+    details: lazy((value) => {
+      if (
+        value &&
+        typeof value === 'object' &&
+        ('cluster_ids' in value || 'is_auto_add_all_clusters_enabled' in value)
+      ) {
+        return streamDetailsSchema.required();
+      }
+
+      // fallback schema: detailsShouldNotExistOrBeNull
+      return detailsShouldNotExistOrBeNull(mixed());
+    }),
+  })
+  .noUnknown('Object contains unknown fields');
 
 export const streamAndDestinationFormSchema = object({
   stream: streamSchemaBase.shape({
     destinations: array().of(number().required()).required(),
-    details: mixed<InferType<typeof streamDetailsSchema> | object>()
-      .when('type', {
-        is: 'lke_audit_logs',
-        then: () => streamDetailsBase.required(),
-        otherwise: detailsShouldBeEmpty,
-      })
-      .required(),
+    details: mixed().when('type', {
+      is: 'lke_audit_logs',
+      then: () => streamDetailsBase.required(),
+      otherwise: (schema) =>
+        schema
+          .nullable()
+          .equals([null], 'Details must be null for audit_logs type'),
+    }) as Schema<InferType<typeof streamDetailsSchema> | null>,
   }),
-  destination: destinationSchema.defined().when('stream.destinations', {
+  destination: destinationFormSchema.defined().when('stream.destinations', {
     is: (value: never[]) => !value?.length,
     then: (schema) => schema,
     otherwise: (schema) =>
diff --git a/packages/validation/src/linodes.schema.ts b/packages/validation/src/linodes.schema.ts
index bcbe5d49bec..4de83f20225 100644
--- a/packages/validation/src/linodes.schema.ts
+++ b/packages/validation/src/linodes.schema.ts
@@ -363,15 +363,41 @@ const DiskEncryptionSchema = string()
   .oneOf(['enabled', 'disabled'])
   .notRequired();
 
-export const alertsSchema = object({
-  cpu: number()
-    .required('CPU Usage is required.')
+/**
+ * A number field schema with conditional validation for legacy alert fields.
+ * @param label - The label used in the required error message.
+ * @returns A number schema with conditional validation.
+ */
+const legacyAlertsFieldSchema = (
+  label:
+    | 'CPU Usage'
+    | 'Disk I/O Rate'
+    | 'Incoming Traffic'
+    | 'Outbound Traffic'
+    | 'Transfer Quota',
+) =>
+  // If system_alerts and user_alerts are undefined, then it is legacy alerts context.
+  // If it is legacy alerts context, then the field is required.
+  number().when(['system_alerts', 'user_alerts'], {
+    is: (systemAlerts?: number[], userAlerts?: number[]) => {
+      return systemAlerts === undefined && userAlerts === undefined;
+    },
+    then: (schema) => schema.required(`${label} is required.`),
+    otherwise: (schema) => schema.notRequired(),
+  });
+
+export const UpdateLinodeAlertsSchema = object({
+  // Legacy numeric-threshold alerts. All fields are required to update legacy alerts, but not for ACLP alerts.
+  cpu: legacyAlertsFieldSchema('CPU Usage')
     .min(0, 'Must be between 0 and 4800')
     .max(4800, 'Must be between 0 and 4800'),
-  network_in: number().required('Incoming Traffic is required.'),
-  network_out: number().required('Outbound Traffic is required.'),
-  transfer_quota: number().required('Transfer Quota is required.'),
-  io: number().required('Disk I/O Rate is required.'),
+  network_in: legacyAlertsFieldSchema('Incoming Traffic'),
+  network_out: legacyAlertsFieldSchema('Outbound Traffic'),
+  transfer_quota: legacyAlertsFieldSchema('Transfer Quota'),
+  io: legacyAlertsFieldSchema('Disk I/O Rate'),
+  // ACLP alerts. All fields are required to update ACLP alerts, but not for legacy alerts.
+  system_alerts: array().of(number().defined()).notRequired(),
+  user_alerts: array().of(number().defined()).notRequired(),
 });
 
 const schedule = object({
@@ -420,7 +446,7 @@ export const UpdateLinodeSchema = object({
     .max(64, LINODE_LABEL_CHAR_REQUIREMENT),
   tags: array().of(string()).notRequired(),
   watchdog_enabled: boolean().notRequired(),
-  alerts: alertsSchema.notRequired().default(undefined),
+  alerts: UpdateLinodeAlertsSchema.notRequired().default(undefined),
   backups,
 });
 
@@ -656,9 +682,9 @@ const CreateVlanInterfaceSchema = object({
   ipam_address: string().nullable(),
 });
 
-const AclpAlertsPayloadSchema = object({
-  system: array().of(number().defined()).required(),
-  user: array().of(number().defined()).required(),
+const CreateLinodeAclpAlertsSchema = object({
+  system_alerts: array().of(number().defined()).required(),
+  user_alerts: array().of(number().defined()).required(),
 });
 
 export const CreateVPCInterfaceSchema = object({
@@ -830,5 +856,5 @@ export const CreateLinodeSchema = object({
     .oneOf(['linode/migrate', 'linode/power_off_on', undefined])
     .notRequired()
     .nullable(),
-  alerts: AclpAlertsPayloadSchema.notRequired().default(undefined),
+  alerts: CreateLinodeAclpAlertsSchema.notRequired().default(undefined),
 });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8e0b8a9b0f0..4537fd1e4cd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,6 +8,8 @@ overrides:
   semver: ^7.5.2
   yaml: ^2.3.0
   form-data: ^4.0.4
+  brace-expansion@>=1.0.0 <=1.1.11: '>=1.1.12'
+  brace-expansion@>=2.0.0 <=2.0.1: '>=2.0.2'
 
 importers:
 
@@ -84,7 +86,7 @@ importers:
         version: 8.29.0(eslint@9.31.0(jiti@2.4.2))(typescript@5.7.3)
       vitest:
         specifier: ^3.1.2
-        version: 3.1.2(@types/debug@4.1.12)(@types/node@20.17.6)(@vitest/ui@3.1.2)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@20.17.6)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+        version: 3.1.2(@types/debug@4.1.12)(@types/node@22.18.1)(@vitest/ui@3.1.2)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
 
   packages/api-v4:
     dependencies:
@@ -356,7 +358,7 @@ importers:
         version: 9.0.12(@types/react@19.1.6)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))
       '@storybook/react-vite':
         specifier: ^9.0.12
-        version: 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.50.1)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.50.1)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       '@swc/core':
         specifier: ^1.10.9
         version: 1.10.11
@@ -412,8 +414,8 @@ importers:
         specifier: ^10.0.2
         version: 10.0.9
       '@types/node':
-        specifier: ^20.17.0
-        version: 20.17.6
+        specifier: ^22.13.14
+        version: 22.18.1
       '@types/ramda':
         specifier: 0.25.16
         version: 0.25.16
@@ -440,7 +442,7 @@ importers:
         version: 4.4.5
       '@vitejs/plugin-react-swc':
         specifier: ^3.7.2
-        version: 3.7.2(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 3.7.2(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       '@vitest/coverage-v8':
         specifier: ^3.1.2
         version: 3.1.2(vitest@3.1.2)
@@ -482,7 +484,7 @@ importers:
         version: 1.14.0(cypress@14.3.0)
       cypress-vite:
         specifier: ^1.6.0
-        version: 1.6.0(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 1.6.0(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       dotenv:
         specifier: ^16.0.3
         version: 16.4.5
@@ -506,7 +508,7 @@ importers:
         version: 2.2.1(mocha@10.8.2)
       msw:
         specifier: ^2.2.3
-        version: 2.6.5(@types/node@20.17.6)(typescript@5.7.3)
+        version: 2.6.5(@types/node@22.18.1)(typescript@5.7.3)
       pdfreader:
         specifier: ^3.0.7
         version: 3.0.7
@@ -518,10 +520,10 @@ importers:
         version: 9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3)
       vite:
         specifier: ^6.3.6
-        version: 6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+        version: 6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
       vite-plugin-svgr:
         specifier: ^3.2.0
-        version: 3.3.0(rollup@4.50.1)(typescript@5.7.3)(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 3.3.0(rollup@4.50.1)(typescript@5.7.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
 
   packages/queries:
     dependencies:
@@ -573,7 +575,7 @@ importers:
         version: 4.2.0
       vite:
         specifier: '*'
-        version: 6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+        version: 6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     devDependencies:
       '@linode/tsconfig':
         specifier: workspace:*
@@ -605,7 +607,7 @@ importers:
         version: link:../tsconfig
       '@storybook/react-vite':
         specifier: ^9.0.12
-        version: 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.50.1)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.50.1)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       '@testing-library/dom':
         specifier: ^10.1.0
         version: 10.4.0
@@ -629,7 +631,7 @@ importers:
         version: 9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3)
       vite-plugin-svgr:
         specifier: ^3.2.0
-        version: 3.3.0(rollup@4.50.1)(typescript@5.7.3)(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 3.3.0(rollup@4.50.1)(typescript@5.7.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
 
   packages/tsconfig: {}
 
@@ -674,7 +676,7 @@ importers:
         version: link:../tsconfig
       '@storybook/react-vite':
         specifier: ^9.0.12
-        version: 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.50.1)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.50.1)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       '@testing-library/dom':
         specifier: ^10.1.0
         version: 10.4.0
@@ -701,7 +703,7 @@ importers:
         version: 9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3)
       vite-plugin-svgr:
         specifier: ^3.2.0
-        version: 3.3.0(rollup@4.50.1)(typescript@5.7.3)(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+        version: 3.3.0(rollup@4.50.1)(typescript@5.7.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
 
   packages/utilities:
     dependencies:
@@ -771,8 +773,8 @@ importers:
         specifier: ^14.1.2
         version: 14.1.2
       '@types/node':
-        specifier: ^20.17.0
-        version: 20.17.6
+        specifier: ^22.13.14
+        version: 22.18.1
       chalk:
         specifier: ^5.2.0
         version: 5.4.1
@@ -781,7 +783,7 @@ importers:
         version: 6.2.1
       inquirer:
         specifier: ^12.9.4
-        version: 12.9.4(@types/node@20.17.6)
+        version: 12.9.4(@types/node@22.18.1)
       junit2json:
         specifier: ^3.1.4
         version: 3.1.12
@@ -2594,8 +2596,8 @@ packages:
   '@types/ms@2.1.0':
     resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
 
-  '@types/node@20.17.6':
-    resolution: {integrity: sha512-VEI7OdvK2wP7XHnsuXbAJnEpEkF6NjSN45QJlL4VGqZSXsnicpesdTWsg9RISeSdYd3yeRj/y3k5KGjUXYnFwQ==}
+  '@types/node@22.18.1':
+    resolution: {integrity: sha512-rzSDyhn4cYznVG+PCzGe1lwuMYJrcBS1fc3JqSa2PvtABwWo+dZ1ij5OVok3tqfpEBCBoaR4d7upFJk73HRJDw==}
 
   '@types/novnc__novnc@1.5.0':
     resolution: {integrity: sha512-9DrDJK1hUT6Cbp4t03IsU/DsR6ndnIrDgZVrzITvspldHQ7n81F3wUDfq89zmPM3wg4GErH11IQa0QuTgLMf+w==}
@@ -3062,12 +3064,6 @@ packages:
   bluebird@3.7.2:
     resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
 
-  brace-expansion@1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
-
-  brace-expansion@2.0.1:
-    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
-
   brace-expansion@2.0.2:
     resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
 
@@ -3319,9 +3315,6 @@ packages:
     resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
     engines: {node: '>=4.0.0'}
 
-  concat-map@0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
-
   concurrently@9.1.0:
     resolution: {integrity: sha512-VxkzwMAn4LP7WyMnJNbHN5mKV9L2IbyDjpzemKr99sXNR3GqRNMMHdm7prV1ws9wg7ETj6WUkNOigZVsptwbgg==}
     engines: {node: '>=18'}
@@ -4011,8 +4004,8 @@ packages:
     resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==}
     engines: {node: '>= 0.4'}
 
-  foreground-child@3.3.0:
-    resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==}
+  foreground-child@3.3.1:
+    resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==}
     engines: {node: '>=14'}
 
   forever-agent@0.6.1:
@@ -6084,8 +6077,8 @@ packages:
     resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}
     engines: {node: '>= 0.4'}
 
-  undici-types@6.19.8:
-    resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
+  undici-types@6.21.0:
+    resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
 
   unicorn-magic@0.1.0:
     resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
@@ -7021,33 +7014,33 @@ snapshots:
 
   '@humanwhocodes/retry@0.4.2': {}
 
-  '@inquirer/checkbox@4.2.2(@types/node@20.17.6)':
+  '@inquirer/checkbox@4.2.2(@types/node@22.18.1)':
     dependencies:
-      '@inquirer/core': 10.2.0(@types/node@20.17.6)
+      '@inquirer/core': 10.2.0(@types/node@22.18.1)
       '@inquirer/figures': 1.0.13
-      '@inquirer/type': 3.0.8(@types/node@20.17.6)
+      '@inquirer/type': 3.0.8(@types/node@22.18.1)
       ansi-escapes: 4.3.2
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
-  '@inquirer/confirm@5.1.0(@types/node@20.17.6)':
+  '@inquirer/confirm@5.1.0(@types/node@22.18.1)':
     dependencies:
-      '@inquirer/core': 10.1.1(@types/node@20.17.6)
-      '@inquirer/type': 3.0.1(@types/node@20.17.6)
-      '@types/node': 20.17.6
+      '@inquirer/core': 10.1.1(@types/node@22.18.1)
+      '@inquirer/type': 3.0.1(@types/node@22.18.1)
+      '@types/node': 22.18.1
 
-  '@inquirer/confirm@5.1.16(@types/node@20.17.6)':
+  '@inquirer/confirm@5.1.16(@types/node@22.18.1)':
     dependencies:
-      '@inquirer/core': 10.2.0(@types/node@20.17.6)
-      '@inquirer/type': 3.0.8(@types/node@20.17.6)
+      '@inquirer/core': 10.2.0(@types/node@22.18.1)
+      '@inquirer/type': 3.0.8(@types/node@22.18.1)
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
-  '@inquirer/core@10.1.1(@types/node@20.17.6)':
+  '@inquirer/core@10.1.1(@types/node@22.18.1)':
     dependencies:
       '@inquirer/figures': 1.0.8
-      '@inquirer/type': 3.0.1(@types/node@20.17.6)
+      '@inquirer/type': 3.0.1(@types/node@22.18.1)
       ansi-escapes: 4.3.2
       cli-width: 4.1.0
       mute-stream: 2.0.0
@@ -7058,10 +7051,10 @@ snapshots:
     transitivePeerDependencies:
       - '@types/node'
 
-  '@inquirer/core@10.2.0(@types/node@20.17.6)':
+  '@inquirer/core@10.2.0(@types/node@22.18.1)':
     dependencies:
       '@inquirer/figures': 1.0.13
-      '@inquirer/type': 3.0.8(@types/node@20.17.6)
+      '@inquirer/type': 3.0.8(@types/node@22.18.1)
       ansi-escapes: 4.3.2
       cli-width: 4.1.0
       mute-stream: 2.0.0
@@ -7069,106 +7062,106 @@ snapshots:
       wrap-ansi: 6.2.0
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
-  '@inquirer/editor@4.2.18(@types/node@20.17.6)':
+  '@inquirer/editor@4.2.18(@types/node@22.18.1)':
     dependencies:
-      '@inquirer/core': 10.2.0(@types/node@20.17.6)
-      '@inquirer/external-editor': 1.0.1(@types/node@20.17.6)
-      '@inquirer/type': 3.0.8(@types/node@20.17.6)
+      '@inquirer/core': 10.2.0(@types/node@22.18.1)
+      '@inquirer/external-editor': 1.0.1(@types/node@22.18.1)
+      '@inquirer/type': 3.0.8(@types/node@22.18.1)
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
-  '@inquirer/expand@4.0.18(@types/node@20.17.6)':
+  '@inquirer/expand@4.0.18(@types/node@22.18.1)':
     dependencies:
-      '@inquirer/core': 10.2.0(@types/node@20.17.6)
-      '@inquirer/type': 3.0.8(@types/node@20.17.6)
+      '@inquirer/core': 10.2.0(@types/node@22.18.1)
+      '@inquirer/type': 3.0.8(@types/node@22.18.1)
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
-  '@inquirer/external-editor@1.0.1(@types/node@20.17.6)':
+  '@inquirer/external-editor@1.0.1(@types/node@22.18.1)':
     dependencies:
       chardet: 2.1.0
       iconv-lite: 0.6.3
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
   '@inquirer/figures@1.0.13': {}
 
   '@inquirer/figures@1.0.8': {}
 
-  '@inquirer/input@4.2.2(@types/node@20.17.6)':
+  '@inquirer/input@4.2.2(@types/node@22.18.1)':
     dependencies:
-      '@inquirer/core': 10.2.0(@types/node@20.17.6)
-      '@inquirer/type': 3.0.8(@types/node@20.17.6)
+      '@inquirer/core': 10.2.0(@types/node@22.18.1)
+      '@inquirer/type': 3.0.8(@types/node@22.18.1)
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
-  '@inquirer/number@3.0.18(@types/node@20.17.6)':
+  '@inquirer/number@3.0.18(@types/node@22.18.1)':
     dependencies:
-      '@inquirer/core': 10.2.0(@types/node@20.17.6)
-      '@inquirer/type': 3.0.8(@types/node@20.17.6)
+      '@inquirer/core': 10.2.0(@types/node@22.18.1)
+      '@inquirer/type': 3.0.8(@types/node@22.18.1)
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
-  '@inquirer/password@4.0.18(@types/node@20.17.6)':
+  '@inquirer/password@4.0.18(@types/node@22.18.1)':
     dependencies:
-      '@inquirer/core': 10.2.0(@types/node@20.17.6)
-      '@inquirer/type': 3.0.8(@types/node@20.17.6)
+      '@inquirer/core': 10.2.0(@types/node@22.18.1)
+      '@inquirer/type': 3.0.8(@types/node@22.18.1)
       ansi-escapes: 4.3.2
     optionalDependencies:
-      '@types/node': 20.17.6
-
-  '@inquirer/prompts@7.8.4(@types/node@20.17.6)':
-    dependencies:
-      '@inquirer/checkbox': 4.2.2(@types/node@20.17.6)
-      '@inquirer/confirm': 5.1.16(@types/node@20.17.6)
-      '@inquirer/editor': 4.2.18(@types/node@20.17.6)
-      '@inquirer/expand': 4.0.18(@types/node@20.17.6)
-      '@inquirer/input': 4.2.2(@types/node@20.17.6)
-      '@inquirer/number': 3.0.18(@types/node@20.17.6)
-      '@inquirer/password': 4.0.18(@types/node@20.17.6)
-      '@inquirer/rawlist': 4.1.6(@types/node@20.17.6)
-      '@inquirer/search': 3.1.1(@types/node@20.17.6)
-      '@inquirer/select': 4.3.2(@types/node@20.17.6)
+      '@types/node': 22.18.1
+
+  '@inquirer/prompts@7.8.4(@types/node@22.18.1)':
+    dependencies:
+      '@inquirer/checkbox': 4.2.2(@types/node@22.18.1)
+      '@inquirer/confirm': 5.1.16(@types/node@22.18.1)
+      '@inquirer/editor': 4.2.18(@types/node@22.18.1)
+      '@inquirer/expand': 4.0.18(@types/node@22.18.1)
+      '@inquirer/input': 4.2.2(@types/node@22.18.1)
+      '@inquirer/number': 3.0.18(@types/node@22.18.1)
+      '@inquirer/password': 4.0.18(@types/node@22.18.1)
+      '@inquirer/rawlist': 4.1.6(@types/node@22.18.1)
+      '@inquirer/search': 3.1.1(@types/node@22.18.1)
+      '@inquirer/select': 4.3.2(@types/node@22.18.1)
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
-  '@inquirer/rawlist@4.1.6(@types/node@20.17.6)':
+  '@inquirer/rawlist@4.1.6(@types/node@22.18.1)':
     dependencies:
-      '@inquirer/core': 10.2.0(@types/node@20.17.6)
-      '@inquirer/type': 3.0.8(@types/node@20.17.6)
+      '@inquirer/core': 10.2.0(@types/node@22.18.1)
+      '@inquirer/type': 3.0.8(@types/node@22.18.1)
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
-  '@inquirer/search@3.1.1(@types/node@20.17.6)':
+  '@inquirer/search@3.1.1(@types/node@22.18.1)':
     dependencies:
-      '@inquirer/core': 10.2.0(@types/node@20.17.6)
+      '@inquirer/core': 10.2.0(@types/node@22.18.1)
       '@inquirer/figures': 1.0.13
-      '@inquirer/type': 3.0.8(@types/node@20.17.6)
+      '@inquirer/type': 3.0.8(@types/node@22.18.1)
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
-  '@inquirer/select@4.3.2(@types/node@20.17.6)':
+  '@inquirer/select@4.3.2(@types/node@22.18.1)':
     dependencies:
-      '@inquirer/core': 10.2.0(@types/node@20.17.6)
+      '@inquirer/core': 10.2.0(@types/node@22.18.1)
       '@inquirer/figures': 1.0.13
-      '@inquirer/type': 3.0.8(@types/node@20.17.6)
+      '@inquirer/type': 3.0.8(@types/node@22.18.1)
       ansi-escapes: 4.3.2
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
-  '@inquirer/type@3.0.1(@types/node@20.17.6)':
+  '@inquirer/type@3.0.1(@types/node@22.18.1)':
     dependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
-  '@inquirer/type@3.0.8(@types/node@20.17.6)':
+  '@inquirer/type@3.0.8(@types/node@22.18.1)':
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
   '@isaacs/cliui@8.0.2':
     dependencies:
@@ -7181,12 +7174,12 @@ snapshots:
 
   '@istanbuljs/schema@0.1.3': {}
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.6.0(typescript@5.7.3)(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.6.0(typescript@5.7.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
     dependencies:
       glob: 10.4.5
       magic-string: 0.30.17
       react-docgen-typescript: 2.2.2(typescript@5.7.3)
-      vite: 6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     optionalDependencies:
       typescript: 5.7.3
 
@@ -7706,12 +7699,12 @@ snapshots:
     transitivePeerDependencies:
       - '@types/react'
 
-  '@storybook/builder-vite@9.0.12(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
+  '@storybook/builder-vite@9.0.12(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
     dependencies:
       '@storybook/csf-plugin': 9.0.12(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))
       storybook: 9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3)
       ts-dedent: 2.2.0
-      vite: 6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
 
   '@storybook/csf-plugin@9.0.12(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))':
     dependencies:
@@ -7736,11 +7729,11 @@ snapshots:
       react-dom: 19.1.0(react@19.1.0)
       storybook: 9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3)
 
-  '@storybook/react-vite@9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.50.1)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
+  '@storybook/react-vite@9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(rollup@4.50.1)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.6.0(typescript@5.7.3)(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.6.0(typescript@5.7.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       '@rollup/pluginutils': 5.1.3(rollup@4.50.1)
-      '@storybook/builder-vite': 9.0.12(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+      '@storybook/builder-vite': 9.0.12(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       '@storybook/react': 9.0.12(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(storybook@9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3))(typescript@5.7.3)
       find-up: 7.0.0
       magic-string: 0.30.17
@@ -7750,7 +7743,7 @@ snapshots:
       resolve: 1.22.8
       storybook: 9.0.12(@testing-library/dom@10.4.0)(prettier@3.5.3)
       tsconfig-paths: 4.2.0
-      vite: 6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -8115,9 +8108,9 @@ snapshots:
   '@types/ms@2.1.0':
     optional: true
 
-  '@types/node@20.17.6':
+  '@types/node@22.18.1':
     dependencies:
-      undici-types: 6.19.8
+      undici-types: 6.21.0
 
   '@types/novnc__novnc@1.5.0': {}
 
@@ -8179,11 +8172,11 @@ snapshots:
 
   '@types/xml2js@0.4.14':
     dependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
   '@types/yauzl@2.10.3':
     dependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
     optional: true
 
   '@types/zxcvbn@4.4.5': {}
@@ -8360,10 +8353,10 @@ snapshots:
 
   '@ungap/structured-clone@1.3.0': {}
 
-  '@vitejs/plugin-react-swc@3.7.2(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
+  '@vitejs/plugin-react-swc@3.7.2(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
     dependencies:
       '@swc/core': 1.10.11
-      vite: 6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - '@swc/helpers'
 
@@ -8381,7 +8374,7 @@ snapshots:
       std-env: 3.9.0
       test-exclude: 7.0.1
       tinyrainbow: 2.0.0
-      vitest: 3.1.2(@types/debug@4.1.12)(@types/node@20.17.6)(@vitest/ui@3.1.2)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@20.17.6)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vitest: 3.1.2(@types/debug@4.1.12)(@types/node@22.18.1)(@vitest/ui@3.1.2)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -8399,14 +8392,14 @@ snapshots:
       chai: 5.2.0
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.1.2(msw@2.6.5(@types/node@20.17.6)(typescript@5.7.3))(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
+  '@vitest/mocker@3.1.2(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))':
     dependencies:
       '@vitest/spy': 3.1.2
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
-      msw: 2.6.5(@types/node@20.17.6)(typescript@5.7.3)
-      vite: 6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      msw: 2.6.5(@types/node@22.18.1)(typescript@5.7.3)
+      vite: 6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
 
   '@vitest/pretty-format@3.0.9':
     dependencies:
@@ -8444,7 +8437,7 @@ snapshots:
       sirv: 3.0.1
       tinyglobby: 0.2.13
       tinyrainbow: 2.0.0
-      vitest: 3.1.2(@types/debug@4.1.12)(@types/node@20.17.6)(@vitest/ui@3.1.2)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@20.17.6)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vitest: 3.1.2(@types/debug@4.1.12)(@types/node@22.18.1)(@vitest/ui@3.1.2)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
 
   '@vitest/utils@3.0.9':
     dependencies:
@@ -8700,15 +8693,6 @@ snapshots:
 
   bluebird@3.7.2: {}
 
-  brace-expansion@1.1.11:
-    dependencies:
-      balanced-match: 1.0.2
-      concat-map: 0.0.1
-
-  brace-expansion@2.0.1:
-    dependencies:
-      balanced-match: 1.0.2
-
   brace-expansion@2.0.2:
     dependencies:
       balanced-match: 1.0.2
@@ -8970,8 +8954,6 @@ snapshots:
 
   common-tags@1.8.2: {}
 
-  concat-map@0.0.1: {}
-
   concurrently@9.1.0:
     dependencies:
       chalk: 4.1.2
@@ -9086,11 +9068,11 @@ snapshots:
     dependencies:
       cypress: 14.3.0
 
-  cypress-vite@1.6.0(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)):
+  cypress-vite@1.6.0(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)):
     dependencies:
       chokidar: 3.6.0
       debug: 4.4.0(supports-color@8.1.1)
-      vite: 6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -9847,7 +9829,7 @@ snapshots:
     dependencies:
       is-callable: 1.2.7
 
-  foreground-child@3.3.0:
+  foreground-child@3.3.1:
     dependencies:
       cross-spawn: 7.0.6
       signal-exit: 4.1.0
@@ -9977,7 +9959,7 @@ snapshots:
 
   glob@10.4.5:
     dependencies:
-      foreground-child: 3.3.0
+      foreground-child: 3.3.1
       jackspeak: 3.4.3
       minimatch: 9.0.5
       minipass: 7.1.2
@@ -10161,17 +10143,17 @@ snapshots:
 
   inject-stylesheet@6.0.1: {}
 
-  inquirer@12.9.4(@types/node@20.17.6):
+  inquirer@12.9.4(@types/node@22.18.1):
     dependencies:
-      '@inquirer/core': 10.2.0(@types/node@20.17.6)
-      '@inquirer/prompts': 7.8.4(@types/node@20.17.6)
-      '@inquirer/type': 3.0.8(@types/node@20.17.6)
+      '@inquirer/core': 10.2.0(@types/node@22.18.1)
+      '@inquirer/prompts': 7.8.4(@types/node@22.18.1)
+      '@inquirer/type': 3.0.8(@types/node@22.18.1)
       ansi-escapes: 4.3.2
       mute-stream: 2.0.0
       run-async: 4.0.6
       rxjs: 7.8.2
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
 
   internal-slot@1.1.0:
     dependencies:
@@ -10756,7 +10738,7 @@ snapshots:
 
   minimatch@3.1.2:
     dependencies:
-      brace-expansion: 1.1.11
+      brace-expansion: 2.0.2
 
   minimatch@5.1.6:
     dependencies:
@@ -10764,7 +10746,7 @@ snapshots:
 
   minimatch@9.0.5:
     dependencies:
-      brace-expansion: 2.0.1
+      brace-expansion: 2.0.2
 
   minimist@1.2.8: {}
 
@@ -10847,12 +10829,12 @@ snapshots:
 
   ms@2.1.3: {}
 
-  msw@2.6.5(@types/node@20.17.6)(typescript@5.7.3):
+  msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3):
     dependencies:
       '@bundled-es-modules/cookie': 2.0.1
       '@bundled-es-modules/statuses': 1.0.1
       '@bundled-es-modules/tough-cookie': 0.1.6
-      '@inquirer/confirm': 5.1.0(@types/node@20.17.6)
+      '@inquirer/confirm': 5.1.0(@types/node@22.18.1)
       '@mswjs/interceptors': 0.37.1
       '@open-draft/deferred-promise': 2.2.0
       '@open-draft/until': 2.1.0
@@ -12118,7 +12100,7 @@ snapshots:
       has-symbols: 1.1.0
       which-boxed-primitive: 1.1.1
 
-  undici-types@6.19.8: {}
+  undici-types@6.21.0: {}
 
   unicorn-magic@0.1.0: {}
 
@@ -12221,13 +12203,13 @@ snapshots:
       d3-time: 3.1.0
       d3-timer: 3.0.1
 
-  vite-node@3.1.2(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1):
+  vite-node@3.1.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       es-module-lexer: 1.6.0
       pathe: 2.0.3
-      vite: 6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -12242,18 +12224,18 @@ snapshots:
       - tsx
       - yaml
 
-  vite-plugin-svgr@3.3.0(rollup@4.50.1)(typescript@5.7.3)(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)):
+  vite-plugin-svgr@3.3.0(rollup@4.50.1)(typescript@5.7.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)):
     dependencies:
       '@rollup/pluginutils': 5.1.3(rollup@4.50.1)
       '@svgr/core': 8.1.0(typescript@5.7.3)
       '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.7.3))
-      vite: 6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
     transitivePeerDependencies:
       - rollup
       - supports-color
       - typescript
 
-  vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1):
+  vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1):
     dependencies:
       esbuild: 0.25.9
       fdir: 6.5.0(picomatch@4.0.3)
@@ -12262,17 +12244,17 @@ snapshots:
       rollup: 4.50.1
       tinyglobby: 0.2.15
     optionalDependencies:
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
       fsevents: 2.3.3
       jiti: 2.4.2
       terser: 5.36.0
       tsx: 4.19.3
       yaml: 2.6.1
 
-  vitest@3.1.2(@types/debug@4.1.12)(@types/node@20.17.6)(@vitest/ui@3.1.2)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@20.17.6)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1):
+  vitest@3.1.2(@types/debug@4.1.12)(@types/node@22.18.1)(@vitest/ui@3.1.2)(jiti@2.4.2)(jsdom@24.1.3)(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1):
     dependencies:
       '@vitest/expect': 3.1.2
-      '@vitest/mocker': 3.1.2(msw@2.6.5(@types/node@20.17.6)(typescript@5.7.3))(vite@6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
+      '@vitest/mocker': 3.1.2(msw@2.6.5(@types/node@22.18.1)(typescript@5.7.3))(vite@6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1))
       '@vitest/pretty-format': 3.1.2
       '@vitest/runner': 3.1.2
       '@vitest/snapshot': 3.1.2
@@ -12289,12 +12271,12 @@ snapshots:
       tinyglobby: 0.2.13
       tinypool: 1.0.2
       tinyrainbow: 2.0.0
-      vite: 6.3.6(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
-      vite-node: 3.1.2(@types/node@20.17.6)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite: 6.3.6(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
+      vite-node: 3.1.2(@types/node@22.18.1)(jiti@2.4.2)(terser@5.36.0)(tsx@4.19.3)(yaml@2.6.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/debug': 4.1.12
-      '@types/node': 20.17.6
+      '@types/node': 22.18.1
       '@vitest/ui': 3.1.2(vitest@3.1.2)
       jsdom: 24.1.3
     transitivePeerDependencies:
diff --git a/scripts/package.json b/scripts/package.json
index c59dfae4e8c..ccc9b8c3884 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -14,7 +14,7 @@
   "devDependencies": {
     "@types/markdown-it": "^14.1.2",
     "markdown-it": "^14.1.0",
-    "@types/node": "^20.17.0",
+    "@types/node": "^22.13.14",
     "chalk": "^5.2.0",
     "commander": "^6.2.1",
     "inquirer": "^12.9.4",