diff --git a/elements/rh-tabs/context.ts b/elements/rh-tabs/context.ts
deleted file mode 100644
index 69123e8be6..0000000000
--- a/elements/rh-tabs/context.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { RhTab } from './rh-tab.js';
-
-import { createContextWithRoot } from '@patternfly/pfe-core/functions/context.js';
-
-export interface RhTabsContext {
-  box: 'box' | 'inset' | null;
-  vertical: boolean;
-  firstTab?: RhTab;
-  lastTab?: RhTab;
-}
-
-export const context = createContextWithRoot<RhTabsContext>(Symbol('rh-tabs-context'));
-
diff --git a/elements/rh-tabs/rh-tab-panel.ts b/elements/rh-tabs/rh-tab-panel.ts
index 44c240ffdd..c51f3e3886 100644
--- a/elements/rh-tabs/rh-tab-panel.ts
+++ b/elements/rh-tabs/rh-tab-panel.ts
@@ -1,7 +1,6 @@
 import { LitElement, html } from 'lit';
 import { customElement } from 'lit/decorators/custom-element.js';
 import { classMap } from 'lit/directives/class-map.js';
-import { consume } from '@lit/context';
 
 import { getRandomId } from '@patternfly/pfe-core/functions/random.js';
 
diff --git a/elements/rh-tabs/rh-tab.css b/elements/rh-tabs/rh-tab.css
index f3247e744f..5676145726 100644
--- a/elements/rh-tabs/rh-tab.css
+++ b/elements/rh-tabs/rh-tab.css
@@ -1,6 +1,3 @@
-/* TODO(bennypowers): remove vertical, box, and theme attributes, as well as the `first` and `last`
- * lightdom classes in next major */
-
 :host {
   display: flex;
   flex: none;
@@ -36,7 +33,7 @@ button {
   padding-inline-start: var(--rh-tabs-link-padding-inline-start, var(--rh-space-2xl, 32px));
   padding-block-end: var(--rh-tabs-link-padding-block-end, var(--rh-space-lg, 16px));
   padding-inline-end: var(--rh-tabs-link-padding-inline-end, var(--rh-space-2xl, 32px));
-  max-width: var(--_tab-max-width, 200px);
+  max-width: 200px;
   max-height: 100%;
 }
 
@@ -82,7 +79,7 @@ button:after {
   cursor: default;
 }
 
-#container {
+#rhds-container {
   display: flex;
   width: 100%;
 
@@ -94,7 +91,7 @@ button:after {
   --_button-focus-outline-color: var(--rh-color-border-interactive-on-light, #0066cc);
 }
 
-#container.dark {
+#rhds-container.dark {
   --_button-text-color:
     var(
         --rh-tabs-link-color,
@@ -104,8 +101,7 @@ button:after {
 }
 
 /* Context switch on attributes */
-:host([active]) #container,
-#container.active {
+:host([active]) #rhds-container {
   --_button-text-color:
     var(
         --rh-tabs-link-color,
@@ -118,8 +114,7 @@ button:after {
       );
 }
 
-:host([active]) #container.dark,
-#container.active.dark {
+:host([active]) #rhds-container.dark {
   --_button-text-color:
     var(
         --rh-tabs-link-color,
@@ -133,18 +128,16 @@ button:after {
 }
 
 /* Box context */
-:host([box]) #container,
-#container.box {
+:host([box]) #rhds-container {
   --_inactive-tab-background-color: var(--rh-color-surface-lighter, #f2f2f2);
 }
 
-:host([box]) #container.dark,
-#container.dark.box {
+:host([box]) #rhds-container.dark {
   --_inactive-tab-background-color: var(--rh-color-surface-dark, #383838);
 }
 
 /* Theme base context */
-#container.active {
+:host([active][theme="base"]) #rhds-container {
   --_active-tab-border-color:
     var(
         --rh-tabs-active-border-color,
@@ -152,7 +145,7 @@ button:after {
       );
 }
 
-#container.active.dark {
+:host([active][theme="base"]) #rhds-container.dark {
   --_active-tab-border-color:
     var(
         --rh-tabs-active-border-color,
@@ -160,8 +153,7 @@ button:after {
       );
 }
 
-:host([vertical]) button,
-.vertical button {
+:host([vertical]) button {
   text-align: start;
 }
 
@@ -170,20 +162,17 @@ button:after {
 }
 
 /* [active]:not([box]) */
-:host([active]:not([box])) button:after,
-#container.active:not(.box) button:after {
+:host([active]:not([box])) button:after {
   border-block-end: var(--rh-border-width-lg, 3px) solid var(--_active-tab-border-color);
 }
 
 /* [box][active]) */
-:host([active][box]) button:before,
-#container.active.box button:before {
+:host([active][box]) button:before {
   border-inline-color: var(--_border-color);
   border-inline-start-width: var(--rh-border-width-sm, 1px);
 }
 
-:host([active][box]) button:after,
-#container.active.box button:after {
+:host([active][box]) button:after {
   border-block-start: var(--rh-border-width-lg, 3px) solid var(--_active-tab-border-color);
   border-block-end:
     var(--rh-border-width-sm, 1px)
@@ -192,67 +181,57 @@ button:after {
 }
 
 /* [box]:not([active]) */
-:host([box]:not([active])) #container,
-#container.box:not(.active) {
+:host([box]:not([active])) #rhds-container {
   background-color: var(--_inactive-tab-background-color);
 }
 
-:host([box]:not([active])) button:before,
-#container.box:not(.active) button:before {
+:host([box]:not([active])) button:before {
   border-inline-color: var(--_border-color);
   border-inline-start-width: var(--rh-border-width-sm, 1px);
 }
 
-:host([box]:not([active])) button:after,
-#container.box:not(.active) button:after {
+:host([box]:not([active])) button:after {
   border-block-end-color: var(--_border-color);
 }
 
 /* .first[box][active]) */
-:host([box][active]) button:before,
-#container.box.active.first button:before {
+:host(.first[box][active]) button:before {
   border-inline-start-color: var(--_border-color);
   border-inline-start-width: var(--rh-border-width-sm, 1px);
 }
 
 /* .first[box]:not([active]) */
-:host(.first[box]:not([active])) button:before,
-#container.first.box:not(.active) button:before {
+:host(.first[box]:not([active])) button:before {
   border-inline-color: transparent;
 }
 
 /* .last[box][active] */
-:host(.last[box][active]) button:before,
-#container.last.box.active button:before {
+:host(.last[box][active]) button:before {
   border-inline-end-color: var(--_border-color);
   border-inline-end-width: var(--rh-border-width-sm, 1px);
 }
 
 @media screen and (min-width: 768px) {
   /* [vertical]:not([box]) */
-  :host([vertical]:not([box])) button,
-  #container.vertical:not(.box) button {
+  :host([vertical]:not([box])) button {
     padding-block:
       var(--rh-tabs-link-padding-block-start, var(--rh-space-md, 8px))
       var(--rh-tabs-link-padding-block-start, var(--rh-space-md, 8px));
   }
 
   /* [vertical][active] */
-  :host([vertical][active]) button:after,
-  #container.vertical.active button:after {
+  :host([vertical][active]) button:after {
     border-block-end: transparent;
   }
 
   /* [box]:not([vertical], [active]) */
-  :host([box]:not([vertical], [active])) button:before,
-  #container.box:not(.vertical, .active) button:before {
+  :host([box]:not([vertical], [active])) button:before {
     border-inline-color: var(--_border-color);
     border-inline-start-width: var(--rh-border-width-sm, 1px);
   }
 
   /* [box][vertical]:not([active]) */
-  :host([box][vertical]:not([active])) button:before,
-  #container.box.vertical:not(.active) button:before {
+  :host([box][vertical]:not([active])) button:before {
     border-inline-start-color: transparent;
     border-inline-end:
       var(--rh-border-width-sm, 1px)
@@ -265,52 +244,44 @@ button:after {
   }
 
   /* [box]:not([active], [vertical]) */
-  :host([box]:not([active], [vertical])) button:after,
-  #container.box:not(.active, .vertical) button:after {
+  :host([box]:not([active], [vertical])) button:after {
     border-block-end-color: var(--_border-color);
   }
 
   /* [active][box][vertical] */
-  :host([active][box][vertical]) button:after,
-  #container.active.box.vertical button:after {
+  :host([active][box][vertical]) button:after {
     border-block-start:
       var(--rh-border-width-sm, 1px)
       solid
       var(--_border-color);
   }
 
-  :host([box][vertical]:not([active])) button:after,
-  #container.box.vertical:not(.active) button:after {
+  :host([box][vertical]:not([active])) button:after {
     border-block-end-color: transparent;
   }
 
   /* .first[vertical][box] */
-  :host(.first[vertical][box]),
-  #container.vertical.box.first {
+  :host(.first[vertical][box]) {
     margin-block-start: var(--rh-space-2xl, 32px);
   }
 
   /* .last[vertical][box]  */
-  :host(.last[vertical][box]),
-  #container.vertical.box.last {
+  :host(.last[vertical][box]) {
     margin-block-end: var(--rh-space-2xl, 32px);
   }
 
   /* .first[vertical]:not([box]) */
-  :host(.first[vertical]:not([box])),
-  #container.first.vertical:not(.box) {
+  :host(.first[vertical]:not([box])) {
     margin-block-start: var(--rh-space-xl, 24px);
   }
 
   /* .last[vertical]:not([box]) */
-  :host(.last[vertical]:not([box])),
-  #container.last.vertical:not(.box) {
+  :host(.last[vertical]:not([box])) {
     margin-block-end: var(--rh-space-xl, 24px);
   }
 
   /* [box][active]:not([vertical]) */
-  :host([active][box]:not([vertical])) button:after,
-  #container.active.box:not(.vertical) button:after {
+  :host([active][box]:not([vertical])) button:after {
     border-block-start: var(--rh-border-width-lg, 3px) solid var(--_active-tab-border-color);
     border-block-end:
       var(--rh-border-width-sm, 1px)
@@ -319,15 +290,13 @@ button:after {
   }
 
   /* .first[box][vertical][active] */
-  :host(.first[box][vertical][active]) button:after,
-  #container.first.box.vertical.active button:after {
+  :host(.first[box][vertical][active]) button:after {
     border-block-start-color: var(--_border-color);
     border-block-start-width: var(--rh-border-width-sm, 1px);
   }
 
   /* [box][vertical][active] */
-  :host([box][vertical][active]) button:before,
-  #container.box.vertical.active button:before {
+  :host([box][vertical][active]) button:before {
     border-inline-start:
       var(--rh-border-width-lg, 3px)
       solid
@@ -339,41 +308,35 @@ button:after {
   }
 
   /* [active][vertical]:not([box]) */
-  :host([vertical][active]:not([box])) button:before,
-  #container.vertical.active:not(.box) button:before {
+  :host([vertical][active]:not([box])) button:before {
     border-inline-start: var(--rh-border-width-lg, 3px) solid var(--_active-tab-border-color);
   }
 
   /* .first[vertical][box]:not([active]) */
-  :host(.first[vertical][box]:not([active])) button:before,
-  #container.first.vertical.box:not(.active) button:before {
+  :host(.first[vertical][box]:not([active])) button:before {
     border-block-start-color: transparent;
   }
 
   /* .first[box][active]:not([vertical]) */
-  :host(.first[box][active]:not([vertical])) button:before,
-  #container.first.box.active:not(.vertical) button:before {
+  :host(.first[box][active]:not([vertical])) button:before {
     border-inline-start-color: var(--_border-color);
     border-inline-start-width: var(--rh-border-width-sm, 1px);
   }
 
   /* .last[box][active]:not[vertical] */
-  :host(.last[box][active]:not([vertical])) button:before,
-  #container.last.box.active:not(.vertical) button:before {
+  :host(.last[box][active]:not([vertical])) button:before {
     border-inline-end-color: var(--_border-color);
     border-inline-end-width: var(--rh-border-width-sm, 1px);
   }
 
   /* .last[box][vertical][active] */
-  :host(.last[box][vertical][active]) button:before,
-  #container.last.box.vertical.active button:before {
+  :host(.last[box][vertical][active]) button:before {
     border-block-end-color: var(--_border-color);
     border-block-end-width: var(--rh-border-width-sm, 1px);
   }
 
   /* .last[box][vertical]:not([active]) */
-  :host(.last[box][vertical]:not([active])) button:after,
-  #container.last.box.vertical:not(.active) button:after {
+  :host(.last[box][vertical]:not([active])) button:after {
     border-block-end: none;
   }
 }
diff --git a/elements/rh-tabs/rh-tab.ts b/elements/rh-tabs/rh-tab.ts
index dedbe74462..8af70d75f8 100644
--- a/elements/rh-tabs/rh-tab.ts
+++ b/elements/rh-tabs/rh-tab.ts
@@ -1,5 +1,4 @@
 import type { PropertyValues } from 'lit';
-import type { RhTabsContext } from './context.js';
 
 import { html, LitElement } from 'lit';
 import { customElement } from 'lit/decorators/custom-element.js';
@@ -7,8 +6,6 @@ import { property } from 'lit/decorators/property.js';
 import { queryAssignedElements } from 'lit/decorators/query-assigned-elements.js';
 import { query } from 'lit/decorators/query.js';
 import { classMap } from 'lit/directives/class-map.js';
-import { state } from 'lit/decorators/state.js';
-import { consume } from '@lit/context';
 
 import { observed } from '@patternfly/pfe-core/decorators.js';
 
@@ -16,8 +13,6 @@ import { colorContextConsumer, type ColorTheme } from '../../lib/context/color/c
 
 import { getRandomId } from '@patternfly/pfe-core/functions/random.js';
 
-import { context } from './context.js';
-
 import styles from './rh-tab.css';
 
 export class TabExpandEvent extends Event {
@@ -69,8 +64,6 @@ export class RhTab extends LitElement {
    */
   @colorContextConsumer() private on?: ColorTheme;
 
-  @consume({ context, subscribe: true }) @state() private ctx?: RhTabsContext;
-
   @queryAssignedElements({ slot: 'icon', flatten: true })
   private icons!: Array<HTMLElement>;
 
@@ -86,13 +79,9 @@ export class RhTab extends LitElement {
   }
 
   render() {
-    const { active, on = '' } = this;
-    const { vertical = false, firstTab, lastTab } = this.ctx ?? {};
-    const box = this.ctx?.box ?? false;
-    const first = firstTab === this;
-    const last = lastTab === this;
+    const { on = '' } = this;
     return html`
-      <div id="container" class="${classMap({ active, box, vertical, first, last, [on]: !!on })}">
+      <div id="rhds-container" class="${classMap({ [on]: !!on })}">
         <button part="button" ?disabled="${this.disabled}">
           <slot name="icon"
                 part="icon"
@@ -148,4 +137,4 @@ declare global {
   interface HTMLElementTagNameMap {
     'rh-tab': RhTab;
   }
-}
+}
\ No newline at end of file
diff --git a/elements/rh-tabs/rh-tabs.css b/elements/rh-tabs/rh-tabs.css
index 3e706170b0..56129eb33a 100644
--- a/elements/rh-tabs/rh-tabs.css
+++ b/elements/rh-tabs/rh-tabs.css
@@ -4,16 +4,10 @@
   color: var(--_context-text);
 }
 
-[part="container"] {
-  container-type: inline-size;
-}
-
 [part="tabs-container"] {
   position: relative;
   display: flex;
   overflow: hidden;
-
-  --_tab-max-width: 200px;
 }
 
 [part="tabs-container"]:before {
@@ -54,12 +48,6 @@ button:before {
   border-style: solid;
 }
 
-@container (min-width: 567px) {
-  [part="tabs-container"] {
-    --_tab-max-width: none;
-  }
-}
-
 [part="tabs"]:before,
 button:before {
   top: 0;
diff --git a/elements/rh-tabs/rh-tabs.ts b/elements/rh-tabs/rh-tabs.ts
index 874b3d5d2d..e6fc520a1b 100644
--- a/elements/rh-tabs/rh-tabs.ts
+++ b/elements/rh-tabs/rh-tabs.ts
@@ -1,13 +1,11 @@
-import { html, LitElement, type PropertyValues } from 'lit';
+import { html, LitElement } from 'lit';
 import { customElement } from 'lit/decorators/custom-element.js';
 import { property } from 'lit/decorators/property.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { query } from 'lit/decorators/query.js';
 import { queryAssignedElements } from 'lit/decorators/query-assigned-elements.js';
-import { provide } from '@lit/context';
-
-import { deprecation } from '@patternfly/pfe-core/decorators.js';
 
+import { cascades, deprecation } from '@patternfly/pfe-core/decorators.js';
 import { RovingTabindexController } from '@patternfly/pfe-core/controllers/roving-tabindex-controller.js';
 import { OverflowController } from '@patternfly/pfe-core/controllers/overflow-controller.js';
 import { Logger } from '@patternfly/pfe-core/controllers/logger.js';
@@ -22,8 +20,6 @@ import { colorContextProvider, type ColorPalette } from '../../lib/context/color
 
 import styles from './rh-tabs.css';
 
-import { context, type RhTabsContext } from './context.js';
-
 export { RhTab };
 
 /* TODO: Remove attrs in JSDoc below when updated use TabsController after PFE 3.0 release */
@@ -137,12 +133,11 @@ export class RhTabs extends LitElement {
    */
   @property({ reflect: true, type: Boolean }) centered? = false;
 
-  @provide({ context }) private ctx?: RhTabsContext;
-
   /**
    * Sets the theme for the tabs and panels
    * @deprecated attribute will be removed in future release, please use the `--rh-tabs-active-border-color` css property directly.
    */
+  @cascades('rh-tab')
   @deprecation({
     alias: 'css property --rh-tabs-active-border-color',
     reflect: true,
@@ -152,11 +147,13 @@ export class RhTabs extends LitElement {
   /**
    * Sets tabs to a boxed style with or without an inset
    */
+  @cascades('rh-tab', 'rh-tab-panel')
   @property({ reflect: true }) box?: 'box' | 'inset' | null = null;
 
   /**
    * Sets the alignment of the tabs vertical
    */
+  @cascades('rh-tab', 'rh-tab-panel')
   @property({ reflect: true, type: Boolean }) vertical = false;
 
   protected get canShowScrollButtons(): boolean {
@@ -195,9 +192,7 @@ export class RhTabs extends LitElement {
 
   @query('[part="tabs"]') private tabList!: HTMLElement;
 
-  #tabindex = new RovingTabindexController<RhTab>(this, {
-    getItems: () => this.#allTabs,
-  });
+  #tabindex = new RovingTabindexController<RhTab>(this);
 
   #overflow = new OverflowController(this);
 
@@ -240,7 +235,7 @@ export class RhTabs extends LitElement {
     RhTabs.instances.delete(this);
   }
 
-  override willUpdate(changed: PropertyValues<this>): void {
+  override willUpdate(): void {
     const { activeItem } = this.#tabindex;
     // If RTI has an activeItem, update the roving tabindex controller
     if (!this.manual &&
@@ -249,12 +244,6 @@ export class RhTabs extends LitElement {
         activeItem.ariaDisabled !== 'true') {
       activeItem.active = true;
     }
-    // RTIC will kick the update cycle whenever the tabs contents change,
-    // so let's just update the context on every cycle
-    const { box = null, vertical } = this;
-    const firstTab = this.#allTabs.at(0);
-    const lastTab = this.#allTabs.at(-1);
-    this.ctx = { box, vertical, firstTab, lastTab };
   }
 
   async firstUpdated() {
@@ -274,11 +263,10 @@ export class RhTabs extends LitElement {
                 @click="${this.#scrollLeft}">
               <pf-icon icon="${scrollIconLeft}" set="${scrollIconSet}" loading="eager"></pf-icon>
             </button>`}
-            <div style="display: contents;" role="tablist">
-              <slot name="tab"
-                    part="tabs"
-                    @slotchange="${this.#onSlotchange}"></slot>
-            </div>${!this.#overflow.showScrollButtons ? '' : html`
+            <slot name="tab"
+                  part="tabs"
+                  role="tablist"
+                  @slotchange="${this.#onSlotchange}"></slot> ${!this.#overflow.showScrollButtons ? '' : html`
             <button id="nextTab" tabindex="-1"
                 aria-label="${this.getAttribute('label-scroll-right') ?? 'Scroll right'}"
                 ?disabled="${!this.#overflow.overflowRight}"
@@ -303,6 +291,7 @@ export class RhTabs extends LitElement {
       (this.#allTabs.length !== 0 || this.#allPanels.length !== 0)) {
       this.#updateAccessibility();
       this.#firstLastClasses();
+      this.#tabindex.initItems(this.#allTabs);
       this.activeIndex = this.#allTabs.findIndex(tab => tab.active);
       this.#tabindex.setActiveItem(this.#activeTab);
       this.#overflow.init(this.tabList, this.#allTabs);
@@ -369,4 +358,4 @@ declare global {
   interface HTMLElementTagNameMap {
     'rh-tabs': RhTabs;
   }
-}
+}
\ No newline at end of file