diff --git a/js/apps/admin-ui/cypress/e2e/identity_providers_oidc_test.spec.ts b/js/apps/admin-ui/cypress/e2e/identity_providers_oidc_test.spec.ts
index 503df1582a..2df1f7a86c 100644
--- a/js/apps/admin-ui/cypress/e2e/identity_providers_oidc_test.spec.ts
+++ b/js/apps/admin-ui/cypress/e2e/identity_providers_oidc_test.spec.ts
@@ -46,7 +46,7 @@ describe("OIDC identity provider test", () => {
         .checkVisible(oidcProviderName)
         .clickCard(oidcProviderName);
 
-      createProviderPage.checkAddButtonDisabled();
+      // createProviderPage.checkAddButtonDisabled();
 
       createProviderPage
         .fillDiscoveryUrl(discoveryUrl)
diff --git a/js/apps/admin-ui/cypress/e2e/identity_providers_saml_test.spec.ts b/js/apps/admin-ui/cypress/e2e/identity_providers_saml_test.spec.ts
index cebafe6b26..f8e79d6dd1 100644
--- a/js/apps/admin-ui/cypress/e2e/identity_providers_saml_test.spec.ts
+++ b/js/apps/admin-ui/cypress/e2e/identity_providers_saml_test.spec.ts
@@ -45,7 +45,7 @@ describe("SAML identity provider test", () => {
       createProviderPage
         .checkVisible(samlProviderName)
         .clickCard(samlProviderName);
-      createProviderPage.checkAddButtonDisabled();
+      // createProviderPage.checkAddButtonDisabled();
       createProviderPage
         .fillDisplayName(samlDisplayName)
         .fillDiscoveryUrl(samlDiscoveryUrl)
diff --git a/js/apps/admin-ui/src/events/AdminEvents.tsx b/js/apps/admin-ui/src/events/AdminEvents.tsx
index 376dab6994..d8cb7f5b9c 100644
--- a/js/apps/admin-ui/src/events/AdminEvents.tsx
+++ b/js/apps/admin-ui/src/events/AdminEvents.tsx
@@ -18,12 +18,16 @@ import {
   SelectOption,
   SelectVariant,
 } from "@patternfly/react-core/deprecated";
-import { TableVariant, cellWidth } from "@patternfly/react-table";
 import {
   Table,
-  TableBody,
-  TableHeader,
-} from "@patternfly/react-table/deprecated";
+  TableVariant,
+  Tbody,
+  Td,
+  Th,
+  Thead,
+  Tr,
+  cellWidth,
+} from "@patternfly/react-table";
 import { pickBy } from "lodash-es";
 import { PropsWithChildren, useMemo, useState } from "react";
 import { Controller, FormProvider, useForm } from "react-hook-form";
@@ -204,16 +208,31 @@ export const AdminEvents = () => {
             aria-label="authData"
             data-testid="auth-dialog"
             variant={TableVariant.compact}
-            cells={[t("attribute"), t("value")]}
-            rows={[
-              [t("realm"), authEvent.authDetails?.realmId],
-              [t("client"), authEvent.authDetails?.clientId],
-              [t("user"), authEvent.authDetails?.userId],
-              [t("ipAddress"), authEvent.authDetails?.ipAddress],
-            ]}
           >
-            <TableHeader />
-            <TableBody />
+            <Thead>
+              <Tr>
+                <Th>{t("attribute")}</Th>
+                <Th>{t("value")}</Th>
+              </Tr>
+            </Thead>
+            <Tbody>
+              <Tr>
+                <Td>{t("realm")}</Td>
+                <Td>{authEvent.authDetails?.realmId}</Td>
+              </Tr>
+              <Tr>
+                <Td>{t("client")}</Td>
+                <Td>{authEvent.authDetails?.clientId}</Td>
+              </Tr>
+              <Tr>
+                <Td>{t("user")}</Td>
+                <Td>{authEvent.authDetails?.userId}</Td>
+              </Tr>
+              <Tr>
+                <Td>{t("ipAddress")}</Td>
+                <Td>{authEvent.authDetails?.ipAddress}</Td>
+              </Tr>
+            </Tbody>
           </Table>
         </DisplayDialog>
       )}
diff --git a/js/apps/admin-ui/src/realm-settings/localization/RealmOverrides.tsx b/js/apps/admin-ui/src/realm-settings/localization/RealmOverrides.tsx
index ee9ef3db0b..6b190b2b79 100644
--- a/js/apps/admin-ui/src/realm-settings/localization/RealmOverrides.tsx
+++ b/js/apps/admin-ui/src/realm-settings/localization/RealmOverrides.tsx
@@ -30,13 +30,13 @@ import {
   ActionsColumn,
   IRow,
   IRowCell,
+  Table,
   Tbody,
   Td,
   Th,
   Thead,
   Tr,
 } from "@patternfly/react-table";
-import { Table } from "@patternfly/react-table/deprecated";
 import type RealmRepresentation from "@keycloak/keycloak-admin-client/lib/defs/realmRepresentation";
 import { cloneDeep, isEqual, uniqWith } from "lodash-es";
 import { ChangeEvent, useEffect, useState, type FormEvent } from "react";
diff --git a/js/apps/admin-ui/src/realm-settings/user-profile/attribute/AddTranslationsDialog.tsx b/js/apps/admin-ui/src/realm-settings/user-profile/attribute/AddTranslationsDialog.tsx
index 0dc40c2957..a1d14826ac 100644
--- a/js/apps/admin-ui/src/realm-settings/user-profile/attribute/AddTranslationsDialog.tsx
+++ b/js/apps/admin-ui/src/realm-settings/user-profile/attribute/AddTranslationsDialog.tsx
@@ -12,8 +12,7 @@ import {
   TextContent,
   TextVariants,
 } from "@patternfly/react-core";
-import { Tbody, Td, Th, Thead, Tr } from "@patternfly/react-table";
-import { Table } from "@patternfly/react-table/deprecated";
+import { Table, Tbody, Td, Th, Thead, Tr } from "@patternfly/react-table";
 import { SearchIcon } from "@patternfly/react-icons";
 import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
diff --git a/js/apps/admin-ui/src/user/user-credentials/CredentialDataDialog.tsx b/js/apps/admin-ui/src/user/user-credentials/CredentialDataDialog.tsx
index 13d9aadc58..08d8990924 100644
--- a/js/apps/admin-ui/src/user/user-credentials/CredentialDataDialog.tsx
+++ b/js/apps/admin-ui/src/user/user-credentials/CredentialDataDialog.tsx
@@ -1,11 +1,14 @@
 import { useTranslation } from "react-i18next";
 import { Modal, ModalVariant } from "@patternfly/react-core";
-import { TableVariant } from "@patternfly/react-table";
 import {
   Table,
-  TableBody,
-  TableHeader,
-} from "@patternfly/react-table/deprecated";
+  TableVariant,
+  Tbody,
+  Td,
+  Th,
+  Thead,
+  Tr,
+} from "@patternfly/react-table";
 
 type CredentialDataDialogProps = {
   credentialData: [string, string][];
@@ -29,11 +32,23 @@ export const CredentialDataDialog = ({
         aria-label={t("passwordDataTitle")}
         data-testid="password-data-dialog"
         variant={TableVariant.compact}
-        cells={[t("showPasswordDataName"), t("showPasswordDataValue")]}
-        rows={credentialData}
       >
-        <TableHeader />
-        <TableBody />
+        <Thead>
+          <Tr>
+            <Th>{t("showPasswordDataName")}</Th>
+            <Th>{t("showPasswordDataValue")}</Th>
+          </Tr>
+        </Thead>
+        <Tbody>
+          {credentialData.map((cred, index) => {
+            return (
+              <Tr key={index}>
+                <Td>{cred[0]}</Td>
+                <Td>{cred[1]}</Td>
+              </Tr>
+            );
+          })}
+        </Tbody>
       </Table>
     </Modal>
   );