diff --git a/plugins/rbac/dev/index.tsx b/plugins/rbac/dev/index.tsx
index 5318d901f5..dc9acc00af 100644
--- a/plugins/rbac/dev/index.tsx
+++ b/plugins/rbac/dev/index.tsx
@@ -12,18 +12,21 @@ import {
 import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
 
 import {
+  PermissionAction,
   PermissionPolicy,
   Role,
   RoleBasedPolicy,
+  RoleConditionalPolicyDecision,
 } from '@janus-idp/backstage-plugin-rbac-common';
 
 import { mockConditionRules } from '../src/__fixtures__/mockConditionRules';
+import { mockConditions } from '../src/__fixtures__/mockConditions';
 import { mockMembers } from '../src/__fixtures__/mockMembers';
 import { mockPermissionPolicies } from '../src/__fixtures__/mockPermissionPolicies';
 import { mockPolicies } from '../src/__fixtures__/mockPolicies';
 import { RBACAPI, rbacApiRef } from '../src/api/RBACBackendClient';
 import { RbacPage, rbacPlugin } from '../src/plugin';
-import { MemberEntity, RoleBasedConditions } from '../src/types';
+import { MemberEntity, RoleBasedConditions, RoleError } from '../src/types';
 
 class MockRBACApi implements RBACAPI {
   readonly resources;
@@ -111,6 +114,25 @@ class MockRBACApi implements RBACAPI {
   ): Promise<Response> {
     return { status: 200 } as Response;
   }
+
+  async getRoleConditions(
+    roleRef: string,
+  ): Promise<RoleConditionalPolicyDecision<PermissionAction>[] | Response> {
+    return mockConditions.filter(mc => mc.roleEntityRef === roleRef);
+  }
+
+  async updateConditionalPolicies(
+    _conditionId: number,
+    _data: RoleBasedConditions,
+  ): Promise<RoleError | Response> {
+    return { status: 200 } as Response;
+  }
+
+  async deleteConditionalPolicies(
+    _conditionId: number,
+  ): Promise<RoleError | Response> {
+    return { status: 204 } as Response;
+  }
 }
 
 const mockPermissionApi = new MockPermissionApi();
diff --git a/plugins/rbac/src/__fixtures__/mockConditions.ts b/plugins/rbac/src/__fixtures__/mockConditions.ts
new file mode 100644
index 0000000000..604c135135
--- /dev/null
+++ b/plugins/rbac/src/__fixtures__/mockConditions.ts
@@ -0,0 +1,45 @@
+import { AuthorizeResult } from '@backstage/plugin-permission-common';
+
+import {
+  PermissionAction,
+  RoleConditionalPolicyDecision,
+} from '@janus-idp/backstage-plugin-rbac-common';
+
+export const mockConditions: RoleConditionalPolicyDecision<PermissionAction>[] =
+  [
+    {
+      id: 1,
+      result: AuthorizeResult.CONDITIONAL,
+      pluginId: 'catalog',
+      resourceType: 'catalog-entity',
+      conditions: {
+        rule: 'HAS_ANNOTATION',
+        resourceType: 'catalog-entity',
+        params: { annotation: 'temp' },
+      },
+      roleEntityRef: 'role:default/rbac_admin',
+      permissionMapping: ['read'],
+    },
+    {
+      id: 2,
+      result: AuthorizeResult.CONDITIONAL,
+      pluginId: 'catalog',
+      resourceType: 'catalog-entity',
+      conditions: {
+        allOf: [
+          {
+            rule: 'HAS_LABEL',
+            resourceType: 'catalog-entity',
+            params: { label: 'temp' },
+          },
+          {
+            rule: 'HAS_METADATA',
+            resourceType: 'catalog-entity',
+            params: { key: 'status' },
+          },
+        ],
+      },
+      roleEntityRef: 'role:default/rbac_admin',
+      permissionMapping: ['delete', 'update'],
+    },
+  ];
diff --git a/plugins/rbac/src/__fixtures__/mockFormValues.tsx b/plugins/rbac/src/__fixtures__/mockFormValues.tsx
new file mode 100644
index 0000000000..85569901da
--- /dev/null
+++ b/plugins/rbac/src/__fixtures__/mockFormValues.tsx
@@ -0,0 +1,48 @@
+export const mockFormCurrentValues = {
+  kind: 'user',
+  name: 'div',
+  namespace: 'default',
+  selectedMembers: [],
+  permissionPoliciesRows: [
+    {
+      permission: 'catalog-entity',
+      policies: [{ policy: 'read', effect: 'allow' }],
+      isResourced: true,
+      plugin: 'catalog',
+      conditions: {
+        condition: {
+          rule: 'HAS_LABEL',
+          params: {
+            label: 'temp',
+          },
+          resourceType: 'catalog-entity',
+        },
+      },
+    },
+  ],
+};
+
+export const mockFormInitialValues = {
+  kind: 'user',
+  name: 'div',
+  namespace: 'default',
+  selectedMembers: [],
+  permissionPoliciesRows: [
+    {
+      id: 1,
+      permission: 'catalog-entity',
+      policies: [{ policy: 'read', effect: 'allow' }],
+      isResourced: true,
+      plugin: 'catalog',
+      conditions: {
+        condition: {
+          rule: 'HAS_LABEL',
+          params: {
+            label: 'temp',
+          },
+          resourceType: 'catalog-entity',
+        },
+      },
+    },
+  ],
+};
diff --git a/plugins/rbac/src/api/RBACBackendClient.ts b/plugins/rbac/src/api/RBACBackendClient.ts
index 55d9055a6e..7fb7a2e451 100644
--- a/plugins/rbac/src/api/RBACBackendClient.ts
+++ b/plugins/rbac/src/api/RBACBackendClient.ts
@@ -5,9 +5,11 @@ import {
 } from '@backstage/core-plugin-api';
 
 import {
+  PermissionAction,
   PermissionPolicy,
   Role,
   RoleBasedPolicy,
+  RoleConditionalPolicyDecision,
 } from '@janus-idp/backstage-plugin-rbac-common';
 
 import {
@@ -46,6 +48,16 @@ export type RBACAPI = {
   createConditionalPermission: (
     conditionalPermission: RoleBasedConditions,
   ) => Promise<RoleError | Response>;
+  getRoleConditions: (
+    roleRef: string,
+  ) => Promise<RoleConditionalPolicyDecision<PermissionAction>[] | Response>;
+  updateConditionalPolicies: (
+    conditionId: number,
+    data: RoleBasedConditions,
+  ) => Promise<RoleError | Response>;
+  deleteConditionalPolicies: (
+    conditionId: number,
+  ) => Promise<RoleError | Response>;
 };
 
 export type Options = {
@@ -362,4 +374,71 @@ export class RBACBackendClient implements RBACAPI {
     }
     return jsonResponse;
   }
+
+  async getRoleConditions(roleRef: string) {
+    const { token: idToken } = await this.identityApi.getCredentials();
+    const backendUrl = this.configApi.getString('backend.baseUrl');
+    const jsonResponse = await fetch(
+      `${backendUrl}/api/permission/roles/conditions?roleEntityRef=${roleRef}`,
+      {
+        headers: {
+          ...(idToken && { Authorization: `Bearer ${idToken}` }),
+          'Content-Type': 'application/json',
+        },
+      },
+    );
+    if (jsonResponse.status !== 200) {
+      return jsonResponse;
+    }
+    return jsonResponse.json();
+  }
+
+  async updateConditionalPolicies(
+    conditionId: number,
+    data: RoleBasedConditions,
+  ) {
+    const { token: idToken } = await this.identityApi.getCredentials();
+    const backendUrl = this.configApi.getString('backend.baseUrl');
+    const jsonResponse = await fetch(
+      `${backendUrl}/api/permission/roles/conditions/${conditionId}}`,
+      {
+        method: 'PUT',
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+          ...(idToken && { Authorization: `Bearer ${idToken}` }),
+        },
+        body: JSON.stringify(data),
+      },
+    );
+    if (jsonResponse.status !== 200 && jsonResponse.status !== 201) {
+      return jsonResponse.json();
+    }
+    return jsonResponse;
+  }
+
+  async deleteConditionalPolicies(conditionId: number) {
+    const { token: idToken } = await this.identityApi.getCredentials();
+    const backendUrl = this.configApi.getString('backend.baseUrl');
+    const jsonResponse = await fetch(
+      `${backendUrl}/api/permission/roles/conditions/${conditionId}`,
+      {
+        headers: {
+          ...(idToken && { Authorization: `Bearer ${idToken}` }),
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+        },
+        method: 'DELETE',
+      },
+    );
+
+    if (
+      jsonResponse.status !== 200 &&
+      jsonResponse.status !== 201 &&
+      jsonResponse.status !== 204
+    ) {
+      return jsonResponse.json();
+    }
+    return jsonResponse;
+  }
 }
diff --git a/plugins/rbac/src/components/ConditionalAccess/ConditionalAccessSidebar.tsx b/plugins/rbac/src/components/ConditionalAccess/ConditionalAccessSidebar.tsx
index c3c91f9dd4..b29ddcc982 100644
--- a/plugins/rbac/src/components/ConditionalAccess/ConditionalAccessSidebar.tsx
+++ b/plugins/rbac/src/components/ConditionalAccess/ConditionalAccessSidebar.tsx
@@ -43,7 +43,6 @@ type ConditionalAccessSidebarProps = {
   open: boolean;
   onClose: () => void;
   onSave: (conditions: ConditionsData) => void;
-  onRemoveAll: () => void;
   selPluginResourceType: string;
   conditionRulesData?: RulesData;
   conditionsFormVal?: ConditionsData;
@@ -53,7 +52,6 @@ export const ConditionalAccessSidebar = ({
   open,
   onClose,
   onSave,
-  onRemoveAll,
   selPluginResourceType,
   conditionRulesData,
   conditionsFormVal,
@@ -100,7 +98,6 @@ export const ConditionalAccessSidebar = ({
           conditionsFormVal={conditionsFormVal}
           onClose={onClose}
           onSave={onSave}
-          onRemoveAll={onRemoveAll}
         />
       </Box>
     </Drawer>
diff --git a/plugins/rbac/src/components/ConditionalAccess/ConditionsForm.tsx b/plugins/rbac/src/components/ConditionalAccess/ConditionsForm.tsx
index fe0d3bcca1..4e6393bf09 100644
--- a/plugins/rbac/src/components/ConditionalAccess/ConditionsForm.tsx
+++ b/plugins/rbac/src/components/ConditionalAccess/ConditionsForm.tsx
@@ -34,7 +34,6 @@ type ConditionFormProps = {
   selPluginResourceType: string;
   onClose: () => void;
   onSave: (conditions: ConditionsData) => void;
-  onRemoveAll: () => void;
 };
 
 export const ConditionsForm = ({
@@ -43,7 +42,6 @@ export const ConditionsForm = ({
   conditionsFormVal,
   onClose,
   onSave,
-  onRemoveAll,
 }: ConditionFormProps) => {
   const classes = useStyles();
   const [conditions, setConditions] = React.useState<ConditionsData>(
@@ -124,7 +122,6 @@ export const ConditionsForm = ({
                 params: {},
               },
             });
-            onRemoveAll();
           }}
         >
           Remove all
diff --git a/plugins/rbac/src/components/ConditionalAccess/ConditionsFormRow.tsx b/plugins/rbac/src/components/ConditionalAccess/ConditionsFormRow.tsx
index 18b8449820..f297895590 100644
--- a/plugins/rbac/src/components/ConditionalAccess/ConditionsFormRow.tsx
+++ b/plugins/rbac/src/components/ConditionalAccess/ConditionsFormRow.tsx
@@ -30,6 +30,7 @@ const useStyles = makeStyles(theme => ({
   criteriaButton: {
     width: '100%',
     textTransform: 'none',
+    color: theme.palette.grey[700],
   },
   addRuleButton: {
     color: theme.palette.primary.light,
@@ -126,11 +127,7 @@ export const ConditionsFormRow = ({
 
   return (
     <Box className={classes.conditionRow}>
-      <ButtonGroup
-        size="large"
-        className={classes.criteriaButtonGroup}
-        color="info"
-      >
+      <ButtonGroup size="large" className={classes.criteriaButtonGroup}>
         {conditionButtons.map(({ val, label }) => (
           <Button
             variant="outlined"
diff --git a/plugins/rbac/src/components/CreateRole/EditRolePage.test.tsx b/plugins/rbac/src/components/CreateRole/EditRolePage.test.tsx
index 7babba0fae..878764ad61 100644
--- a/plugins/rbac/src/components/CreateRole/EditRolePage.test.tsx
+++ b/plugins/rbac/src/components/CreateRole/EditRolePage.test.tsx
@@ -97,6 +97,7 @@ beforeEach(() => {
   usePermissionPoliciesMock.mockReturnValue({
     loading: false,
     data: usePermissionPoliciesMockData,
+    conditionsData: [],
     retry: { policiesRetry: jest.fn(), permissionPoliciesRetry: jest.fn() },
     error: new Error(''),
   });
diff --git a/plugins/rbac/src/components/CreateRole/EditRolePage.tsx b/plugins/rbac/src/components/CreateRole/EditRolePage.tsx
index eb13532cc5..6db2da4d0c 100644
--- a/plugins/rbac/src/components/CreateRole/EditRolePage.tsx
+++ b/plugins/rbac/src/components/CreateRole/EditRolePage.tsx
@@ -25,7 +25,7 @@ export const EditRolePage = () => {
       roleName ? `${roleKind}:${roleNamespace}/${roleName}` : '',
     );
 
-  const { data: permissionPolicies } = usePermissionPolicies(
+  const { data: permissionPolicies, conditionsData } = usePermissionPolicies(
     `${roleKind}:${roleNamespace}/${roleName}`,
   );
 
@@ -35,7 +35,7 @@ export const EditRolePage = () => {
     kind: roleKind || 'role',
     description: role?.metadata?.description ?? '',
     selectedMembers,
-    permissionPoliciesRows: permissionPolicies,
+    permissionPoliciesRows: [...conditionsData, ...permissionPolicies],
   };
   const renderPage = () => {
     if (loading) {
diff --git a/plugins/rbac/src/components/CreateRole/PermissionPoliciesFormRow.tsx b/plugins/rbac/src/components/CreateRole/PermissionPoliciesFormRow.tsx
index 14a913c6b9..a1c57a874a 100644
--- a/plugins/rbac/src/components/CreateRole/PermissionPoliciesFormRow.tsx
+++ b/plugins/rbac/src/components/CreateRole/PermissionPoliciesFormRow.tsx
@@ -188,6 +188,7 @@ export const PermissionPoliciesFormRow = ({
             className={classes.removeButton}
             onClick={() => onRemove()}
             disabled={rowCount === 1}
+            data-testid={`${rowName}-remove`}
           >
             <RemoveIcon id={`${rowName}-remove`} />
           </IconButton>
@@ -207,7 +208,6 @@ export const PermissionPoliciesFormRow = ({
           onAddConditions(conditions);
           setSidebarOpen(false);
         }}
-        onRemoveAll={() => onAddConditions(undefined)}
         conditionsFormVal={permissionPoliciesRowData.conditions}
         selPluginResourceType={permissionPoliciesRowData.permission}
         conditionRulesData={
diff --git a/plugins/rbac/src/components/CreateRole/RoleForm.tsx b/plugins/rbac/src/components/CreateRole/RoleForm.tsx
index 31d304837d..e4b781f23c 100644
--- a/plugins/rbac/src/components/CreateRole/RoleForm.tsx
+++ b/plugins/rbac/src/components/CreateRole/RoleForm.tsx
@@ -20,8 +20,11 @@ import { rbacApiRef } from '../../api/RBACBackendClient';
 import { MemberEntity, PermissionsData, RoleError } from '../../types';
 import {
   getConditionalPermissionPoliciesData,
+  getNewConditionalPolicies,
   getPermissionPoliciesData,
+  getRemovedConditionalPoliciesIds,
   getRoleData,
+  getUpdatedConditionalPolicies,
   validationSchema,
 } from '../../utils/create-role-utils';
 import {
@@ -82,6 +85,15 @@ export const RoleForm = ({
     try {
       const newData = getRoleData(values);
       const newPermissionsData = getPermissionPoliciesData(values);
+      const newConditions = getNewConditionalPolicies(values);
+      const deleteConditions = getRemovedConditionalPoliciesIds(
+        values,
+        initialValues,
+      );
+      const updateConditions = getUpdatedConditionalPolicies(
+        values,
+        initialValues,
+      );
 
       const oldData = getRoleData(initialValues);
       const res = await rbacApi.updateRole(oldData, newData);
@@ -126,6 +138,56 @@ export const RoleForm = ({
             );
           }
         }
+
+        if (deleteConditions.length > 0) {
+          const promises = deleteConditions.map(cid =>
+            rbacApi.deleteConditionalPolicies(cid),
+          );
+
+          const cppRes: (Response | RoleError)[] = await Promise.all(promises);
+          const cpErr = cppRes
+            .map(r => (r as unknown as RoleError).error?.message)
+            .filter(m => m);
+
+          if (cpErr.length > 0) {
+            throw new Error(
+              `Unable to remove conditions from the role. ${cpErr.join('\n')}`,
+            );
+          }
+        }
+
+        if (newConditions.length > 0) {
+          const promises = newConditions.map(cpp =>
+            rbacApi.createConditionalPermission(cpp),
+          );
+
+          const cppRes: (Response | RoleError)[] = await Promise.all(promises);
+          const cpErr = cppRes
+            .map(r => (r as unknown as RoleError).error?.message)
+            .filter(m => m);
+
+          if (cpErr.length > 0) {
+            throw new Error(
+              `Unable to add conditions to the role. ${cpErr.join('\n')}`,
+            );
+          }
+        }
+
+        if (updateConditions.length > 0) {
+          const promises = updateConditions.map(({ id, updateCondition }) =>
+            rbacApi.updateConditionalPolicies(id, updateCondition),
+          );
+
+          const cppRes: (Response | RoleError)[] = await Promise.all(promises);
+          const cpErr = cppRes
+            .map(r => (r as unknown as RoleError).error?.message)
+            .filter(m => m);
+
+          if (cpErr.length > 0) {
+            throw new Error(`Unable to update conditions. ${cpErr.join('\n')}`);
+          }
+        }
+
         navigateTo(`${name} updated`);
       }
     } catch (e) {
diff --git a/plugins/rbac/src/components/RoleOverview/PermissionsCard.test.tsx b/plugins/rbac/src/components/RoleOverview/PermissionsCard.test.tsx
index bc37bbc855..236b25e810 100644
--- a/plugins/rbac/src/components/RoleOverview/PermissionsCard.test.tsx
+++ b/plugins/rbac/src/components/RoleOverview/PermissionsCard.test.tsx
@@ -50,6 +50,7 @@ describe('PermissionsCard', () => {
     mockPermissionPolicies.mockReturnValue({
       loading: false,
       data: usePermissionPoliciesMockData,
+      conditionsData: [],
       retry: { policiesRetry: jest.fn(), permissionPoliciesRetry: jest.fn() },
       error: new Error(''),
     });
@@ -65,6 +66,7 @@ describe('PermissionsCard', () => {
     mockPermissionPolicies.mockReturnValue({
       loading: false,
       data: [],
+      conditionsData: [],
       retry: { policiesRetry: jest.fn(), permissionPoliciesRetry: jest.fn() },
       error: new Error(''),
     });
@@ -79,6 +81,7 @@ describe('PermissionsCard', () => {
     mockPermissionPolicies.mockReturnValue({
       loading: false,
       data: [],
+      conditionsData: [],
       retry: { policiesRetry: jest.fn(), permissionPoliciesRetry: jest.fn() },
       error: { message: '404', name: 'Not Found' },
     });
@@ -98,6 +101,7 @@ describe('PermissionsCard', () => {
     mockPermissionPolicies.mockReturnValue({
       loading: false,
       data: [],
+      conditionsData: [],
       error: new Error(''),
       retry: { policiesRetry: jest.fn(), permissionPoliciesRetry: jest.fn() },
     });
@@ -112,6 +116,7 @@ describe('PermissionsCard', () => {
     mockPermissionPolicies.mockReturnValue({
       loading: false,
       data: [],
+      conditionsData: [],
       error: new Error(''),
       retry: { policiesRetry: jest.fn(), permissionPoliciesRetry: jest.fn() },
     });
diff --git a/plugins/rbac/src/components/RoleOverview/PermissionsCard.tsx b/plugins/rbac/src/components/RoleOverview/PermissionsCard.tsx
index 0148eaf3c9..5aa51e7b11 100644
--- a/plugins/rbac/src/components/RoleOverview/PermissionsCard.tsx
+++ b/plugins/rbac/src/components/RoleOverview/PermissionsCard.tsx
@@ -81,7 +81,7 @@ export const PermissionsCard = ({ entityReference }: PermissionsCardProps) => {
   return (
     <Card>
       <CardContent>
-        {error?.name && (
+        {error?.name && error.name !== 404 && (
           <div style={{ paddingBottom: '16px' }}>
             <WarningPanel
               message={error?.message}
diff --git a/plugins/rbac/src/components/RolesList/DeleteRoleDialog.test.tsx b/plugins/rbac/src/components/RolesList/DeleteRoleDialog.test.tsx
index 2a1b2aeaf5..7c0438813f 100644
--- a/plugins/rbac/src/components/RolesList/DeleteRoleDialog.test.tsx
+++ b/plugins/rbac/src/components/RolesList/DeleteRoleDialog.test.tsx
@@ -74,6 +74,7 @@ describe('DeleteRoleDialog', () => {
     const useApiMock = useApi as jest.Mock;
     useApiMock.mockReturnValue({
       getAssociatedPolicies: jest.fn(),
+      getRoleConditions: jest.fn(),
       deleteRole: mockDeleteRole,
     });
 
diff --git a/plugins/rbac/src/components/RolesList/DeleteRoleDialog.tsx b/plugins/rbac/src/components/RolesList/DeleteRoleDialog.tsx
index a028a5ca8c..9eb80f7c10 100644
--- a/plugins/rbac/src/components/RolesList/DeleteRoleDialog.tsx
+++ b/plugins/rbac/src/components/RolesList/DeleteRoleDialog.tsx
@@ -69,6 +69,7 @@ const DeleteRoleDialog = ({
   const deleteRole = async () => {
     try {
       const policies = await rbacApi.getAssociatedPolicies(roleName);
+      const conditionalPolicies = await rbacApi.getRoleConditions(roleName);
       if (Array.isArray(policies)) {
         const allowedPolicies = policies.filter(
           (policy: RoleBasedPolicy) => policy.effect !== 'deny',
@@ -89,6 +90,27 @@ const DeleteRoleDialog = ({
         }
       }
 
+      if (
+        Array.isArray(conditionalPolicies) &&
+        conditionalPolicies.length > 0
+      ) {
+        const cleanupPoliciesPromises = conditionalPolicies.map(cp =>
+          rbacApi.deleteConditionalPolicies(cp.id),
+        );
+        const res: (Response | RoleError)[] = await Promise.all(
+          cleanupPoliciesPromises,
+        );
+        const err = res
+          .map(r => (r as unknown as RoleError).error?.message)
+          .filter(m => m);
+        if (err.length > 0) {
+          setError(
+            `Unable to remove conditions from the role. ${err.join('\n')}`,
+          );
+          return;
+        }
+      }
+
       const response = await rbacApi.deleteRole(roleName);
       if (response.status === 200 || response.status === 204) {
         setToastMessage(`Role ${roleName} deleted successfully`);
diff --git a/plugins/rbac/src/hooks/usePermissionPolicies.ts b/plugins/rbac/src/hooks/usePermissionPolicies.ts
index 87660f6dcd..3e2c6ec0d6 100644
--- a/plugins/rbac/src/hooks/usePermissionPolicies.ts
+++ b/plugins/rbac/src/hooks/usePermissionPolicies.ts
@@ -1,10 +1,14 @@
 import React from 'react';
-import { useAsyncRetry, useInterval } from 'react-use';
+import { useAsync, useAsyncRetry, useInterval } from 'react-use';
 
 import { useApi } from '@backstage/core-plugin-api';
 
 import { rbacApiRef } from '../api/RBACBackendClient';
-import { getPermissionsData } from '../utils/rbac-utils';
+import { getPluginsPermissionPoliciesData } from '../utils/create-role-utils';
+import {
+  getConditionalPermissionsData,
+  getPermissionsData,
+} from '../utils/rbac-utils';
 
 const getErrorText = (
   policies: any,
@@ -42,6 +46,10 @@ export const usePermissionPolicies = (
     return await rbacApi.getAssociatedPolicies(entityReference);
   });
 
+  const { value: conditionalPolicies } = useAsync(async () => {
+    return await rbacApi.getRoleConditions(entityReference);
+  });
+
   const {
     value: permissionPolicies,
     error: permissionPoliciesError,
@@ -56,21 +64,39 @@ export const usePermissionPolicies = (
     !policies &&
     !permissionPolicies;
 
+  const allPermissionPolicies = React.useMemo(
+    () => (Array.isArray(permissionPolicies) ? permissionPolicies : []),
+    [permissionPolicies],
+  );
+
   const data = React.useMemo(() => {
-    const pp = Array.isArray(permissionPolicies) ? permissionPolicies : [];
-    return Array.isArray(policies) ? getPermissionsData(policies, pp) : [];
-  }, [policies, permissionPolicies]);
+    return Array.isArray(policies)
+      ? getPermissionsData(policies, allPermissionPolicies)
+      : [];
+  }, [allPermissionPolicies, policies]);
+
+  const conditionsData = React.useMemo(() => {
+    const cpp = Array.isArray(conditionalPolicies) ? conditionalPolicies : [];
+    const pluginsPermissionsPoliciesData =
+      allPermissionPolicies.length > 0
+        ? getPluginsPermissionPoliciesData(allPermissionPolicies)
+        : undefined;
+    return pluginsPermissionsPoliciesData
+      ? getConditionalPermissionsData(cpp, pluginsPermissionsPoliciesData)
+      : [];
+  }, [allPermissionPolicies, conditionalPolicies]);
 
   useInterval(
     () => {
       policiesRetry();
       permissionPoliciesRetry();
     },
-    loading ? null : pollInterval || 10000,
+    loading ? null : pollInterval || null,
   );
   return {
     loading,
     data,
+    conditionsData,
     retry: { policiesRetry, permissionPoliciesRetry },
     error:
       policiesError ||
diff --git a/plugins/rbac/src/types.ts b/plugins/rbac/src/types.ts
index 8c5557348d..094d15336d 100644
--- a/plugins/rbac/src/types.ts
+++ b/plugins/rbac/src/types.ts
@@ -42,6 +42,7 @@ export type PermissionsDataSet = {
 };
 
 export type PermissionsData = {
+  id?: number;
   plugin: string;
   permission: string;
   policies: RowPolicy[];
diff --git a/plugins/rbac/src/utils/create-role-utils.test.ts b/plugins/rbac/src/utils/create-role-utils.test.ts
index 30a85ce772..93ff0f2cc4 100644
--- a/plugins/rbac/src/utils/create-role-utils.test.ts
+++ b/plugins/rbac/src/utils/create-role-utils.test.ts
@@ -1,13 +1,21 @@
+import {
+  mockFormCurrentValues,
+  mockFormInitialValues,
+} from '../__fixtures__/mockFormValues';
 import { mockMembers } from '../__fixtures__/mockMembers';
 import { mockPermissionPolicies } from '../__fixtures__/mockPermissionPolicies';
 import {
   getChildGroupsCount,
+  getConditionalPermissionPoliciesData,
   getMembersCount,
+  getNewConditionalPolicies,
   getParentGroupsCount,
   getPermissionPolicies,
   getPermissionPoliciesData,
   getPluginsPermissionPoliciesData,
+  getRemovedConditionalPoliciesIds,
   getRoleData,
+  getUpdatedConditionalPolicies,
 } from './create-role-utils';
 
 describe('getRoleData', () => {
@@ -346,3 +354,210 @@ describe('getPermissionPoliciesData', () => {
     ]);
   });
 });
+
+describe('getConditionalPermissionPoliciesData', () => {
+  it('should return conditional permission policies data correctly', () => {
+    const values = mockFormCurrentValues;
+
+    const result = getConditionalPermissionPoliciesData(values);
+
+    expect(result).toEqual([
+      {
+        result: 'CONDITIONAL',
+        roleEntityRef: 'user:default/div',
+        pluginId: 'catalog',
+        resourceType: 'catalog-entity',
+        permissionMapping: ['read'],
+        conditions: {
+          rule: 'HAS_LABEL',
+          params: {
+            label: 'temp',
+          },
+          resourceType: 'catalog-entity',
+        },
+      },
+    ]);
+  });
+
+  it('should return empty array if permissionPoliciesRows is empty', () => {
+    const values = {
+      kind: 'user',
+      name: 'div',
+      namespace: 'default',
+      selectedMembers: [],
+      permissionPoliciesRows: [],
+    };
+
+    const result = getConditionalPermissionPoliciesData(values);
+
+    expect(result).toEqual([]);
+  });
+});
+
+describe('getUpdatedConditionalPolicies', () => {
+  it('should return updated conditional policies correctly', () => {
+    const values = {
+      kind: 'user',
+      name: 'div',
+      namespace: 'default',
+      selectedMembers: [],
+      permissionPoliciesRows: [
+        {
+          id: 1,
+          permission: 'catalog-entity',
+          policies: [{ policy: 'update', effect: 'allow' }],
+          isResourced: true,
+          plugin: 'catalog',
+          conditions: {
+            allOf: [
+              {
+                rule: 'HAS_LABEL',
+                params: {
+                  label: 'temp',
+                },
+                resourceType: 'catalog-entity',
+              },
+              {
+                rule: 'HAS_SPEC',
+                params: {
+                  label: 'test',
+                },
+                resourceType: 'catalog-entity',
+              },
+            ],
+          },
+        },
+      ],
+    };
+
+    const initialValues = mockFormInitialValues;
+
+    const result = getUpdatedConditionalPolicies(values, initialValues);
+
+    expect(result).toEqual([
+      {
+        id: 1,
+        updateCondition: {
+          result: 'CONDITIONAL',
+          roleEntityRef: 'user:default/div',
+          pluginId: 'catalog',
+          resourceType: 'catalog-entity',
+          permissionMapping: ['update'],
+          conditions: {
+            allOf: [
+              {
+                rule: 'HAS_LABEL',
+                params: {
+                  label: 'temp',
+                },
+                resourceType: 'catalog-entity',
+              },
+              {
+                rule: 'HAS_SPEC',
+                params: {
+                  label: 'test',
+                },
+                resourceType: 'catalog-entity',
+              },
+            ],
+          },
+        },
+      },
+    ]);
+  });
+
+  it('should return empty array if values.permissionPoliciesRows is empty', () => {
+    const values = {
+      kind: 'user',
+      name: 'div',
+      namespace: 'default',
+      selectedMembers: [],
+      permissionPoliciesRows: [],
+    };
+
+    const initialValues = mockFormInitialValues;
+
+    const result = getUpdatedConditionalPolicies(values, initialValues);
+
+    expect(result).toEqual([]);
+  });
+});
+
+describe('getNewConditionalPolicies', () => {
+  it('should return new conditional policies correctly', () => {
+    const values = mockFormCurrentValues;
+
+    const result = getNewConditionalPolicies(values);
+
+    expect(result).toEqual([
+      {
+        result: 'CONDITIONAL',
+        roleEntityRef: 'user:default/div',
+        pluginId: 'catalog',
+        resourceType: 'catalog-entity',
+        permissionMapping: ['read'],
+        conditions: {
+          rule: 'HAS_LABEL',
+          params: {
+            label: 'temp',
+          },
+          resourceType: 'catalog-entity',
+        },
+      },
+    ]);
+  });
+
+  it('should return empty array if values.permissionPoliciesRows is empty', () => {
+    const values = {
+      kind: 'user',
+      name: 'div',
+      namespace: 'default',
+      selectedMembers: [],
+      permissionPoliciesRows: [],
+    };
+
+    const result = getNewConditionalPolicies(values);
+
+    expect(result).toEqual([]);
+  });
+});
+
+describe('getRemovedConditionalPoliciesIds', () => {
+  it('should return removed conditional policies IDs correctly', () => {
+    const values = {
+      kind: 'user',
+      name: 'div',
+      namespace: 'default',
+      selectedMembers: [],
+      permissionPoliciesRows: [],
+    };
+
+    const initialValues = mockFormInitialValues;
+
+    const result = getRemovedConditionalPoliciesIds(values, initialValues);
+
+    expect(result).toEqual([1]);
+  });
+
+  it('should return empty array if both values.permissionPoliciesRows and initialValues.permissionPoliciesRows are empty', () => {
+    const values = {
+      kind: 'user',
+      name: 'div',
+      namespace: 'default',
+      selectedMembers: [],
+      permissionPoliciesRows: [],
+    };
+
+    const initialValues = {
+      kind: 'user',
+      name: 'div',
+      namespace: 'default',
+      selectedMembers: [],
+      permissionPoliciesRows: [],
+    };
+
+    const result = getRemovedConditionalPoliciesIds(values, initialValues);
+
+    expect(result).toEqual([]);
+  });
+});
diff --git a/plugins/rbac/src/utils/create-role-utils.ts b/plugins/rbac/src/utils/create-role-utils.ts
index eae60bc9a1..2c0130e9e0 100644
--- a/plugins/rbac/src/utils/create-role-utils.ts
+++ b/plugins/rbac/src/utils/create-role-utils.ts
@@ -202,6 +202,74 @@ export const getConditionalPermissionPoliciesData = (
   );
 };
 
+export const getUpdatedConditionalPolicies = (
+  values: RoleFormValues,
+  initialValues: RoleFormValues,
+) => {
+  const initialConditionsWithId = initialValues.permissionPoliciesRows.filter(
+    ppr => ppr.id,
+  );
+
+  const conditionsWithId = values.permissionPoliciesRows.filter(ppr => ppr.id);
+
+  return conditionsWithId.length > 0
+    ? conditionsWithId.reduce(
+        (
+          acc: { id: number; updateCondition: RoleBasedConditions }[],
+          condition: PermissionsData,
+        ) => {
+          const conditionExists = initialConditionsWithId.find(
+            c => c.id === condition.id,
+          );
+
+          if (conditionExists && condition.id)
+            return [
+              ...acc,
+              {
+                id: condition.id,
+                updateCondition: getConditionalPermissionPoliciesData({
+                  ...values,
+                  permissionPoliciesRows: [condition],
+                })[0],
+              },
+            ];
+          return acc;
+        },
+        [],
+      )
+    : [];
+};
+
+export const getNewConditionalPolicies = (values: RoleFormValues) => {
+  const newValues = { ...values };
+  const newPermissionPolicies = values.permissionPoliciesRows.filter(
+    ppr => !ppr.id,
+  );
+  newValues.permissionPoliciesRows = newPermissionPolicies;
+  return getConditionalPermissionPoliciesData(newValues);
+};
+
+export const getRemovedConditionalPoliciesIds = (
+  values: RoleFormValues,
+  initialValues: RoleFormValues,
+) => {
+  const initialConditionsIds = initialValues.permissionPoliciesRows
+    .map(ppr => ppr.id)
+    .filter(id => id);
+
+  const newConditionsIds = values.permissionPoliciesRows
+    .map(ppr => ppr.id)
+    .filter(id => id);
+
+  return initialConditionsIds.length > 0
+    ? initialConditionsIds.reduce((acc: number[], oldId) => {
+        const conditionExists = newConditionsIds.includes(oldId);
+        if (conditionExists) return acc;
+        return oldId ? [...acc, oldId] : acc;
+      }, [])
+    : [];
+};
+
 export const getPermissionsNumber = (values: RoleFormValues) => {
   return getPermissionPoliciesData(values).length;
 };
diff --git a/plugins/rbac/src/utils/rbac-utils.test.ts b/plugins/rbac/src/utils/rbac-utils.test.ts
index 294e11f06d..a080bbb416 100644
--- a/plugins/rbac/src/utils/rbac-utils.test.ts
+++ b/plugins/rbac/src/utils/rbac-utils.test.ts
@@ -1,13 +1,28 @@
 import { GroupEntity } from '@backstage/catalog-model';
+import {
+  AllOfCriteria,
+  AuthorizeResult,
+  PermissionCondition,
+} from '@backstage/plugin-permission-common';
+
+import {
+  PermissionAction,
+  RoleConditionalPolicyDecision,
+} from '@janus-idp/backstage-plugin-rbac-common';
 
+import { mockConditions } from '../__fixtures__/mockConditions';
 import { mockPermissionPolicies } from '../__fixtures__/mockPermissionPolicies';
 import {
+  getConditionalPermissionsData,
+  getConditionsData,
+  getConditionUpperCriteria,
   getKindNamespaceName,
   getMembers,
   getMembersFromGroup,
   getPermissions,
   getPermissionsData,
   getPluginId,
+  getPoliciesData,
 } from './rbac-utils';
 
 const mockPolicies = [
@@ -221,3 +236,214 @@ describe('rbac utils', () => {
     });
   });
 });
+
+describe('getConditionUpperCriteria', () => {
+  it('should return the upper criteria', () => {
+    const conditions = mockConditions[1].conditions;
+
+    const result = getConditionUpperCriteria(conditions);
+
+    expect(result).toEqual('allOf');
+  });
+
+  it('should return undefined if no upper criteria is found', () => {
+    const conditions = mockConditions[0].conditions;
+
+    const result = getConditionUpperCriteria(conditions);
+
+    expect(result).toBeUndefined();
+  });
+});
+
+describe('getConditionsData', () => {
+  it('should return conditions data correctly for simple condition', () => {
+    const conditions = mockConditions[0].conditions;
+
+    const result = getConditionsData(conditions);
+
+    expect(result).toEqual({
+      condition: {
+        rule: 'HAS_ANNOTATION',
+        resourceType: 'catalog-entity',
+        params: { annotation: 'temp' },
+      },
+    });
+  });
+
+  it('should return conditions data correctly for any upper criteria', () => {
+    const conditions = mockConditions[1].conditions;
+
+    const result = getConditionsData(conditions);
+
+    expect(result).toEqual({
+      allOf: [
+        {
+          rule: 'HAS_LABEL',
+          resourceType: 'catalog-entity',
+          params: { label: 'temp' },
+        },
+        {
+          rule: 'HAS_METADATA',
+          resourceType: 'catalog-entity',
+          params: { key: 'status' },
+        },
+      ],
+    });
+  });
+
+  it('should return undefined if nested condition exists', () => {
+    const conditions = {
+      allOf: [mockConditions[1].conditions, mockConditions[0].conditions],
+    } as AllOfCriteria<PermissionCondition>;
+
+    const result = getConditionsData(conditions);
+
+    expect(result).toBeUndefined();
+  });
+});
+
+describe('getPoliciesData', () => {
+  it('should return policies data correctly', () => {
+    const allowedPermissions = ['read', 'update'];
+    const policies = ['read', 'update', 'delete'];
+
+    const result = getPoliciesData(allowedPermissions, policies);
+
+    expect(result).toEqual([
+      { policy: 'read', effect: 'allow' },
+      { policy: 'update', effect: 'allow' },
+      { policy: 'delete', effect: 'deny' },
+    ]);
+  });
+
+  it('should return empty array if no policies provided', () => {
+    const allowedPermissions = ['read', 'write'];
+    const policies: string[] = [];
+
+    const result = getPoliciesData(allowedPermissions, policies);
+
+    expect(result).toEqual([]);
+  });
+
+  it('should return all policies as deny if no allowed permissions provided', () => {
+    const allowedPermissions: string[] = [];
+    const policies = ['read', 'update', 'delete'];
+
+    const result = getPoliciesData(allowedPermissions, policies);
+
+    expect(result).toEqual([
+      { policy: 'read', effect: 'deny' },
+      { policy: 'update', effect: 'deny' },
+      { policy: 'delete', effect: 'deny' },
+    ]);
+  });
+});
+
+describe('getConditionalPermissionsData', () => {
+  it('should return conditional permissions data correctly', () => {
+    const conditionalPermissions = [mockConditions[0]];
+    const permissionPolicies = {
+      plugins: ['catalog'],
+      pluginsPermissions: {
+        ['catalog']: {
+          permissions: ['catalog-entity'],
+          policies: {
+            ['catalog-entity']: {
+              policies: ['read', 'update', 'delete'],
+              isResourced: true,
+            },
+          },
+        },
+      },
+    };
+
+    const result = getConditionalPermissionsData(
+      conditionalPermissions,
+      permissionPolicies,
+    );
+
+    expect(result).toEqual([
+      {
+        plugin: 'catalog',
+        permission: 'catalog-entity',
+        isResourced: true,
+        policies: [
+          { policy: 'read', effect: 'allow' },
+          { policy: 'update', effect: 'deny' },
+          { policy: 'delete', effect: 'deny' },
+        ],
+        policyString: ['read'],
+        conditions: {
+          condition: {
+            rule: 'HAS_ANNOTATION',
+            resourceType: 'catalog-entity',
+            params: { annotation: 'temp' },
+          },
+        },
+        id: 1,
+      },
+    ]);
+  });
+
+  it('should return empty array if no conditional permissions provided', () => {
+    const conditionalPermissions: RoleConditionalPolicyDecision<PermissionAction>[] =
+      [];
+    const permissionPolicies = {
+      plugins: ['catalog'],
+      pluginsPermissions: {
+        ['catalog']: {
+          permissions: ['catalog-entity'],
+          policies: {
+            ['catalog-entity']: {
+              policies: ['read', 'update', 'delete'],
+              isResourced: true,
+            },
+          },
+        },
+      },
+    };
+
+    const result = getConditionalPermissionsData(
+      conditionalPermissions,
+      permissionPolicies,
+    );
+
+    expect(result).toEqual([]);
+  });
+
+  it('should skip conditional permission with nested upper criteria', () => {
+    const conditionalPermissions = [
+      {
+        id: 1,
+        pluginId: 'catalog',
+        result: AuthorizeResult.CONDITIONAL,
+        resourceType: 'catalog-entity',
+        permissionMapping: ['read'],
+        conditions: {
+          allOf: [mockConditions[1].conditions, mockConditions[0].conditions],
+        } as AllOfCriteria<PermissionCondition>,
+      },
+    ] as RoleConditionalPolicyDecision<PermissionAction>[];
+
+    const permissionPolicies = {
+      plugins: ['catalog'],
+      pluginsPermissions: {
+        ['catalog']: {
+          permissions: ['catalog-entity'],
+          policies: {
+            ['catalog-entity']: {
+              policies: ['read', 'update', 'delete'],
+              isResourced: true,
+            },
+          },
+        },
+      },
+    };
+    const result = getConditionalPermissionsData(
+      conditionalPermissions,
+      permissionPolicies,
+    );
+
+    expect(result).toEqual([]);
+  });
+});
diff --git a/plugins/rbac/src/utils/rbac-utils.ts b/plugins/rbac/src/utils/rbac-utils.ts
index 7bc13bc587..439798578c 100644
--- a/plugins/rbac/src/utils/rbac-utils.ts
+++ b/plugins/rbac/src/utils/rbac-utils.ts
@@ -4,15 +4,30 @@ import {
   parseEntityRef,
   stringifyEntityRef,
 } from '@backstage/catalog-model';
+import {
+  AllOfCriteria,
+  AnyOfCriteria,
+  NotCriteria,
+  PermissionCondition,
+  PermissionCriteria,
+} from '@backstage/plugin-permission-common';
 
 import {
+  PermissionAction,
   PermissionPolicy,
   Policy,
   RoleBasedPolicy,
+  RoleConditionalPolicyDecision,
 } from '@janus-idp/backstage-plugin-rbac-common';
 import { getTitleCase } from '@janus-idp/shared-react';
 
-import { RowPolicy, SelectedMember } from '../components/CreateRole/types';
+import { criterias } from '../components/ConditionalAccess/const';
+import { ConditionsData } from '../components/ConditionalAccess/types';
+import {
+  PluginsPermissionPoliciesData,
+  RowPolicy,
+  SelectedMember,
+} from '../components/CreateRole/types';
 import {
   MemberEntity,
   MembersData,
@@ -184,6 +199,93 @@ export const getPermissionsData = (
   })) as PermissionsData[];
 };
 
+export const getConditionUpperCriteria = (
+  conditions: PermissionCriteria<PermissionCondition>,
+): string | undefined => {
+  return Object.keys(conditions).find(key =>
+    [criterias.allOf, criterias.anyOf, criterias.not].includes(key),
+  );
+};
+
+export const getConditionsData = (
+  conditions: PermissionCriteria<PermissionCondition>,
+): ConditionsData | undefined => {
+  const upperCriteria = getConditionUpperCriteria(conditions) || 'condition';
+
+  switch (upperCriteria) {
+    case criterias.allOf: {
+      const allOfConditions = (conditions as AllOfCriteria<PermissionCondition>)
+        .allOf;
+      if (allOfConditions.find(c => !!getConditionUpperCriteria(c))) {
+        return undefined;
+      }
+      return { allOf: allOfConditions as PermissionCondition[] };
+    }
+    case criterias.anyOf: {
+      const anyOfConditions = (conditions as AnyOfCriteria<PermissionCondition>)
+        .anyOf;
+      if (anyOfConditions.find(c => !!getConditionUpperCriteria(c))) {
+        return undefined;
+      }
+      return { anyOf: anyOfConditions as PermissionCondition[] };
+    }
+    case criterias.not: {
+      const notConditions = (conditions as NotCriteria<PermissionCondition>)
+        .not;
+      if (getConditionUpperCriteria(notConditions)) {
+        return undefined;
+      }
+      return { not: notConditions as PermissionCondition };
+    }
+    default:
+      return { condition: conditions as PermissionCondition };
+  }
+};
+
+export const getPoliciesData = (
+  allowedPermissions: string[],
+  policies: string[],
+): RowPolicy[] => {
+  return policies.map(p => ({
+    policy: p,
+    ...(allowedPermissions.includes(p.toLowerCase())
+      ? { effect: 'allow' }
+      : { effect: 'deny' }),
+  }));
+};
+
+export const getConditionalPermissionsData = (
+  conditionalPermissions: RoleConditionalPolicyDecision<PermissionAction>[],
+  permissionPolicies: PluginsPermissionPoliciesData,
+): PermissionsData[] => {
+  return conditionalPermissions.reduce((acc: any, cp) => {
+    const conditions = getConditionsData(cp.conditions);
+    const allPolicies =
+      permissionPolicies.pluginsPermissions?.[cp.pluginId]?.policies?.[
+        cp.resourceType
+      ]?.policies ?? [];
+    const allowedPermissions = cp.permissionMapping.map(action =>
+      action.toLowerCase(),
+    );
+    return [
+      ...acc,
+      ...(conditions
+        ? [
+            {
+              plugin: cp.pluginId,
+              permission: cp.resourceType,
+              isResourced: true,
+              policies: getPoliciesData(allowedPermissions, allPolicies),
+              policyString: allowedPermissions,
+              conditions,
+              id: cp.id,
+            },
+          ]
+        : []),
+    ];
+  }, []);
+};
+
 export const getKindNamespaceName = (roleRef: string) => {
   const refs: string[] = roleRef.split(':');
   const kind = refs[0];
diff --git a/plugins/rbac/tests/rbac.spec.ts b/plugins/rbac/tests/rbac.spec.ts
index 414afcd2a2..6edbcfca0b 100644
--- a/plugins/rbac/tests/rbac.spec.ts
+++ b/plugins/rbac/tests/rbac.spec.ts
@@ -144,6 +144,22 @@ test.describe('RBAC plugin', () => {
     await page.getByPlaceholder('Select a resource type').last().click();
     await page.getByText('scaffolder-action').click();
 
+    // update existing conditional policy
+    await page
+      .getByText('Configure access (1 rule)', { exact: true })
+      .first()
+      .click();
+    await page.getByPlaceholder('Select a rule').first().click();
+    await page.getByText('HAS_METADATA').click();
+    await page.getByLabel('key').fill('status');
+    await page.getByTestId('save-conditions').click();
+
+    // remove existing conditional policy
+    await page.getByTestId('permissionPoliciesRows[1]-remove').first().click();
+    expect(
+      page.getByText('Configure access (2 rules)', { exact: true }),
+    ).toBeHidden();
+
     await common.clickButton('Next');
     await common.clickButton('Save');
     await verifyText('Role role:default/rbac_admin updated successfully', page);