diff --git a/packages/module/patternfly-docs/content/examples/Actions.tsx b/packages/module/patternfly-docs/content/examples/Actions.tsx
index 7441d3a..90edec0 100644
--- a/packages/module/patternfly-docs/content/examples/Actions.tsx
+++ b/packages/module/patternfly-docs/content/examples/Actions.tsx
@@ -1,149 +1,105 @@
 /* eslint-disable no-console */
 import React from 'react';
-import { debounce } from '@patternfly/react-core';
-import { ActionsColumn, TableGridBreakpoint } from '@patternfly/react-table';
-import { Table as TableDeprecated, TableHeader as TableHeaderDeprecated } from '@patternfly/react-table/deprecated';
+import {
+  ActionsColumn,
+  Caption,
+  IActions,
+  Table,
+  TableGridBreakpoint,
+  Td,
+  Th,
+  Thead,
+  Tr
+} from '@patternfly/react-table';
 import { CellMeasurerCache, CellMeasurer } from 'react-virtualized';
 import { AutoSizer, VirtualTableBody } from '@patternfly/react-virtualized-extension';
 
-export class ActionsExample extends React.Component {
-  constructor(props) {
-    super(props);
-    const rows = [];
-    for (let i = 0; i < 100; i++) {
-      rows.push({
-        disableActions: i % 3 === 2,
-        id: `actions-row-${i}`,
-        cells: [`one-${i}`, `two-${i}`, `three-${i}`, `four-${i}`, `five-${i}`]
-      });
-    }
-
-    this.actionsVirtualBody = null;
-
-    this.state = {
-      columns: [
-        { title: 'Name', props: { className: 'pf-m-6-col-on-sm pf-m-4-col-on-md pf-m-3-col-on-lg pf-m-2-col-on-xl' } },
-        {
-          title: 'Namespace',
-          props: { className: 'pf-m-6-col-on-sm pf-m-4-col-on-md pf-m-3-col-on-lg pf-m-2-col-on-xl' }
-        },
-        {
-          title: 'Labels',
-          props: { className: 'pf-m-4-col-on-md pf-m-4-col-on-lg pf-m-3-col-on-xl pf-m-hidden pf-m-visible-on-md' }
-        },
-        { title: 'Status', props: { className: 'pf-m-2-col-on-lg pf-m-2-col-on-xl pf-m-hidden pf-m-visible-on-lg' } },
-        { title: 'Pod Selector', props: { className: 'pf-m-2-col-on-xl pf-m-hidden pf-m-visible-on-xl' } },
-        { title: '', props: { className: 'pf-v5-c-table__action' } }
-      ],
-      rows,
-      actions: [
-        {
-          title: 'Some action',
-          onClick: (_event, rowId, _rowData, _extra) => console.log('clicked on Some action, on row: ', rowId)
-        },
-        {
-          title: <div>Another action</div>,
-          onClick: (_event, rowId, _rowData, _extra) => console.log('clicked on Another action, on row: ', rowId)
-        },
-        {
-          isSeparator: true
-        },
-        {
-          title: 'Third action',
-          onClick: (_event, rowId, _rowData, _extra) => console.log('clicked on Third action, on row: ', rowId)
-        }
-      ]
-    };
-
-    this._handleResize = debounce(this._handleResize.bind(this), 100);
-  }
-
-  componentDidMount() {
-    // re-render after resize
-    window.addEventListener('resize', this._handleResize);
+export const ActionsExample: React.FunctionComponent = () => {
+  interface RowType {
+    disableActions: boolean;
+    id: string;
+    cells: string[];
   }
 
-  componentWillUnmount() {
-    window.removeEventListener('resize', this._handleResize);
-  }
-
-  _handleResize() {
-    this.forceUpdate();
+  const rows: RowType[] = [];
+  for (let i = 0; i < 100; i++) {
+    rows.push({
+      disableActions: i % 3 === 2,
+      id: `actions-row-${i}`,
+      cells: [`one-${i}`, `two-${i}`, `three-${i}`, `four-${i}`, `five-${i}`]
+    });
   }
 
-  render() {
-    const { columns, rows } = this.state;
+  const columns = ['Name', 'Namespace', 'Labels', 'Status', 'Pod Selector'];
 
-    const measurementCache = new CellMeasurerCache({
-      fixedWidth: true,
-      minHeight: 44,
-      keyMapper: (rowIndex) => rowIndex
-    });
+  const actions: IActions = [
+    {
+      title: 'Some action',
+      onClick: (_event, rowId, _rowData, _extra) => console.log('clicked on Some action, on row: ', rowId)
+    },
+    {
+      title: <div>Another action</div>,
+      onClick: (_event, rowId, _rowData, _extra) => console.log('clicked on Another action, on row: ', rowId)
+    },
+    {
+      isSeparator: true
+    },
+    {
+      title: 'Third action',
+      onClick: (_event, rowId, _rowData, _extra) => console.log('clicked on Third action, on row: ', rowId)
+    }
+  ];
 
-    const rowRenderer = ({ index, _isScrolling, key, style, parent }) => {
-      const { rows, columns, actions } = this.state;
+  const measurementCache = new CellMeasurerCache({
+    fixedWidth: true,
+    minHeight: 44,
+    keyMapper: (rowIndex) => rowIndex
+  });
 
-      return (
-        <CellMeasurer cache={measurementCache} columnIndex={0} key={key} parent={parent} rowIndex={index}>
-          <tr data-id={index} style={style} role="row">
-            <td className={columns[0].props.className} role="gridcell">
-              {rows[index].cells[0]}
-            </td>
-            <td className={columns[1].props.className} role="gridcell">
-              {rows[index].cells[1]}
-            </td>
-            <td className={columns[2].props.className} role="gridcell">
-              {rows[index].cells[2]}
-            </td>
-            <td className={columns[3].props.className} role="gridcell">
-              {rows[index].cells[3]}
-            </td>
-            <td className={columns[4].props.className} role="gridcell">
-              {rows[index].cells[4]}
-            </td>
-            <td className={columns[5].props.className} role="gridcell">
-              <ActionsColumn
-                items={actions}
-                rowData={rows[index]}
-                extraData={{ rowIndex: index }}
-                isDisabled={rows[index].disableActions}
-              />
-            </td>
-          </tr>
-        </CellMeasurer>
-      );
-    };
+  const rowRenderer = ({ index: rowIndex, _isScrolling, key, style, parent }) => (
+    <CellMeasurer cache={measurementCache} columnIndex={0} key={key} parent={parent} rowIndex={rowIndex}>
+      <Tr resetOffset style={style}>
+        {columns.map((col, index) => (
+          <Td key={`${rowIndex}-${index + 1}`}>{rows[rowIndex].cells[index]}</Td>
+        ))}
+        <Td isActionCell>
+          <ActionsColumn items={actions} isDisabled={rows[rowIndex].disableActions} />
+        </Td>
+      </Tr>
+    </CellMeasurer>
+  );
 
-    return (
-      <div aria-label="Scrollable Table" className="pf-v5-c-scrollablegrid">
-        <TableDeprecated
-          caption="Actions Virtualized Table"
-          cells={columns}
-          rows={rows}
-          gridBreakPoint={TableGridBreakpoint.none}
-          aria-rowcount={rows.length}
-        >
-          <TableHeaderDeprecated />
-        </TableDeprecated>
-        <AutoSizer disableHeight>
-          {({ width }) => (
-            <VirtualTableBody
-              ref={(ref) => (this.actionsVirtualBody = ref)}
-              className="pf-v5-c-table pf-v5-c-virtualized pf-v5-c-window-scroller"
-              deferredMeasurementCache={measurementCache}
-              rowHeight={measurementCache.rowHeight}
-              height={400}
-              overscanRowCount={2}
-              columnCount={1}
-              rows={rows}
-              rowCount={rows.length}
-              rowRenderer={rowRenderer}
-              width={width}
-              role="grid"
-            />
-          )}
-        </AutoSizer>
-      </div>
-    );
-  }
-}
+  return (
+    <div aria-label="Scrollable Table" className="pf-v5-c-scrollablegrid">
+      <Table gridBreakPoint={TableGridBreakpoint.none} aria-rowcount={rows.length} variant="compact">
+        <Caption>Actions VirtualizedTable</Caption>
+        <Thead>
+          <Tr>
+            <Th key={0}>{columns[0]}</Th>
+            <Th key={1}>{columns[1]}</Th>
+            <Th key={2}>{columns[2]}</Th>
+            <Th key={3}>{columns[3]}</Th>
+            <Th key={4}>{columns[4]}</Th>
+            <Td isActionCell></Td>
+          </Tr>
+        </Thead>
+      </Table>
+      <AutoSizer disableHeight>
+        {({ width }) => (
+          <VirtualTableBody
+            className="pf-v5-c-table pf-v5-c-virtualized pf-v5-c-window-scroller"
+            deferredMeasurementCache={measurementCache}
+            rowHeight={measurementCache.rowHeight}
+            height={400}
+            overscanRowCount={2}
+            columnCount={1}
+            rows={rows}
+            rowCount={rows.length}
+            rowRenderer={rowRenderer}
+            width={width}
+          />
+        )}
+      </AutoSizer>
+    </div>
+  );
+};
diff --git a/packages/module/patternfly-docs/generated/extensions/virtual-scroll-table/react.js b/packages/module/patternfly-docs/generated/extensions/virtual-scroll-table/react.js
index d73fdba..29ac790 100644
--- a/packages/module/patternfly-docs/generated/extensions/virtual-scroll-table/react.js
+++ b/packages/module/patternfly-docs/generated/extensions/virtual-scroll-table/react.js
@@ -220,7 +220,7 @@ pageData.examples = {
       
     </Example>,
   'Actions': props => 
-    <Example {...pageData} {...props} {...{"code":"/* eslint-disable no-console */\nimport React from 'react';\nimport { debounce } from '@patternfly/react-core';\nimport { ActionsColumn, TableGridBreakpoint } from '@patternfly/react-table';\nimport { Table as TableDeprecated, TableHeader as TableHeaderDeprecated } from '@patternfly/react-table/deprecated';\nimport { CellMeasurerCache, CellMeasurer } from 'react-virtualized';\nimport { AutoSizer, VirtualTableBody } from '@patternfly/react-virtualized-extension';\n\nexport class ActionsExample extends React.Component {\n  constructor(props) {\n    super(props);\n    const rows = [];\n    for (let i = 0; i < 100; i++) {\n      rows.push({\n        disableActions: i % 3 === 2,\n        id: `actions-row-${i}`,\n        cells: [`one-${i}`, `two-${i}`, `three-${i}`, `four-${i}`, `five-${i}`]\n      });\n    }\n\n    this.actionsVirtualBody = null;\n\n    this.state = {\n      columns: [\n        { title: 'Name', props: { className: 'pf-m-6-col-on-sm pf-m-4-col-on-md pf-m-3-col-on-lg pf-m-2-col-on-xl' } },\n        {\n          title: 'Namespace',\n          props: { className: 'pf-m-6-col-on-sm pf-m-4-col-on-md pf-m-3-col-on-lg pf-m-2-col-on-xl' }\n        },\n        {\n          title: 'Labels',\n          props: { className: 'pf-m-4-col-on-md pf-m-4-col-on-lg pf-m-3-col-on-xl pf-m-hidden pf-m-visible-on-md' }\n        },\n        { title: 'Status', props: { className: 'pf-m-2-col-on-lg pf-m-2-col-on-xl pf-m-hidden pf-m-visible-on-lg' } },\n        { title: 'Pod Selector', props: { className: 'pf-m-2-col-on-xl pf-m-hidden pf-m-visible-on-xl' } },\n        { title: '', props: { className: 'pf-v5-c-table__action' } }\n      ],\n      rows,\n      actions: [\n        {\n          title: 'Some action',\n          onClick: (_event, rowId, _rowData, _extra) => console.log('clicked on Some action, on row: ', rowId)\n        },\n        {\n          title: <div>Another action</div>,\n          onClick: (_event, rowId, _rowData, _extra) => console.log('clicked on Another action, on row: ', rowId)\n        },\n        {\n          isSeparator: true\n        },\n        {\n          title: 'Third action',\n          onClick: (_event, rowId, _rowData, _extra) => console.log('clicked on Third action, on row: ', rowId)\n        }\n      ]\n    };\n\n    this._handleResize = debounce(this._handleResize.bind(this), 100);\n  }\n\n  componentDidMount() {\n    // re-render after resize\n    window.addEventListener('resize', this._handleResize);\n  }\n\n  componentWillUnmount() {\n    window.removeEventListener('resize', this._handleResize);\n  }\n\n  _handleResize() {\n    this.forceUpdate();\n  }\n\n  render() {\n    const { columns, rows } = this.state;\n\n    const measurementCache = new CellMeasurerCache({\n      fixedWidth: true,\n      minHeight: 44,\n      keyMapper: (rowIndex) => rowIndex\n    });\n\n    const rowRenderer = ({ index, _isScrolling, key, style, parent }) => {\n      const { rows, columns, actions } = this.state;\n\n      return (\n        <CellMeasurer cache={measurementCache} columnIndex={0} key={key} parent={parent} rowIndex={index}>\n          <tr data-id={index} style={style} role=\"row\">\n            <td className={columns[0].props.className} role=\"gridcell\">\n              {rows[index].cells[0]}\n            </td>\n            <td className={columns[1].props.className} role=\"gridcell\">\n              {rows[index].cells[1]}\n            </td>\n            <td className={columns[2].props.className} role=\"gridcell\">\n              {rows[index].cells[2]}\n            </td>\n            <td className={columns[3].props.className} role=\"gridcell\">\n              {rows[index].cells[3]}\n            </td>\n            <td className={columns[4].props.className} role=\"gridcell\">\n              {rows[index].cells[4]}\n            </td>\n            <td className={columns[5].props.className} role=\"gridcell\">\n              <ActionsColumn\n                items={actions}\n                rowData={rows[index]}\n                extraData={{ rowIndex: index }}\n                isDisabled={rows[index].disableActions}\n              />\n            </td>\n          </tr>\n        </CellMeasurer>\n      );\n    };\n\n    return (\n      <div aria-label=\"Scrollable Table\" className=\"pf-v5-c-scrollablegrid\">\n        <TableDeprecated\n          caption=\"Actions Virtualized Table\"\n          cells={columns}\n          rows={rows}\n          gridBreakPoint={TableGridBreakpoint.none}\n          aria-rowcount={rows.length}\n        >\n          <TableHeaderDeprecated />\n        </TableDeprecated>\n        <AutoSizer disableHeight>\n          {({ width }) => (\n            <VirtualTableBody\n              ref={(ref) => (this.actionsVirtualBody = ref)}\n              className=\"pf-v5-c-table pf-v5-c-virtualized pf-v5-c-window-scroller\"\n              deferredMeasurementCache={measurementCache}\n              rowHeight={measurementCache.rowHeight}\n              height={400}\n              overscanRowCount={2}\n              columnCount={1}\n              rows={rows}\n              rowCount={rows.length}\n              rowRenderer={rowRenderer}\n              width={width}\n              role=\"grid\"\n            />\n          )}\n        </AutoSizer>\n      </div>\n    );\n  }\n}\n","title":"Actions","lang":"js"}}>
+    <Example {...pageData} {...props} {...{"code":"/* eslint-disable no-console */\nimport React from 'react';\nimport {\n  ActionsColumn,\n  Caption,\n  IActions,\n  Table,\n  TableGridBreakpoint,\n  Td,\n  Th,\n  Thead,\n  Tr\n} from '@patternfly/react-table';\nimport { CellMeasurerCache, CellMeasurer } from 'react-virtualized';\nimport { AutoSizer, VirtualTableBody } from '@patternfly/react-virtualized-extension';\n\nexport const ActionsExample: React.FunctionComponent = () => {\n  interface RowType {\n    disableActions: boolean;\n    id: string;\n    cells: string[];\n  }\n\n  const rows: RowType[] = [];\n  for (let i = 0; i < 100; i++) {\n    rows.push({\n      disableActions: i % 3 === 2,\n      id: `actions-row-${i}`,\n      cells: [`one-${i}`, `two-${i}`, `three-${i}`, `four-${i}`, `five-${i}`]\n    });\n  }\n\n  const columns = ['Name', 'Namespace', 'Labels', 'Status', 'Pod Selector'];\n\n  const actions: IActions = [\n    {\n      title: 'Some action',\n      onClick: (_event, rowId, _rowData, _extra) => console.log('clicked on Some action, on row: ', rowId)\n    },\n    {\n      title: <div>Another action</div>,\n      onClick: (_event, rowId, _rowData, _extra) => console.log('clicked on Another action, on row: ', rowId)\n    },\n    {\n      isSeparator: true\n    },\n    {\n      title: 'Third action',\n      onClick: (_event, rowId, _rowData, _extra) => console.log('clicked on Third action, on row: ', rowId)\n    }\n  ];\n\n  const measurementCache = new CellMeasurerCache({\n    fixedWidth: true,\n    minHeight: 44,\n    keyMapper: (rowIndex) => rowIndex\n  });\n\n  const rowRenderer = ({ index: rowIndex, _isScrolling, key, style, parent }) => (\n    <CellMeasurer cache={measurementCache} columnIndex={0} key={key} parent={parent} rowIndex={rowIndex}>\n      <Tr resetOffset style={style}>\n        {columns.map((col, index) => (\n          <Td key={`${rowIndex}-${index + 1}`}>{rows[rowIndex].cells[index]}</Td>\n        ))}\n        <Td isActionCell>\n          <ActionsColumn items={actions} isDisabled={rows[rowIndex].disableActions} />\n        </Td>\n      </Tr>\n    </CellMeasurer>\n  );\n\n  return (\n    <div aria-label=\"Scrollable Table\" className=\"pf-v5-c-scrollablegrid\">\n      <Table gridBreakPoint={TableGridBreakpoint.none} aria-rowcount={rows.length} variant=\"compact\">\n        <Caption>Actions VirtualizedTable</Caption>\n        <Thead>\n          <Tr>\n            <Th key={0}>{columns[0]}</Th>\n            <Th key={1}>{columns[1]}</Th>\n            <Th key={2}>{columns[2]}</Th>\n            <Th key={3}>{columns[3]}</Th>\n            <Th key={4}>{columns[4]}</Th>\n            <Td isActionCell></Td>\n          </Tr>\n        </Thead>\n      </Table>\n      <AutoSizer disableHeight>\n        {({ width }) => (\n          <VirtualTableBody\n            className=\"pf-v5-c-table pf-v5-c-virtualized pf-v5-c-window-scroller\"\n            deferredMeasurementCache={measurementCache}\n            rowHeight={measurementCache.rowHeight}\n            height={400}\n            overscanRowCount={2}\n            columnCount={1}\n            rows={rows}\n            rowCount={rows.length}\n            rowRenderer={rowRenderer}\n            width={width}\n          />\n        )}\n      </AutoSizer>\n    </div>\n  );\n};\n","title":"Actions","lang":"js"}}>
       
     </Example>,
   'Filterable with WindowScroller': props =>