diff --git a/.changeset/unlucky-onions-reply.md b/.changeset/unlucky-onions-reply.md
index eb39f733236..b369495d00b 100644
--- a/.changeset/unlucky-onions-reply.md
+++ b/.changeset/unlucky-onions-reply.md
@@ -1,5 +1,6 @@
 ---
 "@wso2is/console": patch
+"@wso2is/myaccount": patch
 "@wso2is/identity-apps-core": patch
 "@wso2is/i18n": patch
 ---
diff --git a/apps/console/src/features/roles/components/role-list-updated.tsx b/apps/console/src/features/roles/components/role-list-updated.tsx
index 8b180f9819e..5729adc969c 100644
--- a/apps/console/src/features/roles/components/role-list-updated.tsx
+++ b/apps/console/src/features/roles/components/role-list-updated.tsx
@@ -40,13 +40,11 @@ import React, { ReactElement, ReactNode, SyntheticEvent, useState } from "react"
 import { useTranslation } from "react-i18next";
 import { useSelector } from "react-redux";
 import { Header, Icon, Label, SemanticICONS } from "semantic-ui-react";
-import {
-    AppConstants,
-    AppState,
-    FeatureConfigInterface,
-    getEmptyPlaceholderIllustrations,
-    history
-} from "../../core";
+import { getEmptyPlaceholderIllustrations } from "../../core/configs/ui";
+import { AppConstants } from "../../core/constants/app-constants";
+import { history } from "../../core/helpers/history";
+import { FeatureConfigInterface } from "../../core/models/config";
+import { AppState } from "../../core/store/index";
 import { RoleAudiences } from "../models";
 
 interface RoleListProps extends LoadableComponentInterface, IdentifiableComponentInterface {
diff --git a/apps/console/src/features/roles/constants/role-constants.ts b/apps/console/src/features/roles/constants/role-constants.ts
index 1f5f4357a78..3445f07e55c 100644
--- a/apps/console/src/features/roles/constants/role-constants.ts
+++ b/apps/console/src/features/roles/constants/role-constants.ts
@@ -76,7 +76,7 @@ export class RoleConstants {
     ];
 
     /**
-     * filter query for audience type application.
+     * Filter query for audience type application.
      */
     public static readonly ROLE_AUDIENCE_APPLICATION_FILTER: string = "audience.type eq application";
 
diff --git a/apps/console/src/features/roles/pages/role-updated.tsx b/apps/console/src/features/roles/pages/role-updated.tsx
index 04cd29b5bbf..6fd30b71f6c 100644
--- a/apps/console/src/features/roles/pages/role-updated.tsx
+++ b/apps/console/src/features/roles/pages/role-updated.tsx
@@ -15,6 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import { AccessControlConstants, Show } from "@wso2is/access-control";
 import { AlertInterface, AlertLevels, IdentifiableComponentInterface, RolesInterface } from "@wso2is/core/models";
 import { addAlert } from "@wso2is/core/store";
@@ -93,7 +94,7 @@ const RolesPage: FunctionComponent<RolesPagePropsInterface> = (
      */
     useEffect(() => {
         if (rolesListError) {
-            dispatch(addAlert<AlertInterface>({
+            handleAlerts(addAlert<AlertInterface>({
                 description: t("console:manage.features.roles.notifications.fetchRoles.genericError.description"),
                 level: AlertLevels.ERROR,
                 message: t("console:manage.features.roles.notifications.fetchRoles.genericError.message")
@@ -204,7 +205,7 @@ const RolesPage: FunctionComponent<RolesPagePropsInterface> = (
                                         value: "displayName"
                                     },
                                     {
-                                        key: 0,
+                                        key: 1,
                                         text: t("console:manage.features.roles.list.filterAttirbutes.audience"),
                                         value: "audience.type"
                                     }