diff --git a/.changeset/tall-beers-press.md b/.changeset/tall-beers-press.md
new file mode 100644
index 00000000000..b527e9e2121
--- /dev/null
+++ b/.changeset/tall-beers-press.md
@@ -0,0 +1,9 @@
+---
+"@wso2is/admin.identity-providers.v1": patch
+"@wso2is/admin.connections.v1": patch
+"@wso2is/admin.extensions.v1": patch
+"@wso2is/admin.core.v1": patch
+"@wso2is/i18n": patch
+---
+
+Remove deprecated trusted apps UI
diff --git a/features/admin.connections.v1/configs/endpoints.ts b/features/admin.connections.v1/configs/endpoints.ts
index f9d8aaf009f..9df4714d4c9 100644
--- a/features/admin.connections.v1/configs/endpoints.ts
+++ b/features/admin.connections.v1/configs/endpoints.ts
@@ -32,7 +32,6 @@ export const getConnectionResourceEndpoints = (serverHost: string): ConnectionRe
         authenticators: `${ serverHost }/api/server/v1/authenticators`,
         extensions: `${ serverHost }/api/server/v1/extensions`,
         fidoConfigs: `${ serverHost }/api/identity/config-mgt/v1.0/resource/fido-config`,
-        fidoTrustedApps: `${ serverHost }/fido/trusted-apps-mgt`,
         identityProviders: `${ serverHost }/api/server/v1/identity-providers`,
         localAuthenticators: `${ serverHost }/api/server/v1/configs/authenticators`,
         multiFactorAuthenticators: `${ serverHost }/api/server/v1/identity-governance/${
diff --git a/features/admin.connections.v1/models/endpoints.ts b/features/admin.connections.v1/models/endpoints.ts
index 1e1e68fcd92..89385c3d998 100644
--- a/features/admin.connections.v1/models/endpoints.ts
+++ b/features/admin.connections.v1/models/endpoints.ts
@@ -24,7 +24,6 @@ export interface ConnectionResourceEndpointsInterface {
     authenticatorTags: string;
     extensions: string;
     fidoConfigs: string;
-    fidoTrustedApps: string;
     identityProviders: string;
     localAuthenticators: string;
     multiFactorAuthenticators: string;
diff --git a/features/admin.core.v1/store/reducers/config.ts b/features/admin.core.v1/store/reducers/config.ts
index d87ee6379a3..f15944defae 100644
--- a/features/admin.core.v1/store/reducers/config.ts
+++ b/features/admin.core.v1/store/reducers/config.ts
@@ -112,7 +112,6 @@ export const commonConfigReducerInitialState: CommonConfigReducerStateInterface<
             extensions: "",
             externalClaims: "",
             fidoConfigs: "",
-            fidoTrustedApps: "",
             getSecret: "",
             getSecretList: "",
             getSecretType: "",
diff --git a/features/admin.extensions.v1/configs/identity-provider.tsx b/features/admin.extensions.v1/configs/identity-provider.tsx
index 5b30413583b..66700d2abca 100644
--- a/features/admin.extensions.v1/configs/identity-provider.tsx
+++ b/features/admin.extensions.v1/configs/identity-provider.tsx
@@ -38,7 +38,6 @@ import SIWEIdPTemplate from "../identity-provider-templates/templates/swe/swe.js
 
 export const identityProviderConfig: IdentityProviderConfig = {
     editIdentityProvider: {
-        enableFIDOTrustedAppsConfiguration: false,
         getOverriddenAuthenticatorForm: (
             type: string,
             templateId: string,
diff --git a/features/admin.extensions.v1/configs/models/identity-providers.ts b/features/admin.extensions.v1/configs/models/identity-providers.ts
index 8de3eceed72..1c6510d7bb6 100644
--- a/features/admin.extensions.v1/configs/models/identity-providers.ts
+++ b/features/admin.extensions.v1/configs/models/identity-providers.ts
@@ -36,7 +36,6 @@ export interface ExtendedSamlConfigInterface {
 
 export interface IdentityProviderConfig {
     editIdentityProvider: {
-        enableFIDOTrustedAppsConfiguration: boolean;
         showAdvancedSettings: boolean;
         showIssuerSettings: boolean;
         showJitProvisioning: boolean;
diff --git a/features/admin.identity-providers.v1/api/fido-trusted-apps.ts b/features/admin.identity-providers.v1/api/fido-trusted-apps.ts
index 306beebe5cf..e69de29bb2d 100644
--- a/features/admin.identity-providers.v1/api/fido-trusted-apps.ts
+++ b/features/admin.identity-providers.v1/api/fido-trusted-apps.ts
@@ -1,110 +0,0 @@
-/**
- * Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { AsgardeoSPAClient, HttpClientInstance } from "@asgardeo/auth-react";
-import { ConnectionUIConstants } from "@wso2is/admin.connections.v1/constants/connection-ui-constants";
-import { store } from "@wso2is/admin.core.v1";
-import useRequest, {
-    RequestConfigInterface,
-    RequestErrorInterface,
-    RequestResultInterface
-} from "@wso2is/admin.core.v1/hooks/use-request";
-import { IdentityAppsApiException } from "@wso2is/core/exceptions";
-import { HttpMethods } from "@wso2is/core/models";
-import { AxiosError, AxiosResponse } from "axios";
-import { FIDOTrustedAppsResponseInterface } from "../models";
-
-/**
- * Get an axios instance.
- */
-const httpClient: HttpClientInstance =
-    AsgardeoSPAClient.getInstance().httpRequest.bind(AsgardeoSPAClient.getInstance());
-
-/**
- * Hook to get the FIDO trusted apps.
- *
- * @param shouldFetch - Should fetch the data.
- *
- * @returns FIDO trusted apps list.
- */
-export const useFIDOTrustedApps = <Data = FIDOTrustedAppsResponseInterface, Error = RequestErrorInterface>(
-    shouldFetch: boolean = true
-): RequestResultInterface<Data, Error> => {
-
-    const requestConfig: RequestConfigInterface = {
-        headers: {
-            "Accept": "application/json",
-            "Content-Type": "application/json"
-        },
-        method: HttpMethods.GET,
-        url: store?.getState()?.config?.endpoints?.fidoTrustedApps
-    };
-
-    const { data, error, isValidating, mutate } = useRequest<Data, Error>(shouldFetch ? requestConfig : null);
-
-    return {
-        data,
-        error: error,
-        isLoading: !error && !data,
-        isValidating,
-        mutate
-    };
-};
-
-/**
- * Update the FIDO trusted apps.
- *
- * @param fidoTrustedApps - List of FIDO Trusted Apps.
- *
- * @returns Updated FIDO trusted apps list.
- */
-export const updateFidoTrustedApps = (
-    fidoTrustedApps: FIDOTrustedAppsResponseInterface
-): Promise<void> => {
-
-    const requestConfig: RequestConfigInterface = {
-        data: fidoTrustedApps,
-        headers: {
-            "Accept": "application/json",
-            "Content-Type": "application/json"
-        },
-        method: HttpMethods.PUT,
-        url: store?.getState()?.config?.endpoints?.fidoTrustedApps
-    };
-
-    return httpClient(requestConfig)
-        .then((response: AxiosResponse) => {
-            if (response?.status !== 200) {
-                throw new IdentityAppsApiException(
-                    ConnectionUIConstants.ERROR_MESSAGES.FIDO_TRUSTED_APPS_UPDATE_INVALID_STATUS_CODE_ERROR,
-                    null,
-                    response?.status,
-                    response?.request,
-                    response,
-                    response?.config);
-            }
-        }).catch((error: AxiosError) => {
-            throw new IdentityAppsApiException(
-                ConnectionUIConstants.ERROR_MESSAGES.FIDO_TRUSTED_APPS_UPDATE_ERROR,
-                error?.stack,
-                error?.response?.data?.code,
-                error?.request,
-                error?.response,
-                error?.config);
-        });
-};
diff --git a/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-authenticator-form.tsx b/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-form.tsx
similarity index 92%
rename from features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-authenticator-form.tsx
rename to features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-form.tsx
index a51f96b360f..c7b7971febd 100644
--- a/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-authenticator-form.tsx
+++ b/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-form.tsx
@@ -19,6 +19,7 @@
 import { ConnectionUIConstants } from "@wso2is/admin.connections.v1/constants/connection-ui-constants";
 import { LocalAuthenticatorConstants } from "@wso2is/admin.connections.v1/constants/local-authenticator-constants";
 import { identityProviderConfig } from "@wso2is/admin.extensions.v1";
+import { updateFidoConfigs, useFIDOConnectorConfigs } from "@wso2is/admin.identity-providers.v1/api/fido-configs";
 import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type";
 import { IdentityAppsApiException } from "@wso2is/core/exceptions";
 import { AlertLevels } from "@wso2is/core/models";
@@ -32,8 +33,7 @@ import React, { FunctionComponent, ReactElement, useEffect, useMemo, useState }
 import { Trans, useTranslation } from "react-i18next";
 import { useDispatch } from "react-redux";
 import { Dispatch } from "redux";
-import { FIDOTrustedApps } from "./fido-trusted-apps";
-import { updateFidoConfigs, useFIDOConnectorConfigs } from "../../../../api/fido-configs";
+import { IdentityProviderManagementConstants } from "../../../constants";
 import {
     CommonAuthenticatorFormFieldMetaInterface,
     CommonAuthenticatorFormInitialValuesInterface,
@@ -44,7 +44,7 @@ import {
     FIDOAuthenticatorFormPropsInterface,
     FIDOConfigsInterface,
     FIDOConnectorConfigsAttributeInterface
-} from "../../../../models";
+} from "../../../models";
 
 const FORM_ID: string = "fido-authenticator-form";
 
@@ -81,7 +81,6 @@ export const FIDOAuthenticatorForm: FunctionComponent<FIDOAuthenticatorFormProps
     ] = useState<boolean>(undefined);
     const [ isReadOnly ] = useState<boolean>(isSubOrganization() || readOnly);
     const [ isFIDOConfigsSubmitting, setIsFIDOConfigsSubmitting ] = useState<boolean>(false);
-    const [ isFIDOTrustedAppsSubmitting, setIsFIDOTrustedAppsSubmitting ] = useState<boolean>(false);
     const [ FIDOTrustedOrigins, setFIDOTrustedOrigins ] = useState<string>("");
 
     const {
@@ -207,32 +206,32 @@ export const FIDOAuthenticatorForm: FunctionComponent<FIDOAuthenticatorFormProps
 
         updateFidoConfigs(payload)
             .then(() => {
-                dispatch(addAlert({
+                addAlert({
                     description: t("authenticationProvider:" +
                         "notifications.updateFIDOConnectorConfigs." +
                         "success.description"),
                     level: AlertLevels.SUCCESS,
                     message: t("authenticationProvider:notifications." +
                         "updateFIDOConnectorConfigs.success.message")
-                }));
+                });
 
                 mutateFIDOConnectorConfigs();
             })
             .catch((error: IdentityAppsApiException) => {
                 if (error?.response?.data?.description) {
-                    dispatch(addAlert({
+                    addAlert({
                         description: t("authenticationProvider:" +
                             "notifications.updateFIDOConnectorConfigs." +
                             "error.description", { description: error.response.data.description }),
                         level: AlertLevels.ERROR,
                         message: t("authenticationProvider:notifications." +
                             "updateFIDOConnectorConfigs.error.message")
-                    }));
+                    });
 
                     return;
                 }
 
-                dispatch(addAlert({
+                addAlert({
                     description: t("authenticationProvider:" +
                         "notifications.updateFIDOConnectorConfigs." +
                         "genericError.description"),
@@ -240,13 +239,11 @@ export const FIDOAuthenticatorForm: FunctionComponent<FIDOAuthenticatorFormProps
                     message: t("authenticationProvider:" +
                         "notifications.updateFIDOConnectorConfigs." +
                         "genericError.message")
-                }));
+                });
             })
             .finally(() => setIsFIDOConfigsSubmitting(false));
     };
 
-    let updateTrustedApps: (callback: () => void) => void;
-
     /**
      * Prepare form values for submitting.
      *
@@ -260,11 +257,6 @@ export const FIDOAuthenticatorForm: FunctionComponent<FIDOAuthenticatorFormProps
             updateFIDOConnectorConfigs();
         }
 
-        if (identityProviderConfig?.editIdentityProvider?.enableFIDOTrustedAppsConfiguration) {
-            setIsFIDOTrustedAppsSubmitting(true);
-            updateTrustedApps(() => setIsFIDOTrustedAppsSubmitting(false));
-        }
-
         const properties: CommonPluggableComponentPropertyInterface[] = [];
 
         for (const [ name, value ] of Object.entries(values)) {
@@ -405,22 +397,9 @@ export const FIDOAuthenticatorForm: FunctionComponent<FIDOAuthenticatorFormProps
                     showPredictions={ false }
                     isAllowEnabled={ false }
                     skipValidation
-                    readOnly={ isReadOnly }
                 />)
             }
 
-            {
-                identityProviderConfig?.editIdentityProvider?.enableFIDOTrustedAppsConfiguration && !isSubOrganization()
-                    ? (
-                        <FIDOTrustedApps
-                            readOnly={ isReadOnly }
-                            triggerSubmission={ (submitFunction: (callback: () => void) => void) => {
-                                updateTrustedApps = submitFunction;
-                            } }
-                        />
-                    )
-                    : null
-            }
             <Field.Button
                 form={ FORM_ID }
                 size="small"
@@ -428,8 +407,8 @@ export const FIDOAuthenticatorForm: FunctionComponent<FIDOAuthenticatorFormProps
                 ariaLabel="FIDO authenticator update button"
                 name="update-button"
                 data-testid={ `${ testId }-submit-button` }
-                disabled={ isSubmitting || isFIDOConfigsSubmitting || isFIDOTrustedAppsSubmitting }
-                loading={ isSubmitting || isFIDOConfigsSubmitting || isFIDOTrustedAppsSubmitting }
+                disabled={ isSubmitting || isFIDOConfigsSubmitting }
+                loading={ isSubmitting || isFIDOConfigsSubmitting }
                 label={ t("common:update") }
                 hidden={ isReadOnly }
             />
diff --git a/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-app-wizard.scss b/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-app-wizard.scss
deleted file mode 100644
index ca3585399ef..00000000000
--- a/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-app-wizard.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-.fido-trusted-apps-wizard-form-modal {
-    .fido-trusted-app-name-field {
-        label {
-            padding-bottom: 0.5%;
-        }
-    }
-
-    .app-type-selection-section {
-        .app-type-selection-card-group {
-            margin-top: 2px;
-        }
-    }
-}
diff --git a/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-app-wizard.tsx b/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-app-wizard.tsx
deleted file mode 100644
index 558b2f0b757..00000000000
--- a/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-app-wizard.tsx
+++ /dev/null
@@ -1,280 +0,0 @@
-/**
- * Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { getTechnologyLogos } from "@wso2is/admin.core.v1";
-import { IdentifiableComponentInterface } from "@wso2is/core/models";
-import { Field, Form } from "@wso2is/form";
-import {
-    Heading,
-    LinkButton,
-    PrimaryButton,
-    SelectionCard,
-    URLInput
-} from "@wso2is/react-components";
-import React, { FunctionComponent, ReactElement, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { Card, Grid, Modal } from "semantic-ui-react";
-import { FIDOTrustedAppTypes, FIDOTrustedAppsValuesInterface } from "../../../../models";
-import "./fido-trusted-app-wizard.scss";
-
-/**
- * The props interface for the 'FIDOTrustedAppWizard' component.
- */
-interface FIDOTrustedAppWizardPropsInterface extends IdentifiableComponentInterface {
-    /**
-     * List of added trusted apps.
-     */
-    trustedApps: FIDOTrustedAppsValuesInterface;
-    /**
-     * Function for adding a new trusted app.
-     */
-    updateTrustedApps: (
-        appName: string, appType: FIDOTrustedAppTypes, deleteApp?: boolean, shaValues?: string[]) => void,
-    /**
-     * Close the wizard.
-     */
-    closeWizard: () => void;
-}
-
-const APP_NAME_MAX_LENGTH: number = 255;
-const APP_NAME_MIN_LENGTH: number = 1;
-
-/**
- * FIDO Trusted App wizard.
- */
-export const FIDOTrustedAppWizard: FunctionComponent<FIDOTrustedAppWizardPropsInterface> = (
-    props: FIDOTrustedAppWizardPropsInterface
-): ReactElement => {
-
-    const {
-        trustedApps,
-        updateTrustedApps,
-        closeWizard,
-        ["data-componentid"]: componentId
-    } = props;
-
-    const { t } = useTranslation();
-
-    const [ selectedAppType, setSelectedAppType ] = useState<FIDOTrustedAppTypes>(FIDOTrustedAppTypes.ANDROID);
-    const [ shaValues, setSHAValues ] = useState<string>("");
-
-    /**
-     * Handle the form submission.
-     */
-    const handleFormSubmit = (values: { appName: string }) => {
-        updateTrustedApps(values?.appName, selectedAppType, false, shaValues ? shaValues?.split(",") : []);
-        closeWizard();
-    };
-
-    /**
-     * Function to trigger the submission.
-     */
-    let triggerFormSubmission: () => void;
-
-    return (
-        <Modal
-            data-testid={ componentId }
-            open={ true }
-            className="wizard"
-            dimmer="blurring"
-            size="small"
-            onClose={ closeWizard }
-            closeOnDimmerClick={ false }
-            closeOnEscape
-        >
-            <Modal.Header className="wizard-header">
-                { t("authenticationProvider:forms.authenticatorSettings." +
-                    "fido2.trustedApps.wizard.title") }
-                <Heading as="h6">
-                    { t("authenticationProvider:forms.authenticatorSettings." +
-                        "fido2.trustedApps.wizard.subTitle") }
-                </Heading>
-            </Modal.Header>
-            <Modal.Content className="content-container fido-trusted-apps-wizard-form-modal" scrolling>
-                <Form
-                    id={ `${componentId}-form` }
-                    uncontrolledForm={ false }
-                    onSubmit={ handleFormSubmit }
-                    triggerSubmit={ (submitFunction: () => void) => triggerFormSubmission = submitFunction }
-                    validate={
-                        (values: { appName: string }) => {
-                            if (!values?.appName) {
-                                return {
-                                    appName: t("authenticationProvider:forms.authenticatorSettings." +
-                                    "fido2.trustedApps.wizard.fields.appName.validations.required")
-                                };
-                            }
-
-                            if (trustedApps?.[selectedAppType]?.[values?.appName]) {
-                                return {
-                                    appName: t("authenticationProvider:forms.authenticatorSettings." +
-                                    "fido2.trustedApps.wizard.fields.appName.validations.duplicate")
-                                };
-                            }
-
-                            return null;
-                        }
-                    }
-                >
-                    <Field.Input
-                        ariaLabel="appName"
-                        inputType="default"
-                        name="appName"
-                        label={ t("authenticationProvider:forms.authenticatorSettings." +
-                            "fido2.trustedApps.wizard.fields.appName.label") }
-                        required
-                        placeholder={ t("authenticationProvider:forms.authenticatorSettings." +
-                            "fido2.trustedApps.wizard.fields.appName.placeholder") }
-                        data-testid={ `${ componentId }-app-name` }
-                        maxLength={ APP_NAME_MAX_LENGTH }
-                        minLength={ APP_NAME_MIN_LENGTH }
-                        className="fido-trusted-app-name-field"
-                        validation={ (value: string) => {
-                            if (trustedApps?.[selectedAppType]?.[value]) {
-                                return t("authenticationProvider:forms.authenticatorSettings." +
-                                    "fido2.trustedApps.wizard.fields.appName.validations.duplicate");
-                            }
-
-                            return null;
-                        } }
-                    />
-                    <div className="app-type-selection-section">
-                        <label className="app-type-label">
-                            { t("authenticationProvider:forms.authenticatorSettings." +
-                                "fido2.trustedApps.wizard.fields.appType.label") }
-                        </label>
-                        <Card.Group itemsPerRow={ 3 } className="app-type-selection-card-group">
-                            <SelectionCard
-                                image={ getTechnologyLogos()?.android }
-                                size="small"
-                                className="app-type-selection-card"
-                                header={ t("authenticationProvider:forms.authenticatorSettings." +
-                                        "fido2.trustedApps.types.android") }
-                                selected={ selectedAppType === FIDOTrustedAppTypes.ANDROID }
-                                onClick={ () => setSelectedAppType(FIDOTrustedAppTypes.ANDROID) }
-                                imageSize="x30"
-                                imageOptions={ {
-                                    relaxed: true,
-                                    square: false,
-                                    width: "auto"
-                                } }
-                                contentTopBorder={ false }
-                                showTooltips={ false }
-                                renderDisabledItemsAsGrayscale={ false }
-                                data-testid={ `${ componentId }-${ FIDOTrustedAppTypes.ANDROID }-card` }
-                            />
-                            <SelectionCard
-                                image={ getTechnologyLogos()?.apple }
-                                size="small"
-                                className="app-type-selection-card"
-                                header={ t("authenticationProvider:forms.authenticatorSettings." +
-                                        "fido2.trustedApps.types.ios") }
-                                selected={ selectedAppType === FIDOTrustedAppTypes.IOS }
-                                onClick={ () => setSelectedAppType(FIDOTrustedAppTypes.IOS) }
-                                imageSize="x30"
-                                imageOptions={ {
-                                    relaxed: true,
-                                    square: false,
-                                    width: "auto"
-                                } }
-                                contentTopBorder={ false }
-                                showTooltips={ false }
-                                renderDisabledItemsAsGrayscale={ false }
-                                data-testid={ `${ componentId }-${ FIDOTrustedAppTypes.IOS }-card` }
-                            />
-                        </Card.Group>
-                    </div>
-                    {
-                        selectedAppType === FIDOTrustedAppTypes.ANDROID
-                            ? (
-                                <URLInput
-                                    urlState={ shaValues }
-                                    setURLState={ (shaValues: string) => {
-                                        if (shaValues !== undefined) {
-                                            setSHAValues(shaValues);
-                                        }
-                                    } }
-                                    labelName={
-                                        t("authenticationProvider:forms." +
-                                                "authenticatorSettings.fido2.trustedAppSHAValues.label")
-                                    }
-                                    placeholder={
-                                        t("authenticationProvider:forms." +
-                                                "authenticatorSettings.fido2.trustedAppSHAValues.placeholder")
-                                    }
-                                    validationErrorMsg={
-                                        t("authenticationProvider:forms." +
-                                                "authenticatorSettings.fido2.trustedAppSHAValues.validations.invalid")
-                                    }
-                                    computerWidth={ 10 }
-                                    hint={
-                                        t("authenticationProvider:forms." +
-                                            "authenticatorSettings.fido2.trustedAppSHAValues.hint")
-                                    }
-                                    addURLTooltip={ t("authenticationProvider:forms." +
-                                            "authenticatorSettings.fido2.trustedAppSHAValues.add") }
-                                    duplicateURLErrorMessage={ t("authenticationProvider:forms." +
-                                            "authenticatorSettings.fido2.trustedAppSHAValues.validations.duplicate") }
-                                    data-testid={ `${ componentId }-fido-trusted-app-key-hashes-input` }
-                                    required = { false }
-                                    showPredictions={ false }
-                                    isAllowEnabled={ false }
-                                    skipValidation
-                                />
-                            )
-                            : null
-                    }
-                </Form>
-            </Modal.Content>
-            <Modal.Actions>
-                <Grid>
-                    <Grid.Row column={ 1 }>
-                        <Grid.Column mobile={ 8 } tablet={ 8 } computer={ 8 }>
-                            <LinkButton
-                                type="button"
-                                tabIndex={ 5 }
-                                data-testid={ `${componentId}-cancel-button` }
-                                floated="left"
-                                onClick={ closeWizard }
-                            >
-                                { t("authenticationProvider:forms.authenticatorSettings." +
-                                        "fido2.trustedApps.wizard.buttons.cancel") }
-                            </LinkButton>
-                        </Grid.Column>
-                        <Grid.Column mobile={ 8 } tablet={ 8 } computer={ 8 }>
-                            <PrimaryButton
-                                type="button"
-                                tabIndex={ 6 }
-                                data-testid={ `${componentId}-finish-button` }
-                                floated="right"
-                                onClick={ () => triggerFormSubmission() }
-                            >
-                                { t("authenticationProvider:forms.authenticatorSettings." +
-                                        "fido2.trustedApps.wizard.buttons.finish") }
-                            </PrimaryButton>
-                        </Grid.Column>
-                    </Grid.Row>
-                </Grid>
-            </Modal.Actions>
-        </Modal>
-    );
-};
-
-FIDOTrustedAppWizard.defaultProps = {
-    "data-componentid": "fido-trusted-app-wizard"
-};
diff --git a/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-apps-list.tsx b/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-apps-list.tsx
deleted file mode 100644
index c023a520c21..00000000000
--- a/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-apps-list.tsx
+++ /dev/null
@@ -1,466 +0,0 @@
-/**
- * Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { getEmptyPlaceholderIllustrations, getTechnologyLogos } from "@wso2is/admin.core.v1";
-import { IdentifiableComponentInterface } from "@wso2is/core/models";
-import {
-    EmphasizedSegment,
-    EmptyPlaceholder,
-    GenericIcon,
-    LinkButton,
-    ListLayout,
-    PrimaryButton,
-    SegmentedAccordion,
-    SegmentedAccordionTitleActionInterface,
-    URLInput
-} from "@wso2is/react-components";
-import React, { Fragment, FunctionComponent, ReactElement, useEffect, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { Grid, Header, Icon, Input } from "semantic-ui-react";
-import {
-    FIDOTrustedAppTypes,
-    FIDOTrustedAppsListInterface,
-    FIDOTrustedAppsValuesInterface
-} from "../../../../models/identity-provider";
-
-/**
- * Prop types for the FIDO trusted apps list component.
- */
-interface FIDOTrustedAppsList extends IdentifiableComponentInterface {
-    /**
-     * List of added trusted apps.
-     */
-    trustedApps: FIDOTrustedAppsValuesInterface;
-    /**
-     * Function for update the trusted app.
-     */
-    updateTrustedApps: (
-        appName: string, appType: FIDOTrustedAppTypes, deleteApp?: boolean, shaValues?: string[]) => void,
-    /**
-     * Whether the FIDO trusted apps fetch request has failed or not.
-     */
-    isTrustedAppsFetchErrorOccurred: boolean;
-    /**
-     * Whether the trusted apps are read-only or not.
-     */
-    readOnly: boolean;
-    /**
-     * Function to open the trusted app addition modal.
-     */
-    setIsTrustedAppsAddWizardOpen: (value: boolean) => void;
-}
-
-/**
- * FIDO trusted apps listing page.
- *
- * @param props - Props injected to the component.
- * @returns FIDO trusted apps list component.
- */
-export const FIDOTrustedAppsList: FunctionComponent<FIDOTrustedAppsList> = (
-    props: FIDOTrustedAppsList
-): ReactElement => {
-
-    const {
-        trustedApps,
-        updateTrustedApps,
-        isTrustedAppsFetchErrorOccurred,
-        readOnly,
-        setIsTrustedAppsAddWizardOpen,
-        ["data-componentid"]: componentId
-    } = props;
-
-    const { t } = useTranslation();
-
-    const [ activeTrustedApp, setActiveTrustedApp ] = useState<string>(null);
-    const [ searchQuery, setSearchQuery ] = useState<string>(null);
-    const [ searchedTrustedAppsList, setSearchedTrustedAppsList ] =
-        useState<FIDOTrustedAppsListInterface[]>(null);
-
-    /**
-     * Format the data of the trusted apps for display in the list view.
-     */
-    const trustedAppListData: FIDOTrustedAppsListInterface[] = useMemo(() => {
-        const trustedAppsList: FIDOTrustedAppsListInterface[] = [];
-
-        if (!trustedApps) {
-            return trustedAppsList;
-        }
-
-        if (trustedApps?.android) {
-            for (const app in trustedApps?.android) {
-                trustedAppsList.push({
-                    appName: app,
-                    appType: FIDOTrustedAppTypes.ANDROID,
-                    shaValues: trustedApps?.android?.[app]
-                });
-            }
-        }
-
-        if (trustedApps?.ios) {
-            for (const app in trustedApps?.ios) {
-                trustedAppsList.push({
-                    appName: app,
-                    appType: FIDOTrustedAppTypes.IOS
-                });
-            }
-        }
-
-        return trustedAppsList;
-    }, [ trustedApps ]);
-
-    /**
-     * Initialize the trusted apps list to the searched trusted apps list.
-     */
-    useEffect(() => {
-        if (trustedAppListData) {
-            setSearchedTrustedAppsList(trustedAppListData);
-        }
-    }, [ trustedAppListData ]);
-
-    /**
-     * Placeholder for the trusted apps list.
-     */
-    const getPlaceholders = (): ReactElement => {
-        if (isTrustedAppsFetchErrorOccurred) {
-            return (
-                <EmptyPlaceholder
-                    image={ getEmptyPlaceholderIllustrations().genericError }
-                    imageSize="tiny"
-                    title={ t("authenticationProvider:forms.authenticatorSettings." +
-                                "fido2.trustedApps.placeHolderTexts.errorText.title") }
-                    subtitle={ [ t("authenticationProvider:forms.authenticatorSettings." +
-                                "fido2.trustedApps.placeHolderTexts.errorText.subtitles.1"),
-                    t("authenticationProvider:forms.authenticatorSettings." +
-                        "fido2.trustedApps.placeHolderTexts.errorText.subtitles.0") ] }
-                    data-componentid={ `${componentId}-fetch-error-occurred-placeholder` }
-                />
-            );
-        } else if (trustedAppListData?.length === 0) {
-            return (
-                <EmptyPlaceholder
-                    image={ getEmptyPlaceholderIllustrations().emptyList }
-                    action={ (
-                        !readOnly &&
-                            ( <PrimaryButton
-                                type="button"
-                                basic
-                                data-componentid={ `${componentId}-empty-placeholder-trusted-app-add-button` }
-                                onClick={ (): void => setIsTrustedAppsAddWizardOpen(true) }
-                            >
-                                <Icon name="add" />
-                                { t("authenticationProvider:forms.authenticatorSettings." +
-                                    "fido2.trustedApps.buttons.addButton") }
-                            </PrimaryButton> )
-                    ) }
-                    imageSize="tiny"
-                    subtitle={ [ t("authenticationProvider:forms.authenticatorSettings." +
-                        "fido2.trustedApps.placeHolderTexts.emptyText") ] }
-                    data-componentid={ `${componentId}-empty-placeholder` }
-                />
-            );
-        } else if (searchedTrustedAppsList?.length === 0) {
-            return (
-                <EmptyPlaceholder
-                    title={ t("authenticationProvider:forms.authenticatorSettings." +
-                        "fido2.trustedApps.placeHolderTexts.emptySearch.title") }
-                    subtitle={ [ t("authenticationProvider:forms.authenticatorSettings." +
-                        "fido2.trustedApps.placeHolderTexts.emptySearch.subTitle.0"),
-                    t("authenticationProvider:forms.authenticatorSettings." +
-                        "fido2.trustedApps.placeHolderTexts.emptySearch.subTitle.1") ] }
-                    image={ getEmptyPlaceholderIllustrations().emptySearch }
-                    action={
-                        (<LinkButton type="button" onClick={ clearSearchQuery }>
-                            { t("authenticationProvider:forms.authenticatorSettings." +
-                                "fido2.trustedApps.buttons.emptySearchButton") }
-                        </LinkButton>)
-                    }
-                    imageSize="tiny"
-                />
-            );
-        } else {
-            return null;
-        }
-    };
-
-    /**
-     * Resolves the header of the trusted apps list item.
-     *
-     * @param trustedApp - The details of the selected trusted app.
-     * @returns List item header component.
-     */
-    const resolveTrustedAppsListItemHeader = (trustedApp: FIDOTrustedAppsListInterface):
-        ReactElement => (
-        <Header
-            as="h6"
-            className="header-with-icon"
-            data-componentId={ `${componentId}-heading` }
-        >
-            <Grid verticalAlign="middle">
-                <Grid.Row>
-                    <Grid.Column width={ 16 }>
-                        <Header.Content>
-                            <Grid verticalAlign="middle">
-                                <Grid.Row>
-                                    <Grid.Column width={ 16 }>
-                                        {
-                                            trustedApp?.appType === FIDOTrustedAppTypes.ANDROID
-                                                ? (
-                                                    <GenericIcon
-                                                        size="micro"
-                                                        icon={ getTechnologyLogos()?.android }
-                                                        verticalAlign="middle"
-                                                        floated="left"
-                                                    />
-                                                )
-                                                : (
-                                                    <GenericIcon
-                                                        size="micro"
-                                                        icon={ getTechnologyLogos()?.apple }
-                                                        floated="left"
-                                                        verticalAlign="middle"
-                                                    />
-                                                )
-                                        }
-                                        { trustedApp?.appName }
-                                    </Grid.Column>
-                                </Grid.Row>
-                            </Grid>
-                        </Header.Content>
-                    </Grid.Column>
-                </Grid.Row>
-            </Grid>
-        </Header>
-    );
-
-    /**
-     * Creates the actions of the trusted apps list item.
-     *
-     * @param trustedApp - The details of the selected trusted app.
-     * @returns List item actions.
-     */
-    const createAccordionAction = (trustedApp: FIDOTrustedAppsListInterface):
-        SegmentedAccordionTitleActionInterface[] => {
-
-        return [
-            {
-                disabled: readOnly,
-                icon: "trash alternate",
-                onClick: () => updateTrustedApps(trustedApp?.appName, trustedApp?.appType, true),
-                popoverText: t("authenticationProvider:forms.authenticatorSettings." +
-                    "fido2.trustedApps.removeTrustedAppPopOver"),
-                type: "icon"
-            }
-        ];
-    };
-
-    /**
-     * Resolves the content of the trusted apps list item.
-     *
-     * @param trustedApp - The details of the selected trusted app.
-     * @returns List item content.
-     */
-    const resolveTrustedAppListItemContent = (trustedApp: FIDOTrustedAppsListInterface):
-        ReactElement => (
-        trustedApp?.appType === FIDOTrustedAppTypes.ANDROID
-            ? (
-                <URLInput
-                    urlState={ trustedApp?.shaValues?.join(",") }
-                    setURLState={ (shaValues: string) => {
-                        if (shaValues !== undefined) {
-                            updateTrustedApps(
-                                trustedApp?.appName, trustedApp?.appType, false, shaValues?.split(","));
-                        }
-                    } }
-                    labelName={
-                        t("authenticationProvider:forms." +
-                                "authenticatorSettings.fido2.trustedAppSHAValues.label")
-                    }
-                    placeholder={
-                        t("authenticationProvider:forms." +
-                                "authenticatorSettings.fido2.trustedAppSHAValues.placeholder")
-                    }
-                    validationErrorMsg={
-                        t("authenticationProvider:forms." +
-                                "authenticatorSettings.fido2.trustedAppSHAValues.validations.invalid")
-                    }
-                    computerWidth={ 10 }
-                    hint={
-                        t("authenticationProvider:forms." +
-                            "authenticatorSettings.fido2.trustedAppSHAValues.hint")
-                    }
-                    addURLTooltip={ t("authenticationProvider:forms." +
-                                "authenticatorSettings.fido2.trustedAppSHAValues.add") }
-                    duplicateURLErrorMessage={ t("authenticationProvider:forms." +
-                            "authenticatorSettings.fido2.trustedAppSHAValues.validations.duplicate") }
-                    data-testid={ `${ componentId }-fido-trusted-app-key-hashes-input` }
-                    required = { false }
-                    showPredictions={ false }
-                    isAllowEnabled={ false }
-                    skipValidation
-                    readOnly={ readOnly }
-                />
-            ): null
-    );
-
-    /**
-     * Handle the click event of the trusted apps list item.
-     *
-     * @param trustedApp - The details of the selected trusted app.
-     */
-    const handleTrustedAppsListItemClick = (trustedApp: FIDOTrustedAppsListInterface) => {
-        if (trustedApp?.appType === FIDOTrustedAppTypes.IOS) {
-            return;
-        }
-
-        activeTrustedApp === trustedApp?.appName
-            ? setActiveTrustedApp(null)
-            : setActiveTrustedApp(trustedApp?.appName);
-    };
-
-    /**
-     * Clear the search query.
-     */
-    const clearSearchQuery = (): void => {
-        setSearchQuery("");
-        setSearchedTrustedAppsList(trustedAppListData);
-    };
-
-    /**
-     * Search the trusted apps list.
-     *
-     * @param event - Search Event.
-     */
-    const searchTrustedAppsList = (event: React.ChangeEvent<HTMLInputElement>) => {
-        const query: string = event?.target?.value;
-
-        setSearchQuery(query);
-
-        if (query?.length > 0) {
-            // Filter the trusted app using `appName`.
-            setSearchedTrustedAppsList(
-                trustedAppListData?.filter((trustedApp: FIDOTrustedAppsListInterface) => {
-                    return trustedApp?.appName?.toLowerCase()?.includes(query?.toLowerCase());
-                })
-            );
-        } else {
-            setSearchedTrustedAppsList(trustedAppListData);
-        }
-    };
-
-    return (
-        trustedAppListData?.length === 0
-            ? (
-                <EmphasizedSegment>
-                    { getPlaceholders() }
-                </EmphasizedSegment>
-            )
-            : (
-                <Grid className="mt-3">
-                    <Grid.Row columns={ 1 }>
-                        <Grid.Column mobile={ 16 } tablet={ 16 } computer={ 16 }>
-                            <ListLayout
-                                showTopActionPanel={ true }
-                                showPagination={ false }
-                                onPageChange={ () => null }
-                                totalPages={ 100 }
-                                data-componentid={ `${componentId}-list-layout` }
-                                totalListSize={ trustedAppListData?.length }
-                                leftActionPanel={
-                                    (<div className="advanced-search-wrapper aligned-left fill-default">
-                                        <Input
-                                            className="advanced-search with-add-on"
-                                            data-componentid={ `${componentId}-list-search-input` }
-                                            icon="search"
-                                            iconPosition="left"
-                                            onChange={ searchTrustedAppsList }
-                                            placeholder={ t("authenticationProvider:forms.authenticatorSettings." +
-                                                "fido2.trustedApps.search") }
-                                            floated="right"
-                                            size="small"
-                                            value={ searchQuery }
-                                        />
-                                    </div>)
-                                }
-                            >
-                                {
-                                    searchedTrustedAppsList?.length !== 0
-                                        ? (
-                                            <SegmentedAccordion
-                                                data-componentid={ `${componentId}-trusted-apps` }
-                                                viewType="table-view"
-                                            >
-                                                {
-                                                    searchedTrustedAppsList?.map(
-                                                        (trustedApp: FIDOTrustedAppsListInterface) => (
-                                                            <Fragment key={ trustedApp?.appName }>
-                                                                <SegmentedAccordion.Title
-                                                                    id={ trustedApp?.appName }
-                                                                    data-componentid={
-                                                                        `${componentId}-${trustedApp?.appName}
-                                                                                -title`
-                                                                    }
-                                                                    active={ activeTrustedApp
-                                                                        === trustedApp?.appName }
-                                                                    accordionIndex={ trustedApp?.appName }
-                                                                    onClick={ () =>
-                                                                        handleTrustedAppsListItemClick(trustedApp)
-                                                                    }
-                                                                    content={
-                                                                        resolveTrustedAppsListItemHeader(trustedApp)
-                                                                    }
-                                                                    hideChevron={
-                                                                        trustedApp?.appType === FIDOTrustedAppTypes.IOS
-                                                                    }
-                                                                    actions={
-                                                                        createAccordionAction(trustedApp)
-                                                                    }
-                                                                />
-                                                                <SegmentedAccordion.Content
-                                                                    active={ activeTrustedApp
-                                                                        === trustedApp?.appName }
-                                                                    data-componentid={
-                                                                        `${componentId}-${trustedApp?.appName}
-                                                                                    -content`
-                                                                    }
-                                                                    children={
-                                                                        resolveTrustedAppListItemContent(trustedApp)
-                                                                    }
-                                                                />
-                                                            </Fragment>
-                                                        )
-                                                    )
-                                                }
-                                            </SegmentedAccordion>
-                                        )
-                                        : getPlaceholders()
-                                }
-                            </ListLayout>
-                        </Grid.Column>
-                    </Grid.Row>
-                </Grid>
-            )
-    );
-
-};
-
-/**
- * Default props for the component.
- */
-FIDOTrustedAppsList.defaultProps = {
-    "data-componentid": "fido-trusted-apps-list"
-};
diff --git a/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-apps.tsx b/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-apps.tsx
index 76d89a0ffd5..e69de29bb2d 100644
--- a/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-apps.tsx
+++ b/features/admin.identity-providers.v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-apps.tsx
@@ -1,341 +0,0 @@
-/**
- * Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { LocalAuthenticatorConstants } from "@wso2is/admin.connections.v1/constants/local-authenticator-constants";
-import { IdentityAppsApiException } from "@wso2is/core/exceptions";
-import { AlertLevels, IdentifiableComponentInterface } from "@wso2is/core/models";
-import { addAlert } from "@wso2is/core/store";
-import { EmphasizedSegment, Heading, PrimaryButton } from "@wso2is/react-components";
-import cloneDeep from "lodash-es/cloneDeep";
-import isEqual from "lodash-es/isEqual";
-import React, { Fragment, FunctionComponent, ReactElement, useEffect, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { useDispatch } from "react-redux";
-import { Dispatch } from "redux";
-import { Divider, Grid, Icon } from "semantic-ui-react";
-import { FIDOTrustedAppWizard } from "./fido-trusted-app-wizard";
-import { FIDOTrustedAppsList } from "./fido-trusted-apps-list";
-import { updateFidoTrustedApps, useFIDOTrustedApps } from "../../../../api/fido-trusted-apps";
-import { FIDOTrustedAppTypes, FIDOTrustedAppsValuesInterface } from "../../../../models";
-
-/**
- * Interface for the `FIDOTrustedApps` component props.
- */
-interface FIDOTrustedAppsPropsInterface extends IdentifiableComponentInterface {
-    /**
-     * Whether the trusted apps are read-only or not.
-     */
-    readOnly: boolean;
-    /**
-     * Provide an external function for calling the submission.
-     *
-     * @param submissionCallback - Function responsible for actual submission, which should be
-     * invoked to submit form values. It returns a promise indicating whether the submission
-     * was successful or not.
-     */
-    triggerSubmission: (submissionCallback: (callback: () => void) => void) => void;
-}
-
-/**
- * Component for Configuring FIDO Trusted Apps.
- *
- * @param props - Props injected to the component.
- * @returns `FIDOTrustedApps` component.
- */
-export const FIDOTrustedApps: FunctionComponent<FIDOTrustedAppsPropsInterface> = (
-    props: FIDOTrustedAppsPropsInterface
-): ReactElement => {
-
-    const {
-        readOnly,
-        triggerSubmission,
-        [ "data-componentid" ]: componentId
-    } = props;
-
-    const dispatch: Dispatch = useDispatch();
-
-    const { t } = useTranslation();
-
-    const [ FIDOTrustedApps, setFIDOTrustedApps ] = useState<FIDOTrustedAppsValuesInterface>(null);
-    const [ hideTrustedAppsButton, setHideTrustedAppsButton ] = useState<boolean>(true);
-    const [ isTrustedAppsAddWizardOpen, setIsTrustedAppsAddWizardOpen ] = useState<boolean>(false);
-
-    const {
-        data: fidoTrustedApps,
-        isLoading: fidoTrustedAppsFetchRequestIsLoading,
-        error: fidoTrustedAppsFetchError,
-        mutate: mutateFIDOTrustedApps
-    } = useFIDOTrustedApps();
-
-    /**
-     * Retrieve the list of FIDO trusted apps from the response data.
-     */
-    const initialFIDOTrustedAppsList: FIDOTrustedAppsValuesInterface = useMemo(() => {
-        const trustedApps: FIDOTrustedAppsValuesInterface = {
-            android: {},
-            ios: {}
-        };
-
-        if (fidoTrustedAppsFetchRequestIsLoading) {
-            setFIDOTrustedApps(trustedApps);
-
-            return trustedApps;
-        }
-
-        if (fidoTrustedApps) {
-            if (fidoTrustedApps?.android
-                && Array.isArray(fidoTrustedApps?.android)
-                && fidoTrustedApps?.android?.length > 0) {
-                fidoTrustedApps?.android?.forEach((app: string) => {
-                    if (app) {
-                        const appData: string[] = app?.split(
-                            LocalAuthenticatorConstants.FIDO_TRUSTED_APPS_SHA_SEPARATOR);
-
-                        if (!trustedApps?.android?.[appData[0]]) {
-                            trustedApps.android[appData[0]] = [];
-                        }
-
-                        if (appData?.length > 1) {
-                            trustedApps.android[appData[0]].push(appData[1]);
-                        }
-                    }
-                });
-            }
-            if (fidoTrustedApps?.ios
-                && Array.isArray(fidoTrustedApps?.ios)
-                && fidoTrustedApps?.ios?.length > 0) {
-                fidoTrustedApps?.ios?.forEach((app: string) => {
-                    if (app) {
-                        if (!trustedApps?.ios?.[app]) {
-                            trustedApps.ios[app] = [];
-                        }
-                    }
-                });
-            }
-        }
-
-        setFIDOTrustedApps(trustedApps);
-
-        return trustedApps;
-    }, [ fidoTrustedApps ]);
-
-    /**
-     * Check whether to hide the trusted app addition button.
-     */
-    useEffect(() => {
-        setHideTrustedAppsButton(
-            readOnly || !!fidoTrustedAppsFetchError || !FIDOTrustedApps || (
-                Object.keys(FIDOTrustedApps?.android)?.length === 0 &&
-                Object.keys(FIDOTrustedApps?.ios)?.length === 0
-            )
-        );
-    }, [ FIDOTrustedApps, readOnly, fidoTrustedAppsFetchError ]);
-
-    /**
-     * Handle errors that occur during the FIDO trusted apps fetch request.
-     */
-    useEffect(() => {
-        if (!fidoTrustedAppsFetchError) {
-            return;
-        }
-
-        if (fidoTrustedAppsFetchError?.response?.data?.description) {
-            dispatch(addAlert({
-                description: fidoTrustedAppsFetchError?.response?.data?.description,
-                level: AlertLevels.ERROR,
-                message: t("authenticationProvider:notifications.getFIDOTrustedApps.error.message")
-            }));
-
-            return;
-        }
-
-        dispatch(addAlert({
-            description: t("authenticationProvider:notifications." +
-                "getFIDOTrustedApps.genericError.description"),
-            level: AlertLevels.ERROR,
-            message: t("authenticationProvider:notifications." +
-                "getFIDOTrustedApps.genericError.message")
-        }));
-    }, [ fidoTrustedAppsFetchError ]);
-
-    /**
-     * Update FIDO trusted apps.
-     */
-    const updateFIDOTrustedApps = (callback: () => void) => {
-        if (!FIDOTrustedApps || isEqual(FIDOTrustedApps, initialFIDOTrustedAppsList)) {
-            callback();
-
-            return;
-        }
-
-        const androidApps: string[] = [];
-
-        for (const appName in FIDOTrustedApps?.android) {
-            if (FIDOTrustedApps?.android?.[appName]?.length > 0) {
-                FIDOTrustedApps?.android?.[appName]?.forEach((hash: string) => {
-                    androidApps?.push(`${appName}${
-                        LocalAuthenticatorConstants.FIDO_TRUSTED_APPS_SHA_SEPARATOR
-                    }${hash}`);
-                });
-            } else {
-                androidApps?.push(appName);
-            }
-        }
-
-        const iosApps: string[] = Object.keys(FIDOTrustedApps?.ios);
-
-        updateFidoTrustedApps({ android: androidApps, ios: iosApps })
-            .then(() => {
-                dispatch(addAlert({
-                    description: t("authenticationProvider:" +
-                        "notifications.updateFIDOTrustedApps." +
-                        "success.description"),
-                    level: AlertLevels.SUCCESS,
-                    message: t("authenticationProvider:notifications." +
-                        "updateFIDOTrustedApps.success.message")
-                }));
-
-                mutateFIDOTrustedApps();
-            })
-            .catch((error: IdentityAppsApiException) => {
-                if (error?.response?.data?.description) {
-                    dispatch(addAlert({
-                        description: t("authenticationProvider:" +
-                            "notifications.updateFIDOTrustedApps." +
-                            "error.description", { description: error.response.data.description }),
-                        level: AlertLevels.ERROR,
-                        message: t("authenticationProvider:notifications." +
-                            "updateFIDOTrustedApps.error.message")
-                    }));
-
-                    return;
-                }
-
-                dispatch(addAlert({
-                    description: t("authenticationProvider:" +
-                        "notifications.updateFIDOTrustedApps." +
-                        "genericError.description"),
-                    level: AlertLevels.ERROR,
-                    message: t("authenticationProvider:" +
-                        "notifications.updateFIDOTrustedApps." +
-                        "genericError.message")
-                }));
-            }).finally(() => callback());
-    };
-
-    /**
-     * Expose the function to call the submit action.
-     */
-    triggerSubmission(updateFIDOTrustedApps);
-
-    /**
-     * Update the current list of trusted apps with the given app.
-     *
-     * @param appName - Name of the updating app.
-     * @param appType - Type of the updating app.
-     * @param deleteApp - Whether the app should be removed.
-     * @param shaValues - SHA values associated with the app.
-     */
-    const updateCurrentTrustedAppsList = (
-        appName: string,
-        appType: FIDOTrustedAppTypes,
-        deleteApp?: boolean,
-        shaValues?: string[]
-    ) => {
-        const clonedTrustedApps: FIDOTrustedAppsValuesInterface = cloneDeep(FIDOTrustedApps);
-
-        if (deleteApp) {
-            delete clonedTrustedApps?.[appType]?.[appName];
-        } else {
-            if (!clonedTrustedApps?.[appType]?.[appName]) {
-                clonedTrustedApps[appType][appName] = [];
-            }
-
-            if (shaValues) {
-                clonedTrustedApps[appType][appName] = shaValues;
-            }
-        }
-
-        setFIDOTrustedApps(clonedTrustedApps);
-    };
-
-    return (
-        <Fragment>
-            <EmphasizedSegment
-                padded="very"
-                loading={ fidoTrustedAppsFetchRequestIsLoading }
-                data-componentid={ `${componentId}-fido-trusted-apps-list` }>
-                <Grid>
-                    <Grid.Row>
-                        <Grid.Column className="heading-wrapper" computer={ 12 } mobile={ 14 }>
-                            <Heading as="h4">
-                                { t("authenticationProvider:forms.authenticatorSettings.fido2.trustedApps.heading") }
-                            </Heading>
-                            <Heading subHeading ellipsis as="h6" >
-                                { t("authenticationProvider:forms.authenticatorSettings.fido2.trustedApps.subHeading") }
-                            </Heading>
-                        </Grid.Column>
-                        <Grid.Column computer={ 4 } mobile={ 6 }>
-                            {
-                                !hideTrustedAppsButton
-                                && (
-                                    <PrimaryButton
-                                        data-componentid={ "fido-trusted-apps-add-button" }
-                                        basic
-                                        size="medium"
-                                        floated="right"
-                                        type="button"
-                                        onClick={ (): void => setIsTrustedAppsAddWizardOpen(true) }
-                                    >
-                                        <Icon name="add" />
-                                        { t("authenticationProvider:forms.authenticatorSettings." +
-                                            "fido2.trustedApps.buttons.addButton") }
-                                    </PrimaryButton>
-                                )
-                            }
-                        </Grid.Column>
-                    </Grid.Row>
-                </Grid>
-                <Divider hidden />
-                <FIDOTrustedAppsList
-                    trustedApps={ FIDOTrustedApps }
-                    updateTrustedApps={ updateCurrentTrustedAppsList }
-                    isTrustedAppsFetchErrorOccurred={ !!fidoTrustedAppsFetchError }
-                    readOnly={ readOnly }
-                    setIsTrustedAppsAddWizardOpen={ setIsTrustedAppsAddWizardOpen }
-                />
-            </EmphasizedSegment>
-            {
-                isTrustedAppsAddWizardOpen && (
-                    <FIDOTrustedAppWizard
-                        trustedApps={ FIDOTrustedApps }
-                        closeWizard={ (): void => setIsTrustedAppsAddWizardOpen(false) }
-                        updateTrustedApps={ updateCurrentTrustedAppsList }
-                    />
-                )
-            }
-        </Fragment>
-    );
-};
-
-/**
- * Default props for the component.
- */
-FIDOTrustedApps.defaultProps = {
-    "data-componentid": "fido-trusted-apps"
-};
diff --git a/features/admin.identity-providers.v1/components/forms/authenticators/index.ts b/features/admin.identity-providers.v1/components/forms/authenticators/index.ts
index df760c11a71..4fadbfcfaa4 100644
--- a/features/admin.identity-providers.v1/components/forms/authenticators/index.ts
+++ b/features/admin.identity-providers.v1/components/forms/authenticators/index.ts
@@ -20,7 +20,7 @@ export * from "./apple-authenticator-form";
 export * from "./common-authenticator-form";
 export * from "./email-otp-authenticator-form";
 export * from "./facebook-authenticator-form";
-export * from "./fido-authenticator-forms/fido-authenticator-form";
+export * from "./fido-authenticator-form";
 export * from "./github-authenticator-form";
 export * from "./google-authenticator-form";
 export * from "./microsoft-authenticator-form";
diff --git a/features/admin.identity-providers.v1/constants/identity-provider-management-constants.ts b/features/admin.identity-providers.v1/constants/identity-provider-management-constants.ts
new file mode 100755
index 00000000000..d41837c8e0a
--- /dev/null
+++ b/features/admin.identity-providers.v1/constants/identity-provider-management-constants.ts
@@ -0,0 +1,131 @@
+/**
+ * Copyright (c) 2023-2024, WSO2 LLC. (https://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { authenticatorConfig } from "@wso2is/admin.extensions.v1/configs/authenticator";
+
+/**
+ * Class containing identity provider management constants.
+ * @deprecated Use the constants in the `@wso2is/admin.connections.v1` package.
+ */
+export class IdentityProviderManagementConstants {
+
+    public static readonly IDENTITY_PROVIDER_TEMPLATES_LIST_FETCH_INVALID_STATUS_CODE_ERROR: string = "Received an " +
+        "invalid status code while fetching connection templates list.";
+
+    public static readonly IDENTITY_PROVIDER_TEMPLATES_LIST_FETCH_ERROR: string = "An error occurred while fetching " +
+        "the required connection templates list.";
+
+    public static readonly LOCAL_AUTHENTICATORS_FETCH_INVALID_STATUS_CODE_ERROR: string = "Received an invalid " +
+        "status code while fetching local authenticators.";
+
+    public static readonly LOCAL_AUTHENTICATORS_FETCH_ERROR: string = "An error occurred while fetching the local" +
+        "authenticators.";
+
+    public static readonly AUTHENTICATORS_FETCH_INVALID_STATUS_CODE_ERROR: string = "Received an invalid " +
+        "status code while fetching the authenticators.";
+
+    public static readonly AUTHENTICATORS_FETCH_ERROR: string = "An error occurred while fetching the " +
+        "authenticators.";
+
+    public static readonly COMBINED_AUTHENTICATOR_FETCH_ERROR: string = "An error occurred while fetching the local" +
+        "and federated authenticators.";
+
+    public static readonly FIDO_AUTHENTICATOR_CONFIG_UPDATE_INVALID_STATUS_CODE_ERROR: string = "Received an " +
+        "invalid status code while updating the Passkey connector configs.";
+
+    public static readonly FIDO_AUTHENTICATOR_CONFIG_UPDATE_ERROR: string = "An error occurred while updating the " +
+        "Passkey connector configs.";
+
+    public static readonly FIDO_CONNECTOR_CONFIGS_NOT_CONFIGURED_ERROR_CODE: string = "CONFIGM_00017";
+
+    public static readonly SESSION_EXECUTOR_AUTHENTICATOR: string = "SessionExecutor";
+    public static readonly TOTP_AUTHENTICATOR: string = "totp";
+    public static readonly IPROOV_AUTHENTICATOR: string = "IproovAuthenticator";
+    public static readonly EMAIL_OTP_AUTHENTICATOR: string = "email-otp-authenticator";
+    public static readonly FIDO_AUTHENTICATOR: string = "FIDOAuthenticator";
+    public static readonly BASIC_AUTHENTICATOR: string = "BasicAuthenticator";
+    public static readonly IDENTIFIER_FIRST_AUTHENTICATOR: string = "IdentifierExecutor";
+    public static readonly SMS_OTP_AUTHENTICATOR: string = authenticatorConfig?.overriddenAuthenticatorNames?.
+        SMS_OTP_AUTHENTICATOR ?? "sms-otp";
+
+    public static readonly BACKUP_CODE_AUTHENTICATOR: string = "backup-code-authenticator";
+    public static readonly MAGIC_LINK_AUTHENTICATOR: string = "MagicLinkAuthenticator";
+
+    // Known IS Predefined/Protocols authenticator IDs
+    public static readonly OIDC_AUTHENTICATOR_ID: string = "T3BlbklEQ29ubmVjdEF1dGhlbnRpY2F0b3I";
+
+    // Known Local Authenticator IDS.
+    public static readonly BASIC_AUTHENTICATOR_ID: string = "QmFzaWNBdXRoZW50aWNhdG9y";
+    public static readonly IDENTIFIER_FIRST_AUTHENTICATOR_ID: string = "SWRlbnRpZmllckV4ZWN1dG9y";
+    public static readonly JWT_BASIC_AUTHENTICATOR_ID: string = "SldUQmFzaWNBdXRoZW50aWNhdG9y";
+    public static readonly FIDO_AUTHENTICATOR_ID: string = "RklET0F1dGhlbnRpY2F0b3I";
+    public static readonly SMS_OTP_AUTHENTICATOR_ID: string = authenticatorConfig?.overriddenAuthenticatorIds?.
+        SMS_OTP_AUTHENTICATOR_ID ?? "U01TT1RQ";
+
+    public static readonly TOTP_AUTHENTICATOR_ID: string = "dG90cA";
+    public static readonly ACTIVE_SESSION_LIMIT_HANDLER_AUTHENTICATOR_ID: string = "U2Vzc2lvbkV4ZWN1dG9y";
+    public static readonly X509_CERTIFICATE_AUTHENTICATOR_ID: string = "eDUwOUNlcnRpZmljYXRlQXV0aGVudGljYXRvcg";
+    public static readonly EMAIL_OTP_AUTHENTICATOR_ID: string = "ZW1haWwtb3RwLWF1dGhlbnRpY2F0b3I";
+    public static readonly LEGACY_EMAIL_OTP_AUTHENTICATOR_ID: string = "RW1haWxPVFA";
+    public static readonly BACKUP_CODE_AUTHENTICATOR_ID: string = "YmFja3VwLWNvZGUtYXV0aGVudGljYXRvcg";
+    public static readonly MAGIC_LINK_AUTHENTICATOR_ID: string = "TWFnaWNMaW5rQXV0aGVudGljYXRvcg";
+
+    // Known Social/Enterprise authenticator IDs.
+    public static readonly GOOGLE_OIDC_AUTHENTICATOR_ID: string = "R29vZ2xlT0lEQ0F1dGhlbnRpY2F0b3I";
+    public static readonly FACEBOOK_AUTHENTICATOR_ID: string = "RmFjZWJvb2tBdXRoZW50aWNhdG9y";
+    public static readonly TWITTER_AUTHENTICATOR_ID: string = "VHdpdHRlckF1dGhlbnRpY2F0b3I";
+    public static readonly GITHUB_AUTHENTICATOR_ID: string = "R2l0aHViQXV0aGVudGljYXRvcg";
+    public static readonly MICROSOFT_AUTHENTICATOR_ID: string = "T3BlbklEQ29ubmVjdEF1dGhlbnRpY2F0b3I";
+    public static readonly HYPR_AUTHENTICATOR_ID: string = "SFlQUkF1dGhlbnRpY2F0b3I";
+    public static readonly IPROOV_AUTHENTICATOR_ID: string = "SXByb292QXV0aGVudGljYXRvcg";
+
+    // Known IS Predefined/Protocols authenticator IDs
+    public static readonly SAML_AUTHENTICATOR_NAME: string = "SAMLSSOAuthenticator";
+    public static readonly OIDC_AUTHENTICATOR_NAME: string = "OpenIDConnectAuthenticator";
+
+    // Known Social/Enterprise authenticator names;
+    public static readonly GOOGLE_OIDC_AUTHENTICATOR_NAME: string = "GoogleOIDCAuthenticator";
+    public static readonly FACEBOOK_AUTHENTICATOR_NAME: string = "FacebookAuthenticator";
+    public static readonly GITHUB_AUTHENTICATOR_NAME: string = "GithubAuthenticator";
+    public static readonly TWITTER_AUTHENTICATOR_NAME: string = "TwitterAuthenticator";
+    public static readonly MICROSOFT_AUTHENTICATOR_NAME: string = "MicrosoftAuthenticator";
+    public static readonly APPLE_AUTHENTICATOR_NAME: string = "AppleOIDCAuthenticator";
+
+    // Known Social authenticator display names;
+    public static readonly GOOGLE_OIDC_AUTHENTICATOR_DISPLAY_NAME: string = "Google";
+    public static readonly FACEBOOK_AUTHENTICATOR_DISPLAY_NAME: string = "Facebook";
+    public static readonly GITHUB_AUTHENTICATOR_DISPLAY_NAME: string = "GitHub";
+    public static readonly MICROSOFT_AUTHENTICATOR_DISPLAY_NAME: string = "Microsoft";
+    public static readonly APPLE_AUTHENTICATOR_DISPLAY_NAME: string = "Apple";
+
+    // Keys for the initial values of Email OTP Authenticator
+    public static readonly AUTHENTICATOR_INIT_VALUES_EMAIL_OTP_EXPIRY_TIME_KEY: string = "EmailOTP_ExpiryTime";
+
+    // Keys for the initial values of SMS OTP Authenticator
+    public static readonly AUTHENTICATOR_INIT_VALUES_SMS_OTP_EXPIRY_TIME_KEY: string = "SmsOTP_ExpiryTime";
+
+    /**
+     * Name of the FIDO connector configuration.
+     */
+    public static readonly FIDO_CONNECTOR_CONFIG_NAME: string = "fido-connector";
+
+    /**
+     * Attribute key for the trusted origins in the FIDO connector configuration.
+     */
+    public static readonly FIDO_TRUSTED_ORIGINS_ATTRIBUTE_KEY: string = "FIDO2TrustedOrigins";
+}
diff --git a/features/admin.identity-providers.v1/models/endpoints.ts b/features/admin.identity-providers.v1/models/endpoints.ts
index f33ff81bd3d..01dbb5ad9ff 100644
--- a/features/admin.identity-providers.v1/models/endpoints.ts
+++ b/features/admin.identity-providers.v1/models/endpoints.ts
@@ -26,5 +26,4 @@ export interface IDPResourceEndpointsInterface {
     localAuthenticators: string;
     multiFactorAuthenticators: string;
     fidoConfigs: string;
-    fidoTrustedApps: string;
 }
diff --git a/features/admin.identity-providers.v1/models/identity-provider.ts b/features/admin.identity-providers.v1/models/identity-provider.ts
index 5bb5ae7c1ec..892d0a69938 100644
--- a/features/admin.identity-providers.v1/models/identity-provider.ts
+++ b/features/admin.identity-providers.v1/models/identity-provider.ts
@@ -839,66 +839,3 @@ export interface FIDOConfigsInterface extends FIDOConnectorConfigsInterface{
     name: string;
 }
 
-/**
- * Interface for FIDO trusted apps.
- */
-export interface FIDOTrustedAppsValuesInterface {
-    /**
-     * List of FIDO Trusted Android Apps.
-     */
-    android: FIDOTrustedAppTypeInterface;
-    /**
-     * List of FIDO Trusted IOS Apps.
-     */
-    ios: FIDOTrustedAppTypeInterface
-}
-
-/**
- * Interface for FIDO trusted app type.
- */
-export interface FIDOTrustedAppTypeInterface {
-    /**
-     * App names with their corresponding SHA values.
-     */
-    [appName: string]: string[]
-}
-
-/**
- * Interface for FIDO trusted apps response.
- */
-export interface FIDOTrustedAppsResponseInterface {
-    /**
-     * List of FIDO Trusted Android Apps.
-     */
-    android: string[];
-    /**
-     * List of FIDO Trusted IOS Apps.
-     */
-    ios: string[]
-}
-
-/**
- * Types of FIDO trusted apps.
- */
-export enum FIDOTrustedAppTypes {
-    ANDROID = "android",
-    IOS = "ios"
-}
-
-/**
- * FIDO trusted apps list interface.
- */
-export interface FIDOTrustedAppsListInterface {
-    /**
-     * Name of the trusted app.
-     */
-    appName: string;
-    /**
-     * Type of the trusted app.
-     */
-    appType: FIDOTrustedAppTypes;
-    /**
-     * SHA values associated with the current app.
-     */
-    shaValues?: string[];
-}
diff --git a/modules/i18n/src/models/namespaces/authentication-provider-ns.ts b/modules/i18n/src/models/namespaces/authentication-provider-ns.ts
index fb8a8ca7f28..adf005a40d1 100644
--- a/modules/i18n/src/models/namespaces/authentication-provider-ns.ts
+++ b/modules/i18n/src/models/namespaces/authentication-provider-ns.ts
@@ -358,68 +358,6 @@ export interface AuthenticationProviderNS {
                         invalid: string;
                     };
                 };
-                trustedApps: {
-                    heading: string;
-                    subHeading: string;
-                    removeTrustedAppPopOver: string;
-                    buttons: {
-                        addButton: string;
-                        emptySearchButton: string;
-                    };
-                    search: string;
-                    placeHolderTexts: {
-                        emptyText: string;
-                        errorText: {
-                            subtitles: {
-                                0: string;
-                                1: string;
-                            };
-                            title: string;
-                        };
-                        emptySearch: {
-                            title: string;
-                            subTitle: {
-                                0: string;
-                                1: string;
-                            };
-                        };
-                    };
-                    types: {
-                        android: string;
-                        ios: string;
-                    };
-                    wizard: {
-                        title: string;
-                        subTitle: string;
-                        fields: {
-                            appName: {
-                                label: string;
-                                placeholder: string;
-                                validations: {
-                                    required: string;
-                                    duplicate: string;
-                                }
-                            };
-                            appType: {
-                                label: string;
-                            };
-                        };
-                        buttons: {
-                            finish: string;
-                            cancel: string;
-                        };
-                    };
-                },
-                trustedAppSHAValues: {
-                    hint: string;
-                    label: string;
-                    add: string;
-                    placeholder: string;
-                    validations: {
-                        invalid: string;
-                        duplicate: string;
-                    };
-                };
             };
             facebook: {
                 callbackUrl: {
@@ -1499,16 +1437,6 @@ export interface AuthenticationProviderNS {
                 description: string;
             };
         };
-        getFIDOTrustedApps: {
-            error: {
-                message: string;
-                description: string;
-            };
-            genericError: {
-                message: string;
-                description: string;
-            };
-        };
         getIDP: {
             error: {
                 message: string;
@@ -1821,20 +1749,6 @@ export interface AuthenticationProviderNS {
                 description: string;
             };
         };
-        updateFIDOTrustedApps: {
-            error: {
-                message: string;
-                description: string;
-            };
-            genericError: {
-                message: string;
-                description: string;
-            };
-            success: {
-                message: string;
-                description: string;
-            };
-        };
         updateSMSOTPAuthenticator: {
             error: {
                 message: string;
diff --git a/modules/i18n/src/translations/en-US/portals/authentication-provider.ts b/modules/i18n/src/translations/en-US/portals/authentication-provider.ts
index 7d3332894e7..69d1b79a870 100644
--- a/modules/i18n/src/translations/en-US/portals/authentication-provider.ts
+++ b/modules/i18n/src/translations/en-US/portals/authentication-provider.ts
@@ -402,68 +402,6 @@ export const authenticationProvider:AuthenticationProviderNS = {
                     validations: {
                         invalid: "The entered trusted origin is invalid."
                     }
-                },
-                trustedApps: {
-                    heading: "Passkey Trusted Apps",
-                    subHeading: "Apps from which FIDO-based authentication requests are initiated and need to be trusted by the server.",
-                    removeTrustedAppPopOver: "Remove the Trusted App",
-                    buttons: {
-                        addButton: "App",
-                        emptySearchButton: "View all API resources"
-                    },
-                    search: "Search apps by package name or app ID",
-                    placeHolderTexts: {
-                        emptyText: "There are no added Passkey Trusted Apps",
-                        errorText: {
-                            subtitles: {
-                                0: "An error occurred while retrieving the trusted apps.",
-                                1: "Please try again."
-                            },
-                            title: "Something went wrong"
-                        },
-                        emptySearch: {
-                            title: "No results found",
-                            subTitle: {
-                                0: "We couldn't find the trusted apps you searched for.",
-                                1: "Please try using a different parameter."
-                            }
-                        }
-                    },
-                    types: {
-                        android: "Android",
-                        ios: "iOS"
-                    },
-                    wizard: {
-                        title: "New Passkey Trusted App",
-                        subTitle: "Add a new Android or iOS app as a passkey trusted app.",
-                        fields: {
-                            appName: {
-                                label: "App Package Name or App ID",
-                                placeholder: "Enter the package name or ID of the application",
-                                validations: {
-                                    required: "App package name or app ID is required",
-                                    duplicate: "This trusted app is already added"
-                                }
-                            },
-                            appType: {
-                                label: "Application Type"
-                            }
-                        },
-                        buttons: {
-                            finish: "Finish",
-                            cancel: "Cancel"
-                        }
-                    }
-                },
-                trustedAppSHAValues: {
-                    hint: "The SHA256 fingerprints related to the signing certificate of your application.",
-                    label: "Key Hashes",
-                    add: "Add Key Hash",
-                    placeholder: "D4:B9:A3:...",
-                    validations: {
-                        invalid: "The entered SHA256 fingerprint is invalid.",
-                        duplicate: "This key hash is already added"
-                    }
                 }
             },
             github: {
@@ -1342,16 +1280,6 @@ export const authenticationProvider:AuthenticationProviderNS = {
                 message: "Retrieval Error"
             }
         },
-        getFIDOTrustedApps: {
-            error: {
-                description: "{{ description }}",
-                message: "Retrieval Error"
-            },
-            genericError: {
-                description: "An error occurred while retrieving Passkey trusted apps.",
-                message: "Retrieval Error"
-            }
-        },
         getIDP: {
             error: {
                 description: "{{ description }}",
@@ -1534,20 +1462,6 @@ export const authenticationProvider:AuthenticationProviderNS = {
                 message: "Update successful"
             }
         },
-        updateFIDOTrustedApps: {
-            error: {
-                description: "{{ description }}",
-                message: "Update error"
-            },
-            genericError: {
-                description: "An error occurred while updating Passkey Trusted Apps.",
-                message: "Update error"
-            },
-            success: {
-                description: "Successfully updated the Passkey Trusted Apps.",
-                message: "Update successful"
-            }
-        },
         updateFederatedAuthenticator: {
             error: {
                 description: "{{ description }}",