diff --git a/packages/auth/src/features/refresh/handler.test.ts b/packages/auth/src/features/refresh/handler.test.ts
index 88ee48a863..c5f5784557 100644
--- a/packages/auth/src/features/refresh/handler.test.ts
+++ b/packages/auth/src/features/refresh/handler.test.ts
@@ -81,7 +81,6 @@ describe('authenticate handler receives a request', () => {
         SCOPES.USER_CREATE,
         SCOPES.USER_READ,
         SCOPES.USER_UPDATE,
-        SCOPES.ORGANISATION_READ,
         SCOPES.ORGANISATION_READ_LOCATIONS,
         SCOPES.PERFORMANCE_READ,
         SCOPES.PERFORMANCE_READ_DASHBOARDS,
diff --git a/packages/auth/src/features/verifyCode/handler.test.ts b/packages/auth/src/features/verifyCode/handler.test.ts
index 22c3331e3c..9a71ba17a5 100644
--- a/packages/auth/src/features/verifyCode/handler.test.ts
+++ b/packages/auth/src/features/verifyCode/handler.test.ts
@@ -77,7 +77,6 @@ describe('authenticate handler receives a request', () => {
         SCOPES.USER_CREATE,
         SCOPES.USER_READ,
         SCOPES.USER_UPDATE,
-        SCOPES.ORGANISATION_READ,
         SCOPES.ORGANISATION_READ_LOCATIONS,
         SCOPES.PERFORMANCE_READ,
         SCOPES.PERFORMANCE_READ_DASHBOARDS,
diff --git a/packages/client/src/App.tsx b/packages/client/src/App.tsx
index 9e8aba6e38..b190b12ce7 100644
--- a/packages/client/src/App.tsx
+++ b/packages/client/src/App.tsx
@@ -385,7 +385,7 @@ export function App(props: IAppProps) {
                                             <ProtectedRoute
                                               exact
                                               scopes={[
-                                                SCOPES.RECORD_PRINT_RECORDS
+                                                SCOPES.RECORD_REGISTRATION_PRINT
                                               ]}
                                               path={routes.VERIFY_COLLECTOR}
                                               component={VerifyCollector}
@@ -510,10 +510,7 @@ export function App(props: IAppProps) {
                                             />
                                             <ProtectedRoute
                                               exact
-                                              scopes={[
-                                                SCOPES.PERFORMANCE_READ,
-                                                SCOPES.PERFORMANCE_READ_MY_OFFICE
-                                              ]}
+                                              scopes={[SCOPES.PERFORMANCE_READ]}
                                               path={routes.PERFORMANCE_HOME}
                                               component={PerformanceHome}
                                             />
diff --git a/packages/client/src/components/form/ReviewActionComponent.tsx b/packages/client/src/components/form/ReviewActionComponent.tsx
index b8e3884150..d4b9c0b73f 100644
--- a/packages/client/src/components/form/ReviewActionComponent.tsx
+++ b/packages/client/src/components/form/ReviewActionComponent.tsx
@@ -20,6 +20,9 @@ import styled from 'styled-components'
 import React, { useState } from 'react'
 import { Button } from '@opencrvs/components/lib/Button'
 import { Icon } from '@opencrvs/components/lib/Icon'
+import ProtectedComponent from '@client/components/ProtectedComponent'
+import { SCOPES } from '@client/utils/gateway'
+import { usePermissions } from '@client/hooks/useAuthorization'
 
 interface IReviewActionProps extends React.HTMLAttributes<HTMLDivElement> {
   id?: string
@@ -89,12 +92,12 @@ const ActionContainer = styled.div`
   flex-flow: row wrap;
   align-items: center;
 
-  button:first-child {
-    margin-right: 16px;
-  }
+  button {
+    margin: 0 16px 8px 0;
 
-  & > button {
-    margin-bottom: 8px;
+    &:last-child {
+      margin-right: 0;
+    }
   }
 `
 
@@ -295,8 +298,6 @@ const ACTION_TO_CONTENT_MAP_SKELETON: (
 
 const ReviewActionComponent = ({
   id,
-  declarationToBeValidated,
-  declarationToBeRegistered,
   alreadyRejectedDeclaration,
   completeDeclaration,
   totalFileSizeExceeded,
@@ -308,6 +309,13 @@ const ReviewActionComponent = ({
   hasErrorsOnFields
 }: IReviewActionProps & IntlShapeProps) => {
   const [showSubmitModal, setShowSubmitModal] = useState(false)
+  const { hasAnyScope, hasScope } = usePermissions()
+
+  const declarationToBeRegistered = hasScope(SCOPES.RECORD_REGISTER)
+  const declarationToBeValidated = hasAnyScope([
+    SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+    SCOPES.RECORD_SUBMIT_FOR_UPDATES
+  ])
 
   const toggleSubmitModalOpen = () => {
     setShowSubmitModal(!showSubmitModal)
@@ -336,6 +344,7 @@ const ReviewActionComponent = ({
         String(draftDeclaration || alreadyRejectedDeclaration)
       ].completionStatus[String(completeDeclaration)]) ||
     null
+
   return !actionContent ? null : (
     <Container id={id}>
       <UnderLayBackground background={background} />
@@ -354,44 +363,62 @@ const ReviewActionComponent = ({
         </Description>
         <ActionContainer>
           {declarationToBeRegistered ? (
-            <Button
-              type="positive"
-              size="large"
-              id="registerDeclarationBtn"
-              onClick={toggleSubmitModalOpen}
-              disabled={!completeDeclaration || totalFileSizeExceeded}
-            >
-              <Icon name="Check" />
-              {intl.formatMessage(buttonMessages.register)}
-            </Button>
+            <ProtectedComponent scopes={[SCOPES.RECORD_REGISTER]}>
+              <Button
+                type="positive"
+                size="large"
+                id="registerDeclarationBtn"
+                onClick={toggleSubmitModalOpen}
+                disabled={!completeDeclaration || totalFileSizeExceeded}
+              >
+                <Icon name="Check" />
+                {intl.formatMessage(buttonMessages.register)}
+              </Button>
+            </ProtectedComponent>
           ) : declarationToBeValidated ? (
-            <Button
-              type="positive"
-              size="large"
-              id="validateDeclarationBtn"
-              onClick={toggleSubmitModalOpen}
-              disabled={!completeDeclaration || totalFileSizeExceeded}
-            >
-              <Icon name="PaperPlaneTilt" />
-              {intl.formatMessage(buttonMessages.sendForApproval)}
-            </Button>
+            <ProtectedComponent scopes={[SCOPES.RECORD_SUBMIT_FOR_APPROVAL]}>
+              <Button
+                type="positive"
+                size="large"
+                id="validateDeclarationBtn"
+                onClick={toggleSubmitModalOpen}
+                disabled={!completeDeclaration || totalFileSizeExceeded}
+              >
+                <Icon name="PaperPlaneTilt" />
+                {intl.formatMessage(buttonMessages.sendForApproval)}
+              </Button>
+            </ProtectedComponent>
           ) : (
-            <Button
-              type="primary"
-              size="large"
-              id="submit_form"
-              onClick={toggleSubmitModalOpen}
-              disabled={hasErrorsOnFields || totalFileSizeExceeded}
-            >
-              <Upload />
-              {intl.formatMessage(
-                completeDeclaration
-                  ? buttonMessages.sendForReview
-                  : buttonMessages.sendIncomplete
-              )}
-            </Button>
+            <>
+              <ProtectedComponent scopes={[SCOPES.RECORD_SUBMIT_INCOMPLETE]}>
+                <Button
+                  type="primary"
+                  size="large"
+                  id="submit_incomplete"
+                  onClick={toggleSubmitModalOpen}
+                  disabled={hasErrorsOnFields || totalFileSizeExceeded}
+                >
+                  <Upload />
+                  {intl.formatMessage(buttonMessages.sendIncomplete)}
+                </Button>
+              </ProtectedComponent>
+              <ProtectedComponent
+                scopes={[SCOPES.RECORD_SUBMIT_FOR_REVIEW]}
+                denyScopes={[SCOPES.RECORD_SUBMIT_INCOMPLETE]}
+              >
+                <Button
+                  type="primary"
+                  size="large"
+                  id="submit_for_review"
+                  onClick={toggleSubmitModalOpen}
+                  disabled={hasErrorsOnFields || totalFileSizeExceeded}
+                >
+                  <Upload />
+                  {intl.formatMessage(buttonMessages.sendForReview)}
+                </Button>
+              </ProtectedComponent>
+            </>
           )}
-
           {rejectDeclarationAction && !alreadyRejectedDeclaration && (
             <Button
               type="negative"
diff --git a/packages/client/src/components/interface/Navigation.test.tsx b/packages/client/src/components/interface/Navigation.test.tsx
index 1f63cc84bd..cfb62947af 100644
--- a/packages/client/src/components/interface/Navigation.test.tsx
+++ b/packages/client/src/components/interface/Navigation.test.tsx
@@ -328,7 +328,7 @@ describe('Given a user with scopes views Navigation', () => {
   describe('Requires update', async () => {
     const id = `#navigation_${WORKQUEUE_TABS.requiresUpdate}`
 
-    const requiredScopes = [SCOPES.RECORD_DECLARATION_REVIEW] as Scope[]
+    const requiredScopes = [SCOPES.RECORD_SUBMIT_FOR_UPDATES] as Scope[]
 
     const allOtherScopes = allScopes.filter(
       (scope) => !requiredScopes.includes(scope)
@@ -350,7 +350,10 @@ describe('Given a user with scopes views Navigation', () => {
   describe('Ready for review', async () => {
     const id = `#navigation_${WORKQUEUE_TABS.readyForReview}`
 
-    const requiredScopes = [SCOPES.RECORD_DECLARATION_REVIEW] as Scope[]
+    const requiredScopes = [
+      SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+      SCOPES.RECORD_SUBMIT_FOR_UPDATES
+    ] as Scope[]
 
     const allOtherScopes = allScopes.filter(
       (scope) => !requiredScopes.includes(scope)
@@ -446,15 +449,30 @@ describe('Given a user with scopes views Navigation', () => {
   describe('Outbox', async () => {
     const id = `#navigation_${WORKQUEUE_TABS.outbox}`
 
-    const excludedScopes = [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN] as Scope[]
+    const requiredScopes = [
+      SCOPES.RECORD_DECLARE_BIRTH,
+      SCOPES.RECORD_DECLARE_BIRTH_MY_JURISDICTION,
+      SCOPES.RECORD_DECLARE_DEATH,
+      SCOPES.RECORD_DECLARE_DEATH_MY_JURISDICTION,
+      SCOPES.RECORD_DECLARE_MARRIAGE,
+      SCOPES.RECORD_DECLARE_MARRIAGE_MY_JURISDICTION,
+      SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+      SCOPES.RECORD_SUBMIT_FOR_UPDATES,
+      SCOPES.RECORD_REVIEW_DUPLICATES,
+      SCOPES.RECORD_REGISTER,
+      SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES,
+      SCOPES.RECORD_REGISTRATION_CORRECT,
+      SCOPES.RECORD_DECLARATION_ARCHIVE,
+      SCOPES.RECORD_DECLARATION_REINSTATE,
+      SCOPES.RECORD_REGISTRATION_REVOKE
+    ] as Scope[]
 
-    const anyOtherScope = allScopes.filter(
-      (scope) => !excludedScopes.includes(scope)
+    const allOtherScopes = allScopes.filter(
+      (scope) => !requiredScopes.includes(scope)
     )
     const tests = [
-      [[excludedScopes[0]], false],
-      [[excludedScopes[1]], false],
-      [anyOtherScope, true]
+      [requiredScopes, true],
+      [allOtherScopes, false]
     ]
 
     tests.forEach(([scopes, exists]) => {
@@ -468,9 +486,9 @@ describe('Given a user with scopes views Navigation', () => {
 
   describe('and user has organisation scopes', async () => {
     const orgScopes = [
-      SCOPES.ORGANISATION_READ,
       SCOPES.ORGANISATION_READ_LOCATIONS,
-      SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE
+      SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE,
+      SCOPES.ORGANISATION_READ_LOCATIONS_MY_JURISDICTION
     ] as Scope[]
 
     describe('Performance', async () => {
@@ -506,7 +524,7 @@ describe('Given a user with scopes views Navigation', () => {
     describe('Organisation', async () => {
       const id = `#navigation_${WORKQUEUE_TABS.organisation}`
 
-      const requiredScopes = [SCOPES.ORGANISATION_READ] as Scope[]
+      const requiredScopes = [SCOPES.ORGANISATION_READ_LOCATIONS] as Scope[]
 
       const allOtherScopes = allScopes.filter(
         (scope) => !requiredScopes.includes(scope)
@@ -556,20 +574,14 @@ describe('Given a user with scopes views Navigation', () => {
     describe('Config', async () => {
       const id = `#navigation_${WORKQUEUE_TABS.config}_main`
 
-      const requiredScopes = [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN] as Scope[]
+      const requiredScopes = [...orgScopes, SCOPES.CONFIG_UPDATE_ALL] as Scope[]
 
       const allOtherScopes = allScopes.filter(
         (scope) => !requiredScopes.includes(scope)
       )
 
       const tests = [
-        [[requiredScopes[0], orgScopes[0]], true],
-        [[requiredScopes[0], orgScopes[1]], true],
-        [[requiredScopes[0], orgScopes[2]], true],
-        [[requiredScopes[1], orgScopes[0]], true],
-        [[requiredScopes[1], orgScopes[1]], true],
-        [[requiredScopes[1], orgScopes[2]], true],
-        [requiredScopes, false],
+        [requiredScopes, true],
         [allOtherScopes, false]
       ]
 
@@ -585,9 +597,7 @@ describe('Given a user with scopes views Navigation', () => {
     describe('Systems', async () => {
       const id = `#navigation_${WORKQUEUE_TABS.systems}`
 
-      const requiredScopes = (
-        [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN] as Scope[]
-      ).concat(orgScopes)
+      const requiredScopes = [...orgScopes, SCOPES.CONFIG_UPDATE_ALL] as Scope[]
 
       const tests = [[requiredScopes, true]]
 
@@ -608,20 +618,14 @@ describe('Given a user with scopes views Navigation', () => {
     describe('Communications', async () => {
       const id = `#navigation_${WORKQUEUE_TABS.communications}_main`
 
-      const requiredScopes = [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN] as Scope[]
+      const requiredScopes = [...orgScopes, SCOPES.CONFIG_UPDATE_ALL] as Scope[]
 
       const allOtherScopes = allScopes.filter(
         (scope) => !requiredScopes.includes(scope)
       )
 
       const tests = [
-        [[requiredScopes[0], orgScopes[0]], true],
-        [[requiredScopes[0], orgScopes[1]], true],
-        [[requiredScopes[0], orgScopes[2]], true],
-        [[requiredScopes[1], orgScopes[0]], true],
-        [[requiredScopes[1], orgScopes[1]], true],
-        [[requiredScopes[1], orgScopes[2]], true],
-        [requiredScopes, false],
+        [requiredScopes, true],
         [allOtherScopes, false]
       ]
 
@@ -637,9 +641,7 @@ describe('Given a user with scopes views Navigation', () => {
     describe('Email all users', async () => {
       const id = `#navigation_${WORKQUEUE_TABS.emailAllUsers}`
 
-      const requiredScopes = (
-        [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN] as Scope[]
-      ).concat(orgScopes)
+      const requiredScopes = [...orgScopes, SCOPES.CONFIG_UPDATE_ALL] as Scope[]
 
       const tests = [[requiredScopes, true]]
 
diff --git a/packages/client/src/hooks/useNavigation.ts b/packages/client/src/hooks/useNavigation.ts
index 2069889e67..ce6fc7e33f 100644
--- a/packages/client/src/hooks/useNavigation.ts
+++ b/packages/client/src/hooks/useNavigation.ts
@@ -61,11 +61,14 @@ const routeAccess: NavigationConfig[] = [
       },
       {
         name: WORKQUEUE_TABS.requiresUpdate,
-        scopes: [SCOPES.RECORD_DECLARATION_REVIEW]
+        scopes: [SCOPES.RECORD_SUBMIT_FOR_UPDATES]
       },
       {
         name: WORKQUEUE_TABS.readyForReview,
-        scopes: [SCOPES.RECORD_DECLARATION_REVIEW]
+        scopes: [
+          SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+          SCOPES.RECORD_SUBMIT_FOR_UPDATES
+        ]
       },
       {
         name: WORKQUEUE_TABS.readyToPrint,
@@ -81,16 +84,32 @@ const routeAccess: NavigationConfig[] = [
       },
       {
         name: WORKQUEUE_TABS.outbox,
-        denyScopes: [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN]
+        scopes: [
+          SCOPES.RECORD_DECLARE_BIRTH,
+          SCOPES.RECORD_DECLARE_BIRTH_MY_JURISDICTION,
+          SCOPES.RECORD_DECLARE_DEATH,
+          SCOPES.RECORD_DECLARE_DEATH_MY_JURISDICTION,
+          SCOPES.RECORD_DECLARE_MARRIAGE,
+          SCOPES.RECORD_DECLARE_MARRIAGE_MY_JURISDICTION,
+          SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+          SCOPES.RECORD_SUBMIT_FOR_UPDATES,
+          SCOPES.RECORD_REVIEW_DUPLICATES,
+          SCOPES.RECORD_REGISTER,
+          SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES,
+          SCOPES.RECORD_REGISTRATION_CORRECT,
+          SCOPES.RECORD_DECLARATION_ARCHIVE,
+          SCOPES.RECORD_DECLARATION_REINSTATE,
+          SCOPES.RECORD_REGISTRATION_REVOKE
+        ]
       }
     ]
   },
   {
     name: TAB_GROUPS.organisations,
     scopes: [
-      SCOPES.ORGANISATION_READ,
       SCOPES.ORGANISATION_READ_LOCATIONS,
-      SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE
+      SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE,
+      SCOPES.ORGANISATION_READ_LOCATIONS_MY_JURISDICTION
     ],
     tabs: [
       {
@@ -99,7 +118,7 @@ const routeAccess: NavigationConfig[] = [
       },
       {
         name: WORKQUEUE_TABS.organisation,
-        scopes: [SCOPES.ORGANISATION_READ]
+        scopes: [SCOPES.ORGANISATION_READ_LOCATIONS]
       },
       {
         name: WORKQUEUE_TABS.team,
@@ -110,19 +129,19 @@ const routeAccess: NavigationConfig[] = [
       },
       {
         name: WORKQUEUE_TABS.config,
-        scopes: [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN]
+        scopes: [SCOPES.CONFIG_UPDATE_ALL]
       },
       {
         name: WORKQUEUE_TABS.systems,
-        scopes: []
+        scopes: [SCOPES.CONFIG_UPDATE_ALL]
       },
       {
         name: WORKQUEUE_TABS.communications,
-        scopes: [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN]
+        scopes: [SCOPES.CONFIG_UPDATE_ALL]
       },
       {
         name: WORKQUEUE_TABS.emailAllUsers,
-        scopes: [SCOPES.SYSADMIN, SCOPES.NATLSYSADMIN]
+        scopes: [SCOPES.CONFIG_UPDATE_ALL]
       }
     ]
   },
diff --git a/packages/client/src/tests/util.tsx b/packages/client/src/tests/util.tsx
index 82c3b6c9d9..b98a99c492 100644
--- a/packages/client/src/tests/util.tsx
+++ b/packages/client/src/tests/util.tsx
@@ -70,15 +70,10 @@ export const inValidImageB64String =
   'wee7dfaKGgoAAAANSUhEUgAAAAgAAAACCAYAAABllJ3tAAAABHNCSVQICAgIfAhkiAAAABl0RVh0U29mdHdhcmUAZ25vbWUtc2NyZWVuc2hvdO8Dvz4AAAAXSURBVAiZY1RWVv7PgAcw4ZNkYGBgAABYyAFsic1CfAAAAABJRU5ErkJggg=='
 
 export const SYSTEM_ADMIN_DEFAULT_SCOPES = [
-  /*
-   * @deprecated
-   */
-  SCOPES.SYSADMIN,
-  SCOPES.NATLSYSADMIN,
+  SCOPES.CONFIG_UPDATE_ALL,
   SCOPES.USER_CREATE,
   SCOPES.USER_READ,
   SCOPES.USER_UPDATE,
-  SCOPES.ORGANISATION_READ,
   SCOPES.ORGANISATION_READ_LOCATIONS,
   SCOPES.PERFORMANCE_READ,
   SCOPES.PERFORMANCE_READ_DASHBOARDS,
@@ -86,24 +81,16 @@ export const SYSTEM_ADMIN_DEFAULT_SCOPES = [
 ] satisfies Scope[]
 
 export const REGISTRAR_DEFAULT_SCOPES = [
-  /*
-   * @deprecated
-   */
-  SCOPES.REGISTER,
-  SCOPES.PERFORMANCE,
-  SCOPES.CERTIFY,
-
   SCOPES.RECORD_DECLARE_BIRTH,
   SCOPES.RECORD_DECLARE_DEATH,
   SCOPES.RECORD_DECLARE_MARRIAGE,
-  SCOPES.RECORD_DECLARATION_REVIEW,
   SCOPES.RECORD_SUBMIT_FOR_UPDATES,
   SCOPES.RECORD_REVIEW_DUPLICATES,
   SCOPES.RECORD_DECLARATION_ARCHIVE,
   SCOPES.RECORD_DECLARATION_REINSTATE,
   SCOPES.RECORD_REGISTER,
   SCOPES.RECORD_REGISTRATION_CORRECT,
-  SCOPES.RECORD_PRINT_RECORDS,
+  SCOPES.RECORD_REGISTRATION_PRINT,
   SCOPES.RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS,
   SCOPES.RECORD_EXPORT_RECORDS,
   SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES,
@@ -111,7 +98,7 @@ export const REGISTRAR_DEFAULT_SCOPES = [
   SCOPES.RECORD_CREATE_COMMENTS,
   SCOPES.PERFORMANCE_READ,
   SCOPES.PERFORMANCE_READ_DASHBOARDS,
-  SCOPES.ORGANISATION_READ,
+  SCOPES.ORGANISATION_READ_LOCATIONS,
   SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE,
   SCOPES.SEARCH_BIRTH,
   SCOPES.SEARCH_DEATH,
@@ -125,13 +112,12 @@ export const REGISTRATION_AGENT_DEFAULT_SCOPES = [
   SCOPES.RECORD_DECLARE_BIRTH,
   SCOPES.RECORD_DECLARE_DEATH,
   SCOPES.RECORD_DECLARE_MARRIAGE,
-  SCOPES.RECORD_DECLARATION_REVIEW,
   SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
   SCOPES.RECORD_SUBMIT_FOR_UPDATES,
   SCOPES.RECORD_DECLARATION_ARCHIVE,
   SCOPES.RECORD_DECLARATION_REINSTATE,
   SCOPES.RECORD_REGISTRATION_REQUEST_CORRECTION,
-  SCOPES.RECORD_PRINT_RECORDS,
+  SCOPES.RECORD_REGISTRATION_PRINT,
   SCOPES.RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS,
   SCOPES.RECORD_EXPORT_RECORDS,
   SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES,
@@ -139,7 +125,7 @@ export const REGISTRATION_AGENT_DEFAULT_SCOPES = [
   SCOPES.RECORD_CREATE_COMMENTS,
   SCOPES.PERFORMANCE_READ,
   SCOPES.PERFORMANCE_READ_DASHBOARDS,
-  SCOPES.ORGANISATION_READ,
+  SCOPES.ORGANISATION_READ_LOCATIONS,
   SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE,
   SCOPES.SEARCH_BIRTH,
   SCOPES.SEARCH_DEATH,
@@ -170,7 +156,9 @@ export const ACTION_STATUS_MAP = {
 } as const
 
 export const validateScopeToken = jwt.sign(
-  { scope: ['validate'] },
+  {
+    scope: [SCOPES.RECORD_SUBMIT_FOR_APPROVAL]
+  },
   readFileSync('./test/cert.key'),
   {
     algorithm: 'RS256',
@@ -1194,7 +1182,7 @@ export const mockFetchRoleGraphqlOperation = {
             description: 'Name for user role Field Agent',
             id: 'userRole.hospitalFieldAgent'
           },
-          scopes: ['declare']
+          scopes: [SCOPES.RECORD_DECLARE_BIRTH]
         },
         {
           id: 'FIELD_AGENT',
@@ -1203,7 +1191,7 @@ export const mockFetchRoleGraphqlOperation = {
             description: 'Name for user role Field Agent',
             id: 'userRole.fieldAgent'
           },
-          scopes: ['declare']
+          scopes: [SCOPES.RECORD_DECLARE_DEATH]
         },
         {
           id: 'POLICE_OFFICER',
@@ -1212,7 +1200,7 @@ export const mockFetchRoleGraphqlOperation = {
             description: 'Name for user role Police Officer',
             id: 'userRole.policeOfficer'
           },
-          scopes: ['declare']
+          scopes: [SCOPES.RECORD_DECLARE_DEATH]
         },
         {
           id: 'SOCIAL_WORKER',
@@ -1221,7 +1209,7 @@ export const mockFetchRoleGraphqlOperation = {
             description: 'Name for user role Social Worker',
             id: 'userRole.socialWorker'
           },
-          scopes: ['declare']
+          scopes: [SCOPES.SEARCH_MARRIAGE]
         },
         {
           id: 'HEALTHCARE_WORKER',
@@ -1230,7 +1218,7 @@ export const mockFetchRoleGraphqlOperation = {
             description: 'Name for user role Healthcare Worker',
             id: 'userRole.healthcareWorker'
           },
-          scopes: ['declare']
+          scopes: [SCOPES.SEARCH_BIRTH]
         },
         {
           id: 'LOCAL_LEADER',
@@ -1239,7 +1227,7 @@ export const mockFetchRoleGraphqlOperation = {
             description: 'Name for user role Local Leader',
             id: 'userRole.localLeader'
           },
-          scopes: ['declare']
+          scopes: [SCOPES.SEARCH_MARRIAGE]
         },
         {
           id: 'REGISTRATION_AGENT',
@@ -1248,7 +1236,10 @@ export const mockFetchRoleGraphqlOperation = {
             description: 'Name for user role Registration Agent',
             id: 'userRole.registrationAgent'
           },
-          scopes: ['validate', 'performance', 'certify']
+          scopes: [
+            SCOPES.PERFORMANCE_READ,
+            SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES
+          ]
         },
         {
           id: 'LOCAL_REGISTRAR',
@@ -1257,7 +1248,11 @@ export const mockFetchRoleGraphqlOperation = {
             description: 'Name for user role Local Registrar',
             id: 'userRole.localRegistrar'
           },
-          scopes: ['register', 'performance', 'certify']
+          scopes: [
+            SCOPES.RECORD_REGISTER,
+            SCOPES.PERFORMANCE_READ,
+            SCOPES.RECORD_PRINT_CERTIFIED_COPIES
+          ]
         },
         {
           id: 'LOCAL_SYSTEM_ADMIN',
@@ -1266,7 +1261,7 @@ export const mockFetchRoleGraphqlOperation = {
             description: 'Name for user role Local System Admin',
             id: 'userRole.localSystemAdmin'
           },
-          scopes: ['sysadmin']
+          scopes: [SCOPES.CONFIG_UPDATE_ALL]
         },
         {
           id: 'NATIONAL_SYSTEM_ADMIN',
@@ -1275,7 +1270,7 @@ export const mockFetchRoleGraphqlOperation = {
             description: 'Name for user role National System Admin',
             id: 'userRole.nationalSystemAdmin'
           },
-          scopes: ['sysadmin', 'natlsysadmin']
+          scopes: [SCOPES.CONFIG_UPDATE_ALL]
         },
         {
           id: 'PERFORMANCE_MANAGER',
@@ -1284,7 +1279,7 @@ export const mockFetchRoleGraphqlOperation = {
             description: 'Name for user role Performance Manager',
             id: 'userRole.performanceManager'
           },
-          scopes: ['performance']
+          scopes: [SCOPES.PERFORMANCE_READ]
         },
         {
           id: 'NATIONAL_REGISTRAR',
@@ -1293,7 +1288,13 @@ export const mockFetchRoleGraphqlOperation = {
             description: 'Name for user role National Registrar',
             id: 'userRole.nationalRegistrar'
           },
-          scopes: ['register', 'performance', 'certify', 'config', 'teams']
+          scopes: [
+            SCOPES.RECORD_REGISTER,
+            SCOPES.PERFORMANCE_READ,
+            SCOPES.RECORD_PRINT_CERTIFIED_COPIES,
+            SCOPES.CONFIG_UPDATE_ALL,
+            SCOPES.ORGANISATION_READ_LOCATIONS
+          ]
         }
       ]
     }
diff --git a/packages/client/src/utils/authUtils.ts b/packages/client/src/utils/authUtils.ts
index dc103db4b0..d2372eb6c9 100644
--- a/packages/client/src/utils/authUtils.ts
+++ b/packages/client/src/utils/authUtils.ts
@@ -97,13 +97,3 @@ export async function refreshToken() {
   }
   return true
 }
-
-export const enum AuthScope {
-  DECLARE = 'declare',
-  REGISTER = 'register',
-  CERTIFY = 'certify',
-  PERFORMANCE = 'performance',
-  SYSADMIN = 'sysadmin',
-  VALIDATE = 'validate',
-  NATLSYSADMIN = 'natlsysadmin'
-}
diff --git a/packages/client/src/utils/gateway.ts b/packages/client/src/utils/gateway.ts
index 872d5c6cc2..f12dda5cd9 100644
--- a/packages/client/src/utils/gateway.ts
+++ b/packages/client/src/utils/gateway.ts
@@ -15,17 +15,9 @@
 import { PlainDate } from '@client/utils/date-formatting'
 
 export const scopes = [
-  'natlsysadmin',
   'bypassratelimit',
   'demo',
-  'declare',
-  'register',
-  'certify',
-  'performance',
-  'sysadmin',
-  'validate',
   'teams',
-  'config',
   'webhook',
   'nationalId',
   'notification-api',
@@ -38,21 +30,22 @@ export const scopes = [
   'record.declare-marriage:my-jurisdiction',
   'record.declaration-submit-incomplete',
   'record.declaration-submit-for-review',
-  'record.assign-unassign-myself',
   'record.unassign-others',
-  'record.declaration-review',
-  'record.declaration-archive',
-  'record.declaration-reinstate',
-  'record.review-duplicates',
   'record.submit-for-approval',
   'record.submit-for-updates',
-  'record.registration-verify-certified-copies',
+  'record.declaration-edit',
+  'record.review-duplicates',
+  'record.declaration-archive',
+  'record.declaration-reinstate',
   'record.register',
-  'record.print-records',
-  'record.print-records-supporting-documents',
   'record.export-records',
-  'record.print-issue-certified-copies',
-  'record.bulk-print-certified-copies',
+  'record.declaration-print',
+  'record.declaration.print-supporting-documents',
+  'record.registration-print',
+  'record.registration-print&issue-certified-copies',
+  'record.registration-print-certified-copies',
+  'record.registration-bulk-print-certified-copies',
+  'record.registration-verify-certified-copies',
   'record.registration-request-correction',
   'record.registration-correct',
   'record.registration-request-revocation',
@@ -69,16 +62,11 @@ export const scopes = [
   'record.read-audit',
   'record.read-comments',
   'record.create-comments',
-  'profile.update-signature',
-  'profile.update-phone-number',
-  'profile.update-name',
-  'profile.update-profile-image',
+  'profile.update',
   'profile.electronic-signature',
-  'performance.read:my-office',
   'performance.read',
   'performance.read-dashboards',
-  'performance.export-vital-statistics',
-  'organisation.read:all',
+  'performance.vital-statistics-export',
   'organisation.read-locations:all',
   'organisation.read-locations:my-office',
   'organisation.read-locations:my-jurisdiction',
@@ -95,17 +83,9 @@ export const scopes = [
 export type Scope = (typeof scopes)[number]
 
 export const SCOPES = {
-  NATLSYSADMIN: 'natlsysadmin',
   BYPASSRATELIMIT: 'bypassratelimit',
   DEMO: 'demo',
-  DECLARE: 'declare',
-  REGISTER: 'register',
-  CERTIFY: 'certify',
-  PERFORMANCE: 'performance',
-  SYSADMIN: 'sysadmin',
-  VALIDATE: 'validate',
   TEAMS: 'teams',
-  CONFIG: 'config',
   WEBHOOK: 'webhook',
   NATIONALID: 'nationalId',
   NOTIFICATION_API: 'notification-api',
@@ -119,23 +99,26 @@ export const SCOPES = {
     'record.declare-marriage:my-jurisdiction',
   RECORD_SUBMIT_INCOMPLETE: 'record.declaration-submit-incomplete',
   RECORD_SUBMIT_FOR_REVIEW: 'record.declaration-submit-for-review',
-  RECORD_ASSIGN_UNASSIGN_MYSELF: 'record.assign-unassign-myself',
   RECORD_UNASSIGN_OTHERS: 'record.unassign-others',
-  RECORD_DECLARATION_REVIEW: 'record.declaration-review',
-  RECORD_DECLARATION_ARCHIVE: 'record.declaration-archive',
-  RECORD_DECLARATION_REINSTATE: 'record.declaration-reinstate',
-  RECORD_REVIEW_DUPLICATES: 'record.review-duplicates',
   RECORD_SUBMIT_FOR_APPROVAL: 'record.submit-for-approval',
   RECORD_SUBMIT_FOR_UPDATES: 'record.submit-for-updates',
-  RECORD_REGISTRATION_VERIFY_CERTIFIED_COPIES:
-    'record.registration-verify-certified-copies',
+  RECORD_DECLARATION_EDIT: 'record.declaration-edit',
+  RECORD_REVIEW_DUPLICATES: 'record.review-duplicates',
+  RECORD_DECLARATION_ARCHIVE: 'record.declaration-archive',
+  RECORD_DECLARATION_REINSTATE: 'record.declaration-reinstate',
   RECORD_REGISTER: 'record.register',
-  RECORD_PRINT_RECORDS: 'record.print-records',
-  RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS:
-    'record.print-records-supporting-documents',
   RECORD_EXPORT_RECORDS: 'record.export-records',
-  RECORD_PRINT_ISSUE_CERTIFIED_COPIES: 'record.print-issue-certified-copies',
-  RECORD_BULK_PRINT_CERTIFIED_COPIES: 'record.bulk-print-certified-copies',
+  RECORD_DECLARATION_PRINT: 'record.declaration-print',
+  RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS:
+    'record.declaration.print-supporting-documents',
+  RECORD_REGISTRATION_PRINT: 'record.registration-print',
+  RECORD_PRINT_ISSUE_CERTIFIED_COPIES:
+    'record.registration-print&issue-certified-copies',
+  RECORD_PRINT_CERTIFIED_COPIES: 'record.registration-print-certified-copies',
+  RECORD_BULK_PRINT_CERTIFIED_COPIES:
+    'record.registration-bulk-print-certified-copies',
+  RECORD_REGISTRATION_VERIFY_CERTIFIED_COPIES:
+    'record.registration-verify-certified-copies',
   RECORD_REGISTRATION_REQUEST_CORRECTION:
     'record.registration-request-correction',
   RECORD_REGISTRATION_CORRECT: 'record.registration-correct',
@@ -155,16 +138,11 @@ export const SCOPES = {
   RECORD_READ_AUDIT: 'record.read-audit',
   RECORD_READ_COMMENTS: 'record.read-comments',
   RECORD_CREATE_COMMENTS: 'record.create-comments',
-  PROFILE_UPDATE_SIGNATURE: 'profile.update-signature',
-  PROFILE_UPDATE_PHONE_NUMBER: 'profile.update-phone-number',
-  PROFILE_UPDATE_NAME: 'profile.update-name',
-  PROFILE_UPDATE_PROFILE_IMAGE: 'profile.update-profile-image',
+  PROFILE_UPDATE: 'profile.update',
   PROFILE_ELECTRONIC_SIGNATURE: 'profile.electronic-signature',
-  PERFORMANCE_READ_MY_OFFICE: 'performance.read:my-office',
   PERFORMANCE_READ: 'performance.read',
   PERFORMANCE_READ_DASHBOARDS: 'performance.read-dashboards',
-  PERFORMANCE_EXPORT_VITAL_STATISTICS: 'performance.export-vital-statistics',
-  ORGANISATION_READ: 'organisation.read:all',
+  PERFORMANCE_EXPORT_VITAL_STATISTICS: 'performance.vital-statistics-export',
   ORGANISATION_READ_LOCATIONS: 'organisation.read-locations:all',
   ORGANISATION_READ_LOCATIONS_MY_OFFICE:
     'organisation.read-locations:my-office',
diff --git a/packages/client/src/views/AdvancedSearch/AdvancedSearchResult.tsx b/packages/client/src/views/AdvancedSearch/AdvancedSearchResult.tsx
index 70c6426f59..b3293686bc 100644
--- a/packages/client/src/views/AdvancedSearch/AdvancedSearchResult.tsx
+++ b/packages/client/src/views/AdvancedSearch/AdvancedSearchResult.tsx
@@ -40,7 +40,7 @@ import {
   errorMessages
 } from '@client/i18n/messages'
 import { messages as advancedSearchResultMessages } from '@client/i18n/messages/views/advancedSearchResult'
-import { Scope, SearchEventsQuery } from '@client/utils/gateway'
+import { Scope, SCOPES, SearchEventsQuery } from '@client/utils/gateway'
 import { Frame } from '@opencrvs/components/lib/Frame'
 import { LoadingIndicator } from '@client/views/OfficeHome/LoadingIndicator'
 import { Redirect, RouteComponentProps } from 'react-router'
@@ -86,6 +86,7 @@ import { BookmarkAdvancedSearchResult } from '@client/views/AdvancedSearch/Bookm
 import { useWindowSize } from '@opencrvs/components/lib/hooks'
 import { UserDetails } from '@client/utils/userUtils'
 import { changeSortedColumn } from '@client/views/OfficeHome/utils'
+import { usePermissions } from '@client/hooks/useAuthorization'
 
 const SearchParamContainer = styled.div`
   margin: 16px 0px;
@@ -221,15 +222,24 @@ const AdvancedSearchResultComp = (props: IFullProps) => {
     }
   }
 
-  const userHasRegisterScope = () => {
-    return props.scope && props.scope.includes('register')
-  }
-  const userHasValidateScope = () => {
-    return props.scope && props.scope.includes('validate')
-  }
-  const userHasCertifyScope = () => {
-    return props.scope && props.scope.includes('certify')
-  }
+  const { hasAnyScope, hasScope } = usePermissions()
+
+  const userHasRegisterScope = () => hasScope(SCOPES.RECORD_REGISTER)
+
+  const userHasValidateScope = () =>
+    hasAnyScope([
+      SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+      SCOPES.RECORD_SUBMIT_FOR_UPDATES
+    ])
+
+  const hasIssueScope = () =>
+    hasScope(SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES)
+
+  const hasPrintScope = () =>
+    hasAnyScope([
+      SCOPES.RECORD_PRINT_CERTIFIED_COPIES,
+      SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES
+    ])
 
   const transformSearchContent = (data: QueryData) => {
     if (!data || !data.results) {
@@ -283,7 +293,7 @@ const AdvancedSearchResultComp = (props: IFullProps) => {
         if (windowWidth > props.theme.grid.breakpoints.lg) {
           if (
             (declarationIsRegistered || declarationIsIssued) &&
-            userHasCertifyScope()
+            hasPrintScope()
           ) {
             actions.push({
               label: intl.formatMessage(buttonMessages.print),
@@ -295,7 +305,7 @@ const AdvancedSearchResultComp = (props: IFullProps) => {
               },
               disabled: downloadStatus !== DOWNLOAD_STATUS.DOWNLOADED
             })
-          } else if (declarationIsCertified && userHasCertifyScope()) {
+          } else if (declarationIsCertified && hasIssueScope()) {
             actions.push({
               label: intl.formatMessage(buttonMessages.issue),
               handler: (
diff --git a/packages/client/src/views/OfficeHome/OfficeHome.tsx b/packages/client/src/views/OfficeHome/OfficeHome.tsx
index 4caeddf7ee..264bf51fc6 100644
--- a/packages/client/src/views/OfficeHome/OfficeHome.tsx
+++ b/packages/client/src/views/OfficeHome/OfficeHome.tsx
@@ -213,14 +213,6 @@ class OfficeHomeView extends React.Component<
     }
   }
 
-  userHasRegisterScope() {
-    return this.props.scope && this.props.scope.includes('register')
-  }
-
-  userHasValidateScope() {
-    return this.props.scope && this.props.scope.includes('validate')
-  }
-
   subtractDeclarationsWithStatus(count: number, status: string[]) {
     const outboxCount = this.props.storedDeclarations.filter(
       (app) => app.submissionStatus && status.includes(app.submissionStatus)
diff --git a/packages/client/src/views/OfficeHome/inProgress/InProgress.tsx b/packages/client/src/views/OfficeHome/inProgress/InProgress.tsx
index edfb15e874..4f8261dd63 100644
--- a/packages/client/src/views/OfficeHome/inProgress/InProgress.tsx
+++ b/packages/client/src/views/OfficeHome/inProgress/InProgress.tsx
@@ -534,29 +534,30 @@ class InProgressComponent extends React.Component<
     }
   }
 
+  validateScopes = [
+    SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+    SCOPES.RECORD_SUBMIT_FOR_UPDATES
+  ] as Scope[]
+
+  declareScopes = [
+    SCOPES.RECORD_DECLARE_BIRTH,
+    SCOPES.RECORD_DECLARE_DEATH,
+    SCOPES.RECORD_DECLARE_MARRIAGE,
+    SCOPES.RECORD_DECLARE_BIRTH_MY_JURISDICTION,
+    SCOPES.RECORD_DECLARE_DEATH_MY_JURISDICTION,
+    SCOPES.RECORD_DECLARE_MARRIAGE_MY_JURISDICTION
+  ] as Scope[]
+
   hasDrafts() {
-    return (
-      this.props.scopes?.includes(SCOPES.RECORD_DECLARE_BIRTH) ||
-      this.props.scopes?.includes(SCOPES.RECORD_DECLARE_DEATH) ||
-      this.props.scopes?.includes(SCOPES.RECORD_DECLARE_MARRIAGE) ||
-      this.props.scopes?.includes(
-        SCOPES.RECORD_DECLARE_BIRTH_MY_JURISDICTION
-      ) ||
-      this.props.scopes?.includes(
-        SCOPES.RECORD_DECLARE_DEATH_MY_JURISDICTION
-      ) ||
-      this.props.scopes?.includes(
-        SCOPES.RECORD_DECLARE_MARRIAGE_MY_JURISDICTION
-      )
-    )
+    return this.props.scopes?.some((x) => this.declareScopes.includes(x))
   }
 
   hasFieldAgents() {
-    return this.props.scopes?.includes(SCOPES.RECORD_DECLARATION_REVIEW)
+    return this.props.scopes?.some((x) => this.validateScopes.includes(x))
   }
 
   hasHealthSystem() {
-    return this.props.scopes?.includes(SCOPES.RECORD_DECLARATION_REVIEW)
+    return this.props.scopes?.some((x) => this.validateScopes.includes(x))
   }
 
   getTabs(
diff --git a/packages/client/src/views/OfficeHome/requiresUpdate/RequiresUpdate.tsx b/packages/client/src/views/OfficeHome/requiresUpdate/RequiresUpdate.tsx
index d847510bf8..2595ad351b 100644
--- a/packages/client/src/views/OfficeHome/requiresUpdate/RequiresUpdate.tsx
+++ b/packages/client/src/views/OfficeHome/requiresUpdate/RequiresUpdate.tsx
@@ -53,7 +53,7 @@ import {
   NameContainer
 } from '@client/views/OfficeHome/components'
 import { WQContentWrapper } from '@client/views/OfficeHome/WQContentWrapper'
-import { RegStatus, Scope } from '@client/utils/gateway'
+import { RegStatus, Scope, SCOPES } from '@client/utils/gateway'
 
 interface IBaseRejectTabProps {
   theme: ITheme
@@ -178,7 +178,14 @@ class RequiresUpdateComponent extends React.Component<
     if (!data || !data.results) {
       return []
     }
-    const isFieldAgent = this.props.scope?.includes('declare') ? true : false
+
+    const validateScopes = [
+      SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+      SCOPES.RECORD_SUBMIT_FOR_UPDATES
+    ] as Scope[]
+
+    const isReviewer = this.props.scope?.some((x) => validateScopes.includes(x))
+
     const transformedData = transformData(data, this.props.intl)
     const items = transformedData.map((reg, index) => {
       const actions = [] as IAction[]
@@ -191,7 +198,7 @@ class RequiresUpdateComponent extends React.Component<
       if (downloadStatus !== DOWNLOAD_STATUS.DOWNLOADED) {
         if (
           this.state.width > this.props.theme.grid.breakpoints.lg &&
-          !isFieldAgent
+          isReviewer
         ) {
           actions.push({
             label: this.props.intl.formatMessage(buttonMessages.update),
@@ -202,7 +209,7 @@ class RequiresUpdateComponent extends React.Component<
       } else {
         if (
           this.state.width > this.props.theme.grid.breakpoints.lg &&
-          !isFieldAgent
+          isReviewer
         ) {
           actions.push({
             label: this.props.intl.formatMessage(buttonMessages.update),
diff --git a/packages/client/src/views/OfficeHome/requiresUpdate/requiresUpdate.test.tsx b/packages/client/src/views/OfficeHome/requiresUpdate/requiresUpdate.test.tsx
index 2cf772e8c9..ed0a974abe 100644
--- a/packages/client/src/views/OfficeHome/requiresUpdate/requiresUpdate.test.tsx
+++ b/packages/client/src/views/OfficeHome/requiresUpdate/requiresUpdate.test.tsx
@@ -423,7 +423,7 @@ describe('OfficeHome sent for update tab related tests', () => {
         { store, history, apolloClient: client }
       )
       testComponent = createdTestComponent
-      setScopes(REGISTRAR_DEFAULT_SCOPES, store)
+      setScopes(REGISTRATION_AGENT_DEFAULT_SCOPES, store)
     })
 
     it('downloads the declaration after clicking download button', async () => {
diff --git a/packages/client/src/views/OfficeHome/sentForReview/SentForReview.tsx b/packages/client/src/views/OfficeHome/sentForReview/SentForReview.tsx
index 1f799297cd..8b3dbe669a 100644
--- a/packages/client/src/views/OfficeHome/sentForReview/SentForReview.tsx
+++ b/packages/client/src/views/OfficeHome/sentForReview/SentForReview.tsx
@@ -53,7 +53,7 @@ import { WQContentWrapper } from '@client/views/OfficeHome/WQContentWrapper'
 import { DownloadButton } from '@client/components/interface/DownloadButton'
 import { DownloadAction } from '@client/forms'
 import { Downloaded } from '@opencrvs/components/lib/icons/Downloaded'
-import { RegStatus, Scope } from '@client/utils/gateway'
+import { RegStatus, Scope, SCOPES } from '@client/utils/gateway'
 const ToolTipContainer = styled.span`
   text-align: center;
 `
@@ -86,7 +86,10 @@ class SentForReviewComponent extends React.Component<
   IApprovalTabState
 > {
   pageSize = 10
-  isFieldAgent = this.props.scope?.includes('declare')
+
+  canSendForApproval = this.props.scope?.includes(
+    SCOPES.RECORD_SUBMIT_FOR_APPROVAL
+  )
 
   constructor(props: IApprovalTabProps) {
     super(props)
@@ -146,9 +149,9 @@ class SentForReviewComponent extends React.Component<
           sortFunction: this.onColumnClick
         },
         {
-          label: this.isFieldAgent
-            ? this.props.intl.formatMessage(navigationMessages.sentForReview)
-            : this.props.intl.formatMessage(navigationMessages.approvals),
+          label: this.canSendForApproval
+            ? this.props.intl.formatMessage(navigationMessages.approvals)
+            : this.props.intl.formatMessage(navigationMessages.sentForReview),
           width: 18,
           key: COLUMNS.SENT_FOR_APPROVAL,
           isSorted: this.state.sortedCol === COLUMNS.SENT_FOR_APPROVAL,
@@ -221,7 +224,7 @@ class SentForReviewComponent extends React.Component<
         ''
 
       let sentForApproval
-      if (this.isFieldAgent) {
+      if (!this.canSendForApproval) {
         sentForApproval =
           getPreviousOperationDateByOperationType(
             reg.operationHistories,
@@ -257,9 +260,9 @@ class SentForReviewComponent extends React.Component<
         <NameContainer
           id={`name_${index}`}
           onClick={() =>
-            this.isFieldAgent
-              ? this.props.goToDeclarationRecordAudit('reviewTab', reg.id)
-              : this.props.goToDeclarationRecordAudit('approvalTab', reg.id)
+            this.canSendForApproval
+              ? this.props.goToDeclarationRecordAudit('approvalTab', reg.id)
+              : this.props.goToDeclarationRecordAudit('reviewTab', reg.id)
           }
         >
           {reg.name}
@@ -268,9 +271,9 @@ class SentForReviewComponent extends React.Component<
         <NoNameContainer
           id={`name_${index}`}
           onClick={() =>
-            this.isFieldAgent
-              ? this.props.goToDeclarationRecordAudit('reviewTab', reg.id)
-              : this.props.goToDeclarationRecordAudit('approvalTab', reg.id)
+            this.canSendForApproval
+              ? this.props.goToDeclarationRecordAudit('approvalTab', reg.id)
+              : this.props.goToDeclarationRecordAudit('reviewTab', reg.id)
           }
         >
           {intl.formatMessage(constantsMessages.noNameProvided)}
@@ -336,12 +339,12 @@ class SentForReviewComponent extends React.Component<
       this.props.queryData.data.totalItems > pageSize
         ? true
         : false
-    const noResultText = this.isFieldAgent
-      ? intl.formatMessage(wqMessages.noRecordsSentForReview)
-      : intl.formatMessage(wqMessages.noRecordsSentForApproval)
-    const title = this.isFieldAgent
-      ? intl.formatMessage(navigationMessages.sentForReview)
-      : intl.formatMessage(navigationMessages.approvals)
+    const noResultText = this.canSendForApproval
+      ? intl.formatMessage(wqMessages.noRecordsSentForApproval)
+      : intl.formatMessage(wqMessages.noRecordsSentForReview)
+    const title = this.canSendForApproval
+      ? intl.formatMessage(navigationMessages.approvals)
+      : intl.formatMessage(navigationMessages.sentForReview)
     return (
       <WQContentWrapper
         title={title}
diff --git a/packages/client/src/views/RecordAudit/ActionButtons.tsx b/packages/client/src/views/RecordAudit/ActionButtons.tsx
index 2456b47b58..cfe0f58203 100644
--- a/packages/client/src/views/RecordAudit/ActionButtons.tsx
+++ b/packages/client/src/views/RecordAudit/ActionButtons.tsx
@@ -179,7 +179,7 @@ export const ShowPrintButton = ({
   const { id, type } = declaration || {}
   const { hasScope } = usePermissions()
 
-  const showActionButton = hasScope(SCOPES.RECORD_PRINT_RECORDS)
+  const showActionButton = hasScope(SCOPES.RECORD_REGISTRATION_PRINT)
   const isDownloaded =
     draft?.downloadStatus === DOWNLOAD_STATUS.DOWNLOADED ||
     draft?.submissionStatus === SUBMISSION_STATUS.DRAFT
@@ -270,10 +270,13 @@ export const ShowReviewButton = ({
   goToPage
 }: CMethodParams) => {
   const { id, type } = declaration || {}
-  const { hasScope } = usePermissions()
+  const { hasAnyScope } = usePermissions()
 
   const isDownloaded = draft?.downloadStatus === DOWNLOAD_STATUS.DOWNLOADED
-  const showActionButton = hasScope(SCOPES.RECORD_DECLARATION_REVIEW)
+  const showActionButton = hasAnyScope([
+    SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+    SCOPES.RECORD_SUBMIT_FOR_UPDATES
+  ])
 
   if (type && showActionButton) {
     if (!isDownloaded) {
diff --git a/packages/client/src/views/RecordAudit/RecordAudit.tsx b/packages/client/src/views/RecordAudit/RecordAudit.tsx
index 44f4407dd1..9e97f591f4 100644
--- a/packages/client/src/views/RecordAudit/RecordAudit.tsx
+++ b/packages/client/src/views/RecordAudit/RecordAudit.tsx
@@ -314,7 +314,7 @@ function RecordAuditBody({
 
   const isOnline = useOnlineStatus()
   const dispatch = useDispatch()
-  const { hasScope } = usePermissions()
+  const { hasScope, hasAnyScope } = usePermissions()
 
   if (!registerForm.registerForm || !declaration.type) return <></>
 
@@ -429,7 +429,10 @@ function RecordAuditBody({
       SUBMISSION_STATUS.VALIDATED,
       SUBMISSION_STATUS.CORRECTION_REQUESTED
     ].includes(declaration.status as SUBMISSION_STATUS) &&
-    hasScope(SCOPES.RECORD_DECLARATION_REVIEW)
+    hasAnyScope([
+      SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+      SCOPES.RECORD_SUBMIT_FOR_UPDATES
+    ])
   ) {
     actions.push(
       ShowReviewButton({
diff --git a/packages/client/src/views/RegisterForm/PreviewForm.test.tsx b/packages/client/src/views/RegisterForm/PreviewForm.test.tsx
index ed0ec902d7..da536b27bd 100644
--- a/packages/client/src/views/RegisterForm/PreviewForm.test.tsx
+++ b/packages/client/src/views/RegisterForm/PreviewForm.test.tsx
@@ -16,7 +16,6 @@ import {
   waitForReady,
   flushPromises,
   setScopes,
-  REGISTRATION_AGENT_DEFAULT_SCOPES,
   REGISTRAR_DEFAULT_SCOPES
 } from '@client/tests/util'
 import {
@@ -33,11 +32,10 @@ import {
 import { ReactWrapper } from 'enzyme'
 import { History } from 'history'
 import { Store } from 'redux'
-import { Event } from '@client/utils/gateway'
+import { Event, SCOPES } from '@client/utils/gateway'
 import { v4 as uuid } from 'uuid'
 // eslint-disable-next-line no-restricted-imports
 import * as ReactApollo from '@apollo/client/react'
-import { checkAuth } from '@opencrvs/client/src/profile/profileActions'
 import { waitForElement } from '@client/tests/wait-for-element'
 import {
   birthDraftData,
@@ -57,7 +55,7 @@ describe('when user is previewing the form data', () => {
     app = testApp.app
     history = testApp.history
     store = testApp.store
-    setScopes(REGISTRATION_AGENT_DEFAULT_SCOPES, store)
+    setScopes(REGISTRAR_DEFAULT_SCOPES, store)
     await waitForReady(app)
   })
 
@@ -69,11 +67,12 @@ describe('when user is previewing the form data', () => {
 
     beforeEach(async () => {
       getItem.mockReturnValue(registerScopeToken)
-      store.dispatch(checkAuth())
+
       await flushPromises()
       const data = deathReviewDraftData
 
       customDraft = { id: uuid(), data, review: true, event: Event.Death }
+
       store.dispatch(storeDeclaration(customDraft))
 
       history.replace(
@@ -89,6 +88,7 @@ describe('when user is previewing the form data', () => {
 
     it('successfully submits the review form', async () => {
       vi.doMock('@apollo/client/react', () => ({ default: ReactApollo }))
+
       app.update().find('#registerDeclarationBtn').hostNodes().simulate('click')
       app.update()
       app.update().find('#submit_confirm').hostNodes().simulate('click')
@@ -127,6 +127,11 @@ describe('when user is previewing the form data', () => {
         event: Event.Birth,
         submissionStatus: SUBMISSION_STATUS[SUBMISSION_STATUS.DRAFT]
       }
+      setScopes(
+        [SCOPES.RECORD_DECLARE_BIRTH, SCOPES.RECORD_SUBMIT_FOR_REVIEW],
+        store
+      )
+      await flushPromises()
       store.dispatch(storeDeclaration(customDraft))
 
       history.replace(
@@ -145,19 +150,19 @@ describe('when user is previewing the form data', () => {
       })
 
       it('check whether submit button is enabled or not', () => {
-        expect(app.find('#submit_form').hostNodes().prop('disabled')).toBe(
-          false
-        )
+        expect(
+          app.find('#submit_for_review').hostNodes().prop('disabled')
+        ).toBe(false)
       })
       describe('All sections visited', () => {
         it('Should be able to click SEND FOR REVIEW Button', () => {
-          expect(app.find('#submit_form').hostNodes().prop('disabled')).toBe(
-            false
-          )
+          expect(
+            app.find('#submit_for_review').hostNodes().prop('disabled')
+          ).toBe(false)
         })
         describe('button clicked', () => {
           beforeEach(async () => {
-            app.find('#submit_form').hostNodes().simulate('click')
+            app.find('#submit_for_review').hostNodes().simulate('click')
           })
 
           it('confirmation screen should show up', () => {
@@ -223,7 +228,7 @@ describe('when user is previewing the form data', () => {
 
     beforeEach(async () => {
       getItem.mockReturnValue(registerScopeToken)
-      store.dispatch(checkAuth())
+      //setScopes(REGISTRAR_DEFAULT_SCOPES, store)
       await flushPromises()
       const data = marriageReviewDraftData
 
@@ -245,8 +250,6 @@ describe('when user is previewing the form data', () => {
 
       app.find('#rejectDeclarationBtn').hostNodes().simulate('click')
 
-      // app.find('#rejectionReasonduplicate').hostNodes().simulate('change')
-
       app
         .find('#rejectionCommentForHealthWorker')
         .hostNodes()
diff --git a/packages/client/src/views/RegisterForm/RegisterForm.test.tsx b/packages/client/src/views/RegisterForm/RegisterForm.test.tsx
index 1a18d61be2..751da4159e 100644
--- a/packages/client/src/views/RegisterForm/RegisterForm.test.tsx
+++ b/packages/client/src/views/RegisterForm/RegisterForm.test.tsx
@@ -20,7 +20,8 @@ import {
   createTestStore,
   flushPromises,
   userDetails,
-  mockOfflineData
+  mockOfflineData,
+  setScopes
 } from '@client/tests/util'
 import { RegisterForm } from '@client/views/RegisterForm/RegisterForm'
 import { ReactWrapper } from 'enzyme'
@@ -43,11 +44,10 @@ import {
   DRAFT_MARRIAGE_FORM_PAGE
 } from '@opencrvs/client/src/navigation/routes'
 import { IFormData } from '@opencrvs/client/src/forms'
-import { Event, RegStatus } from '@client/utils/gateway'
+import { Event, RegStatus, SCOPES } from '@client/utils/gateway'
 import { draftToGqlTransformer } from '@client/transformer'
 import { IForm } from '@client/forms'
 import { clone, cloneDeep } from 'lodash'
-import * as profileSelectors from '@client/profile/profileSelectors'
 import { getRegisterForm } from '@client/forms/register/declaration-selectors'
 import { waitForElement } from '@client/tests/wait-for-element'
 import { History } from 'history'
@@ -248,7 +248,7 @@ describe('when user is in the register form for marriage event', () => {
   })
 })
 
-describe('when user is in the register form preview section', () => {
+describe('when user is in the register form preview section and has the submit complete scope', () => {
   let component: ReactWrapper<{}, {}>
   let store: AppStore
   let history: History
@@ -282,6 +282,7 @@ describe('when user is in the register form preview section', () => {
         }
       }
     }
+    setScopes([SCOPES.RECORD_SUBMIT_INCOMPLETE], store)
     store.dispatch(setInitialDeclarations())
     store.dispatch(storeDeclaration(draft))
 
@@ -310,18 +311,18 @@ describe('when user is in the register form preview section', () => {
   })
 
   it('submit button will be enabled when even if form is not fully filled-up', () => {
-    expect(component.find('#submit_form').hostNodes().prop('disabled')).toBe(
-      false
-    )
+    expect(
+      component.find('#submit_incomplete').hostNodes().prop('disabled')
+    ).toBe(false)
   })
 
   it('Displays submit confirm modal when submit button is clicked', () => {
-    component.find('#submit_form').hostNodes().simulate('click')
+    component.find('#submit_incomplete').hostNodes().simulate('click')
 
     expect(component.find('#submit_confirm').hostNodes()).toHaveLength(1)
   })
 
-  describe('User in the Preview section for submitting the Form', () => {
+  describe('User in the Preview section for submitting the Form and has the submit for review scope', () => {
     beforeEach(async () => {
       // @ts-ignore
       const nDeclaration = createReviewDeclaration(
@@ -330,6 +331,7 @@ describe('when user is in the register form preview section', () => {
         Event.Birth
       )
       nDeclaration.submissionStatus = SUBMISSION_STATUS[SUBMISSION_STATUS.DRAFT]
+      setScopes([SCOPES.RECORD_SUBMIT_FOR_REVIEW], store)
       store.dispatch(setInitialDeclarations())
       store.dispatch(storeDeclaration(nDeclaration))
 
@@ -358,7 +360,7 @@ describe('when user is in the register form preview section', () => {
     })
 
     it('should be able to submit the form', () => {
-      component.find('#submit_form').hostNodes().simulate('click')
+      component.find('#submit_for_review').hostNodes().simulate('click')
       component.update()
 
       const cancelBtn = component.find('#cancel-btn').hostNodes()
@@ -368,9 +370,9 @@ describe('when user is in the register form preview section', () => {
       component.update()
 
       expect(component.find('#submit_confirm').hostNodes().length).toEqual(0)
-      expect(component.find('#submit_form').hostNodes().length).toEqual(1)
+      expect(component.find('#submit_for_review').hostNodes().length).toEqual(1)
 
-      component.find('#submit_form').hostNodes().simulate('click')
+      component.find('#submit_for_review').hostNodes().simulate('click')
       component.update()
 
       const confirmBtn = component.find('#submit_confirm').hostNodes()
@@ -393,10 +395,10 @@ describe('when user is in the register form review section', () => {
       mockDeclarationData,
       Event.Birth
     )
+    setScopes([SCOPES.RECORD_REGISTER], store)
     store.dispatch(setInitialDeclarations())
     store.dispatch(storeDeclaration(declaration))
     const mock: any = vi.fn()
-    vi.spyOn(profileSelectors, 'getScope').mockReturnValue(['register'])
 
     const form = await getReviewFormFromStore(store, Event.Birth)
 
@@ -445,10 +447,10 @@ describe('when user is in the register form from review edit', () => {
       mockDeclarationData,
       Event.Birth
     )
+    setScopes([SCOPES.RECORD_REGISTER], store)
     store.dispatch(setInitialDeclarations())
     store.dispatch(storeDeclaration(declaration))
     const mock: any = vi.fn()
-    vi.spyOn(profileSelectors, 'getScope').mockReturnValue(['register'])
 
     const form = await getReviewFormFromStore(store, Event.Birth)
 
@@ -499,10 +501,10 @@ describe('when user is in the register form from sent for review edit', () => {
       Event.Birth,
       RegStatus.Declared
     )
+
     store.dispatch(setInitialDeclarations())
     store.dispatch(storeDeclaration(declaration))
     const mock: any = vi.fn()
-    vi.spyOn(profileSelectors, 'getScope').mockReturnValue(['register'])
 
     const form = await getReviewFormFromStore(store, Event.Birth)
 
@@ -542,6 +544,7 @@ describe('when user is in the register form from sent for review edit', () => {
     )
     expect(saveDraftConfirmationModal.hostNodes()).toHaveLength(1)
   })
+
   it('clicking save confirm saves the draft', async () => {
     const DRAFT_MODIFY_TIME = 1582525379383
     Date.now = vi.fn(() => DRAFT_MODIFY_TIME)
@@ -598,12 +601,11 @@ describe('When user is in Preview section death event', () => {
       mockDeathDeclarationData,
       Event.Death
     )
+    setScopes([SCOPES.RECORD_SUBMIT_FOR_REVIEW], store)
     deathDraft.submissionStatus = SUBMISSION_STATUS[SUBMISSION_STATUS.DRAFT]
     store.dispatch(setInitialDeclarations())
     store.dispatch(storeDeclaration(deathDraft))
 
-    vi.spyOn(profileSelectors, 'getScope').mockReturnValue(['declare'])
-
     deathForm = await getRegisterFormFromStore(store, Event.Death)
     const nTestComponent = await createTestComponent(
       // @ts-ignore
@@ -655,7 +657,7 @@ describe('When user is in Preview section death event', () => {
   })
 
   it('Should be able to submit the form', () => {
-    component.find('#submit_form').hostNodes().simulate('click')
+    component.find('#submit_for_review').hostNodes().simulate('click')
 
     const confirmBtn = component.find('#submit_confirm').hostNodes()
     expect(confirmBtn.length).toEqual(1)
@@ -665,6 +667,7 @@ describe('When user is in Preview section death event', () => {
 
     expect(history.location.pathname).toBe(HOME)
   })
+
   it('Check if death location as hospital is parsed properly', () => {
     const hospitalLocatioMockDeathDeclarationData = clone(
       mockDeathDeclarationData
@@ -749,6 +752,8 @@ describe('When user is in Preview section death event in offline mode', () => {
       mockDeathDeclarationData,
       Event.Death
     )
+
+    setScopes([SCOPES.RECORD_SUBMIT_FOR_REVIEW], store)
     deathDraft.submissionStatus = SUBMISSION_STATUS[SUBMISSION_STATUS.DRAFT]
     store.dispatch(setInitialDeclarations())
     store.dispatch(storeDeclaration(deathDraft))
@@ -780,7 +785,7 @@ describe('When user is in Preview section death event in offline mode', () => {
   })
 
   it('Should be able to submit the form', async () => {
-    component.find('#submit_form').hostNodes().simulate('click')
+    component.find('#submit_for_review').hostNodes().simulate('click')
 
     const confirmBtn = component.find('#submit_confirm').hostNodes()
     expect(confirmBtn.length).toEqual(1)
@@ -817,12 +822,12 @@ describe('When user is in Preview section marriage event', () => {
       mockDeathDeclarationData,
       Event.Marriage
     )
+
+    setScopes([SCOPES.RECORD_SUBMIT_FOR_REVIEW], store)
     marriageDraft.submissionStatus = SUBMISSION_STATUS[SUBMISSION_STATUS.DRAFT]
     store.dispatch(setInitialDeclarations())
     store.dispatch(storeDeclaration(marriageDraft))
 
-    vi.spyOn(profileSelectors, 'getScope').mockReturnValue(['declare'])
-
     marriageForm = await getRegisterFormFromStore(store, Event.Marriage)
     const nTestComponent = await createTestComponent(
       // @ts-ignore
@@ -874,7 +879,7 @@ describe('When user is in Preview section marriage event', () => {
   })
 
   it('Should be able to submit the form', () => {
-    component.find('#submit_form').hostNodes().simulate('click')
+    component.find('#submit_for_review').hostNodes().simulate('click')
 
     const confirmBtn = component.find('#submit_confirm').hostNodes()
     expect(confirmBtn.length).toEqual(1)
diff --git a/packages/client/src/views/RegisterForm/RegisterForm.tsx b/packages/client/src/views/RegisterForm/RegisterForm.tsx
index 36151fc0c0..d18ae477d8 100644
--- a/packages/client/src/views/RegisterForm/RegisterForm.tsx
+++ b/packages/client/src/views/RegisterForm/RegisterForm.tsx
@@ -58,7 +58,7 @@ import {
   CorrectionSection,
   SubmissionAction
 } from '@client/forms'
-import { Event, RegStatus, Scope } from '@client/utils/gateway'
+import { Event, RegStatus, Scope, SCOPES } from '@client/utils/gateway'
 import {
   goBack as goBackAction,
   goToCertificateCorrection,
@@ -687,11 +687,19 @@ class RegisterFormView extends React.Component<FullProps, State> {
   }
 
   userHasRegisterScope() {
-    return this.props.scope && this.props.scope.includes('register')
+    return this.props.scope && this.props.scope.includes(SCOPES.RECORD_REGISTER)
   }
 
   userHasValidateScope() {
-    return this.props.scope && this.props.scope.includes('validate')
+    const validateScopes = [
+      SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+      SCOPES.RECORD_SUBMIT_FOR_UPDATES
+    ] as Scope[]
+
+    return (
+      this.props.scope &&
+      this.props.scope.some((x) => validateScopes.includes(x))
+    )
   }
 
   componentDidMount() {
@@ -860,13 +868,13 @@ class RegisterFormView extends React.Component<FullProps, State> {
 
   onSaveAsDraftClicked = async () => {
     const { declaration } = this.props
-    const isRegistrarOrRegistrationAgent =
+    const canApproveOrRegister =
       this.userHasRegisterScope() || this.userHasValidateScope()
     const isConfirmationModalApplicable =
       declaration.registrationStatus === DECLARED ||
       declaration.registrationStatus === VALIDATED ||
       declaration.registrationStatus === REJECTED
-    if (isRegistrarOrRegistrationAgent && isConfirmationModalApplicable) {
+    if (canApproveOrRegister && isConfirmationModalApplicable) {
       this.toggleConfirmationModal()
     } else {
       this.writeDeclarationAndGoToHome()
diff --git a/packages/client/src/views/RegisterForm/ReviewForm.test.tsx b/packages/client/src/views/RegisterForm/ReviewForm.test.tsx
index 33e8d5f7fc..f5d24e2d65 100644
--- a/packages/client/src/views/RegisterForm/ReviewForm.test.tsx
+++ b/packages/client/src/views/RegisterForm/ReviewForm.test.tsx
@@ -16,7 +16,7 @@ import {
   storeDeclaration
 } from '@opencrvs/client/src/declarations'
 import { IForm, IFormSectionData } from '@opencrvs/client/src/forms'
-import { Event, RegStatus } from '@client/utils/gateway'
+import { Event, RegStatus, SCOPES } from '@client/utils/gateway'
 import { REVIEW_EVENT_PARENT_FORM_PAGE } from '@opencrvs/client/src/navigation/routes'
 import { checkAuth } from '@opencrvs/client/src/profile/profileActions'
 import { RegisterForm } from '@opencrvs/client/src/views/RegisterForm/RegisterForm'
@@ -28,7 +28,9 @@ import {
   mockUserResponseWithName,
   getReviewFormFromStore,
   createTestStore,
-  mockDeathDeclarationData
+  mockDeathDeclarationData,
+  setScopes,
+  REGISTRAR_DEFAULT_SCOPES
 } from '@client/tests/util'
 import { v4 as uuid } from 'uuid'
 import { ReviewForm } from '@client/views/RegisterForm/ReviewForm'
@@ -254,7 +256,7 @@ const mockFetchUserDetails = vi.fn()
 mockFetchUserDetails.mockReturnValue(mockUserResponseWithName)
 queries.fetchUserDetails = mockFetchUserDetails
 describe('ReviewForm tests', () => {
-  const scope = ['register']
+  const scope = [SCOPES.RECORD_REGISTER]
   const mock: any = vi.fn()
   let form: IForm
   let store: AppStore
@@ -264,10 +266,10 @@ describe('ReviewForm tests', () => {
     const testStore = await createTestStore()
     store = testStore.store
     history = testStore.history
+    setScopes(REGISTRAR_DEFAULT_SCOPES, store)
 
     form = await getReviewFormFromStore(store, Event.Birth)
     getItem.mockReturnValue(registerScopeToken)
-    store.dispatch(checkAuth())
   })
 
   it('Shared contact phone number should be set properly', async () => {
diff --git a/packages/client/src/views/RegisterForm/ReviewForm.tsx b/packages/client/src/views/RegisterForm/ReviewForm.tsx
index d2a7cbca2f..9c4b9b6b75 100644
--- a/packages/client/src/views/RegisterForm/ReviewForm.tsx
+++ b/packages/client/src/views/RegisterForm/ReviewForm.tsx
@@ -23,7 +23,7 @@ import { connect } from 'react-redux'
 import { getReviewForm } from '@opencrvs/client/src/forms/register/review-selectors'
 import { IDeclaration } from '@opencrvs/client/src/declarations'
 import { getScope } from '@client/profile/profileSelectors'
-import { Event, Scope } from '@client/utils/gateway'
+import { Event, Scope, SCOPES } from '@client/utils/gateway'
 
 import {
   REGISTRAR_HOME_TAB,
@@ -58,11 +58,19 @@ const ErrorText = styled.div`
 
 class ReviewFormView extends React.Component<IProps> {
   userHasRegisterScope() {
-    return this.props.scope && this.props.scope.includes('register')
+    return this.props.scope && this.props.scope.includes(SCOPES.RECORD_REGISTER)
   }
 
   userHasValidateScope() {
-    return this.props.scope && this.props.scope.includes('validate')
+    const validateScopes = [
+      SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+      SCOPES.RECORD_SUBMIT_FOR_UPDATES
+    ] as Scope[]
+
+    return (
+      this.props.scope &&
+      this.props.scope.some((scope) => validateScopes.includes(scope))
+    )
   }
 
   render() {
diff --git a/packages/client/src/views/RegisterForm/duplicate/DuplicateFormTabs.test.tsx b/packages/client/src/views/RegisterForm/duplicate/DuplicateFormTabs.test.tsx
index 88e13f5592..56a8db98c3 100644
--- a/packages/client/src/views/RegisterForm/duplicate/DuplicateFormTabs.test.tsx
+++ b/packages/client/src/views/RegisterForm/duplicate/DuplicateFormTabs.test.tsx
@@ -12,7 +12,8 @@ import * as React from 'react'
 import {
   createTestComponent,
   getReviewFormFromStore,
-  createTestStore
+  createTestStore,
+  setScopes
 } from '@client/tests/util'
 import { RegisterForm } from '@client/views/RegisterForm/RegisterForm'
 import { ReactWrapper } from 'enzyme'
@@ -23,8 +24,7 @@ import {
 } from '@client/declarations'
 import { v4 as uuid } from 'uuid'
 import { REVIEW_EVENT_PARENT_FORM_PAGE } from '@opencrvs/client/src/navigation/routes'
-import { Event } from '@client/utils/gateway'
-import * as profileSelectors from '@client/profile/profileSelectors'
+import { Event, SCOPES } from '@client/utils/gateway'
 import { vi } from 'vitest'
 import { ViewRecordQueries } from '@client/views/ViewRecord/query'
 
@@ -1169,7 +1169,7 @@ describe('when user is in the register form review section', () => {
     store.dispatch(setInitialDeclarations())
     store.dispatch(storeDeclaration(declaration))
     const mock: any = vi.fn()
-    vi.spyOn(profileSelectors, 'getScope').mockReturnValue(['register'])
+    setScopes([SCOPES.RECORD_REGISTER], store)
 
     const form = await getReviewFormFromStore(store, Event.Birth)
 
diff --git a/packages/client/src/views/RegisterForm/review/ReviewSection.test.tsx b/packages/client/src/views/RegisterForm/review/ReviewSection.test.tsx
index 60b2a561a6..87f0e66fba 100644
--- a/packages/client/src/views/RegisterForm/review/ReviewSection.test.tsx
+++ b/packages/client/src/views/RegisterForm/review/ReviewSection.test.tsx
@@ -24,9 +24,12 @@ import {
   TEXT
   // MarriageSection
 } from '@client/forms'
-import { Event as DeclarationEvent, RegStatus } from '@client/utils/gateway'
+import {
+  Event as DeclarationEvent,
+  RegStatus,
+  SCOPES
+} from '@client/utils/gateway'
 import { REVIEW_EVENT_PARENT_FORM_PAGE } from '@client/navigation/routes'
-import * as profileSelectors from '@client/profile/profileSelectors'
 import { createStore } from '@client/store'
 import {
   createTestComponent,
@@ -35,6 +38,7 @@ import {
   mockOfflineData,
   mockOfflineDataDispatch,
   resizeWindow,
+  setScopes,
   userDetails
 } from '@client/tests/util'
 import {
@@ -231,7 +235,7 @@ describe('when in device of large viewport', () => {
   describe('when user is in the review page for rejected birth declaration', () => {
     let reviewSectionComponent: ReactWrapper<{}, {}>
     beforeEach(async () => {
-      vi.spyOn(profileSelectors, 'getScope').mockReturnValue(['register'])
+      setScopes([SCOPES.RECORD_REGISTER], store)
       const testComponent = await createTestComponent(
         <ReviewSection
           pageRoute={REVIEW_EVENT_PARENT_FORM_PAGE}
@@ -307,7 +311,10 @@ describe('when in device of large viewport', () => {
   describe('when user is in the review page to validate birth declaration', () => {
     let reviewSectionComponent: ReactWrapper<{}, {}>
     beforeEach(async () => {
-      vi.spyOn(profileSelectors, 'getScope').mockReturnValue(['validate'])
+      setScopes(
+        [SCOPES.RECORD_SUBMIT_FOR_APPROVAL, SCOPES.RECORD_SUBMIT_FOR_UPDATES],
+        store
+      )
       const testComponent = await createTestComponent(
         <ReviewSection
           form={form}
@@ -372,7 +379,7 @@ describe('when in device of large viewport', () => {
     })
 
     beforeEach(async () => {
-      vi.spyOn(profileSelectors, 'getScope').mockReturnValue(['register'])
+      setScopes([SCOPES.RECORD_REGISTER], store)
       const form = {
         sections: [
           {
@@ -498,7 +505,7 @@ describe('when in device of large viewport', () => {
     })
 
     beforeEach(async () => {
-      vi.spyOn(profileSelectors, 'getScope').mockReturnValue(['register'])
+      setScopes([SCOPES.RECORD_REGISTER], store)
       const form = {
         sections: [
           {
@@ -618,7 +625,7 @@ describe('when in device of large viewport', () => {
     })
 
     beforeEach(async () => {
-      vi.spyOn(profileSelectors, 'getScope').mockReturnValue(['register'])
+      setScopes([SCOPES.RECORD_REGISTER], store)
       const form = {
         sections: [
           {
@@ -786,7 +793,7 @@ describe('when in device of small viewport', () => {
   beforeEach(async () => {
     userAgentMock = vi.spyOn(window.navigator, 'userAgent', 'get')
     userAgentMock.mockReturnValue('Android')
-    vi.spyOn(profileSelectors, 'getScope').mockReturnValue(['register'])
+    setScopes([SCOPES.RECORD_REGISTER], store)
     const form = {
       sections: [
         {
diff --git a/packages/client/src/views/RegisterForm/review/ReviewSection.tsx b/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
index 36641347f6..9aebef93b2 100644
--- a/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
+++ b/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
@@ -73,7 +73,7 @@ import {
   DIVIDER,
   HIDDEN
 } from '@client/forms'
-import { Event, RegStatus, Scope } from '@client/utils/gateway'
+import { Event, RegStatus, Scope, SCOPES } from '@client/utils/gateway'
 import {
   getConditionalActionsForField,
   getListOfLocations,
@@ -841,15 +841,9 @@ class ReviewSectionComp extends React.Component<FullProps, State> {
 
   userHasRegisterScope() {
     if (this.props.scope) {
-      return this.props.scope && this.props.scope.includes('register')
-    } else {
-      return false
-    }
-  }
-
-  userHasValidateScope() {
-    if (this.props.scope) {
-      return this.props.scope && this.props.scope.includes('validate')
+      return (
+        this.props.scope && this.props.scope.includes(SCOPES.RECORD_REGISTER)
+      )
     } else {
       return false
     }
@@ -1980,8 +1974,6 @@ class ReviewSectionComp extends React.Component<FullProps, State> {
                         <ReviewAction
                           completeDeclaration={isComplete}
                           totalFileSizeExceeded={totalFileSizeExceeded}
-                          declarationToBeValidated={this.userHasValidateScope()}
-                          declarationToBeRegistered={this.userHasRegisterScope()}
                           alreadyRejectedDeclaration={
                             this.props.draft.registrationStatus === REJECTED
                           }
diff --git a/packages/client/src/views/SearchResult/SearchResult.tsx b/packages/client/src/views/SearchResult/SearchResult.tsx
index 59dff6bf7f..e175fed49b 100644
--- a/packages/client/src/views/SearchResult/SearchResult.tsx
+++ b/packages/client/src/views/SearchResult/SearchResult.tsx
@@ -43,7 +43,7 @@ import { SEARCH_EVENTS } from '@client/search/queries'
 import { transformData } from '@client/search/transformer'
 import { IStoreState } from '@client/store'
 import { SEARCH_RESULT_SORT } from '@client/utils/constants'
-import { Scope, SearchEventsQuery } from '@client/utils/gateway'
+import { Scope, SCOPES, SearchEventsQuery } from '@client/utils/gateway'
 import { getUserLocation, UserDetails } from '@client/utils/userUtils'
 import { ITheme } from '@opencrvs/components/lib/theme'
 import styled, { withTheme } from 'styled-components'
@@ -216,15 +216,38 @@ class SearchResultView extends React.Component<
   }
 
   userHasRegisterScope() {
-    return this.props.scope && this.props.scope.includes('register')
+    return this.props.scope && this.props.scope.includes(SCOPES.RECORD_REGISTER)
   }
 
   userHasValidateScope() {
-    return this.props.scope && this.props.scope.includes('validate')
+    const validateScopes = [
+      SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
+      SCOPES.RECORD_SUBMIT_FOR_UPDATES
+    ] as Scope[]
+
+    return (
+      this.props.scope &&
+      this.props.scope.some((scope) => validateScopes.includes(scope))
+    )
+  }
+
+  hasIssueScope() {
+    return (
+      this.props.scope &&
+      this.props.scope.includes(SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES)
+    )
   }
 
-  userHasCertifyScope() {
-    return this.props.scope && this.props.scope.includes('certify')
+  hasPrintScope() {
+    const printScopes = [
+      SCOPES.RECORD_PRINT_CERTIFIED_COPIES,
+      SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES
+    ] as Scope[]
+
+    return (
+      this.props.scope &&
+      this.props.scope.some((scope) => printScopes.includes(scope))
+    )
   }
 
   canSearchAnywhere() {
@@ -296,7 +319,7 @@ class SearchResultView extends React.Component<
         if (this.state.width > this.props.theme.grid.breakpoints.lg) {
           if (
             (declarationIsRegistered || declarationIsIssued) &&
-            this.userHasCertifyScope()
+            this.hasPrintScope()
           ) {
             actions.push({
               label: this.props.intl.formatMessage(buttonMessages.print),
@@ -308,7 +331,7 @@ class SearchResultView extends React.Component<
               },
               disabled: downloadStatus !== DOWNLOAD_STATUS.DOWNLOADED
             })
-          } else if (declarationIsCertified && this.userHasCertifyScope()) {
+          } else if (declarationIsCertified && this.hasIssueScope()) {
             actions.push({
               label: this.props.intl.formatMessage(buttonMessages.issue),
               handler: (
diff --git a/packages/client/src/workqueue/reducer.ts b/packages/client/src/workqueue/reducer.ts
index 116b78f38c..4486657000 100644
--- a/packages/client/src/workqueue/reducer.ts
+++ b/packages/client/src/workqueue/reducer.ts
@@ -43,6 +43,7 @@ import {
   UPDATE_REGISTRAR_WORKQUEUE_SUCCESS,
   UPDATE_WORKQUEUE_PAGINATION
 } from './actions'
+import { Scope, SCOPES } from '@client/utils/gateway'
 
 export interface IQueryData {
   inProgressTab: GQLEventSearchResultSet
@@ -154,7 +155,16 @@ async function getFilteredDeclarations(
   // for other agents, check if the status of workqueue declaration
   // has changed and if that declaration is saved in the store
   // also declaration should not show as unassigned when it is being submitted
-  if (scope?.includes('declare'))
+  const declareScopes = [
+    SCOPES.RECORD_DECLARE_BIRTH,
+    SCOPES.RECORD_DECLARE_DEATH,
+    SCOPES.RECORD_DECLARE_MARRIAGE,
+    SCOPES.RECORD_DECLARE_BIRTH_MY_JURISDICTION,
+    SCOPES.RECORD_DECLARE_DEATH_MY_JURISDICTION,
+    SCOPES.RECORD_DECLARE_MARRIAGE_MY_JURISDICTION
+  ] as Scope[]
+
+  if (scope?.some((x) => declareScopes.includes(x)))
     return {
       currentlyDownloadedDeclarations: savedDeclarations,
       unassignedDeclarations: []
@@ -343,7 +353,7 @@ async function getWorkqueueData(
 
   const scope = getScope(state)
   const reviewStatuses =
-    scope && scope.includes('register')
+    scope && scope.includes(SCOPES.RECORD_REGISTER)
       ? [
           EVENT_STATUS.DECLARED,
           EVENT_STATUS.VALIDATED,
diff --git a/packages/commons/src/authentication.ts b/packages/commons/src/authentication.ts
index d0d44d24db..c630844600 100644
--- a/packages/commons/src/authentication.ts
+++ b/packages/commons/src/authentication.ts
@@ -18,7 +18,6 @@ export { scopes, Scope, SCOPES } from './scopes'
 /** All the scopes system/integration can be assigned to */
 export const SYSTEM_INTEGRATION_SCOPES = {
   recordsearch: SCOPES.RECORDSEARCH,
-  declare: SCOPES.DECLARE,
   webhook: SCOPES.WEBHOOK,
   nationalId: SCOPES.NATIONALID
 } as const
@@ -38,9 +37,6 @@ export const DEFAULT_ROLES_DEFINITION = [
       id: 'userRole.fieldAgent'
     },
     scopes: [
-      // old scope for bw compability
-      SCOPES.DECLARE,
-
       // new scopes
       SCOPES.RECORD_DECLARE_BIRTH,
       SCOPES.RECORD_DECLARE_DEATH,
@@ -63,19 +59,17 @@ export const DEFAULT_ROLES_DEFINITION = [
       id: 'userRole.registrationAgent'
     },
     scopes: [
-      SCOPES.VALIDATE,
       SCOPES.PERFORMANCE,
       SCOPES.CERTIFY,
       SCOPES.RECORD_DECLARE_BIRTH,
       SCOPES.RECORD_DECLARE_DEATH,
       SCOPES.RECORD_DECLARE_MARRIAGE,
-      SCOPES.RECORD_DECLARATION_REVIEW,
       SCOPES.RECORD_SUBMIT_FOR_APPROVAL,
       SCOPES.RECORD_SUBMIT_FOR_UPDATES,
       SCOPES.RECORD_DECLARATION_ARCHIVE,
       SCOPES.RECORD_DECLARATION_REINSTATE,
       SCOPES.RECORD_REGISTRATION_REQUEST_CORRECTION,
-      SCOPES.RECORD_PRINT_RECORDS,
+      SCOPES.RECORD_REGISTRATION_PRINT,
       SCOPES.RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS,
       SCOPES.RECORD_EXPORT_RECORDS,
       SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES,
@@ -83,7 +77,7 @@ export const DEFAULT_ROLES_DEFINITION = [
       SCOPES.RECORD_CREATE_COMMENTS,
       SCOPES.PERFORMANCE_READ,
       SCOPES.PERFORMANCE_READ_DASHBOARDS,
-      SCOPES.ORGANISATION_READ,
+      SCOPES.ORGANISATION_READ_LOCATIONS,
       SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE,
       SCOPES.SEARCH_BIRTH,
       SCOPES.SEARCH_DEATH,
@@ -101,20 +95,18 @@ export const DEFAULT_ROLES_DEFINITION = [
       id: 'userRole.localRegistrar'
     },
     scopes: [
-      SCOPES.REGISTER,
       SCOPES.PERFORMANCE,
       SCOPES.CERTIFY,
       SCOPES.RECORD_DECLARE_BIRTH,
       SCOPES.RECORD_DECLARE_DEATH,
       SCOPES.RECORD_DECLARE_MARRIAGE,
-      SCOPES.RECORD_DECLARATION_REVIEW,
       SCOPES.RECORD_SUBMIT_FOR_UPDATES,
       SCOPES.RECORD_REVIEW_DUPLICATES,
       SCOPES.RECORD_DECLARATION_ARCHIVE,
       SCOPES.RECORD_DECLARATION_REINSTATE,
       SCOPES.RECORD_REGISTER,
       SCOPES.RECORD_REGISTRATION_CORRECT,
-      SCOPES.RECORD_PRINT_RECORDS,
+      SCOPES.RECORD_REGISTRATION_PRINT,
       SCOPES.RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS,
       SCOPES.RECORD_EXPORT_RECORDS,
       SCOPES.RECORD_PRINT_ISSUE_CERTIFIED_COPIES,
@@ -122,7 +114,7 @@ export const DEFAULT_ROLES_DEFINITION = [
       SCOPES.RECORD_CREATE_COMMENTS,
       SCOPES.PERFORMANCE_READ,
       SCOPES.PERFORMANCE_READ_DASHBOARDS,
-      SCOPES.ORGANISATION_READ,
+      SCOPES.ORGANISATION_READ_LOCATIONS,
       SCOPES.ORGANISATION_READ_LOCATIONS_MY_OFFICE,
       SCOPES.SEARCH_BIRTH,
       SCOPES.SEARCH_DEATH,
@@ -144,7 +136,6 @@ export const DEFAULT_ROLES_DEFINITION = [
       SCOPES.USER_READ_MY_OFFICE,
       SCOPES.USER_CREATE_MY_JURISDICTION,
       SCOPES.USER_UPDATE_MY_JURISDICTION,
-      SCOPES.ORGANISATION_READ,
       SCOPES.ORGANISATION_READ_LOCATIONS,
       SCOPES.PERFORMANCE_READ,
       SCOPES.PERFORMANCE_READ_DASHBOARDS,
@@ -165,7 +156,6 @@ export const DEFAULT_ROLES_DEFINITION = [
       SCOPES.USER_CREATE,
       SCOPES.USER_READ,
       SCOPES.USER_UPDATE,
-      SCOPES.ORGANISATION_READ,
       SCOPES.ORGANISATION_READ_LOCATIONS,
       SCOPES.PERFORMANCE_READ,
       SCOPES.PERFORMANCE_READ_DASHBOARDS,
@@ -194,7 +184,7 @@ export const DEFAULT_ROLES_DEFINITION = [
 }>
 
 export const DEFAULT_SYSTEM_INTEGRATION_ROLE_SCOPES = {
-  HEALTH: [SCOPES.DECLARE, SCOPES.NOTIFICATION_API],
+  HEALTH: [SCOPES.NOTIFICATION_API],
   NATIONAL_ID: [SCOPES.NATIONALID],
   RECORD_SEARCH: [SCOPES.RECORDSEARCH],
   WEBHOOK: [SCOPES.WEBHOOK]
@@ -205,24 +195,9 @@ export const DEFAULT_SYSTEM_INTEGRATION_ROLE_SCOPES = {
  * These are roles we are slowly sunsettings in favor of the new, more configurable user roles.
  */
 
-export const LEGACY_SCOPES = {
-  demo: SCOPES.DEMO,
-  declare: SCOPES.DECLARE,
-  register: SCOPES.REGISTER,
-  certify: SCOPES.CERTIFY,
-  performance: SCOPES.PERFORMANCE,
-  systemAdmin: SCOPES.SYSADMIN,
-  validate: SCOPES.VALIDATE,
-  nationalSystemAdmin: SCOPES.NATLSYSADMIN,
-  /** Bypasses the rate limiting in gateway. Useful for data seeder. */
-  bypassRateLimit: SCOPES.BYPASSRATELIMIT,
-  teams: SCOPES.TEAMS,
-  config: SCOPES.CONFIG
-} as const
-
 /** All the scopes user can be assigned to – old & new */
 export type UserScope =
-  | (typeof LEGACY_SCOPES)[keyof typeof LEGACY_SCOPES]
+  | (typeof SCOPES)[keyof typeof SCOPES]
   | 'profile.electronic-signature'
 
 export type SystemScope =
diff --git a/packages/commons/src/scopes.ts b/packages/commons/src/scopes.ts
index 33b7dacd8b..b9269f3f11 100644
--- a/packages/commons/src/scopes.ts
+++ b/packages/commons/src/scopes.ts
@@ -14,13 +14,14 @@ export const SCOPES = {
   NATLSYSADMIN: 'natlsysadmin',
   BYPASSRATELIMIT: 'bypassratelimit',
 
-  DEMO: 'demo',
   DECLARE: 'declare',
   REGISTER: 'register',
+  VALIDATE: 'validate',
+
+  DEMO: 'demo',
   CERTIFY: 'certify',
   PERFORMANCE: 'performance',
   SYSADMIN: 'sysadmin',
-  VALIDATE: 'validate',
   TEAMS: 'teams',
   CONFIG: 'config',
 
@@ -40,29 +41,32 @@ export const SCOPES = {
     'record.declare-marriage:my-jurisdiction',
   RECORD_SUBMIT_INCOMPLETE: 'record.declaration-submit-incomplete',
   RECORD_SUBMIT_FOR_REVIEW: 'record.declaration-submit-for-review',
-  RECORD_ASSIGN_UNASSIGN_MYSELF: 'record.assign-unassign-myself',
   RECORD_UNASSIGN_OTHERS: 'record.unassign-others',
 
   // validate
-  RECORD_DECLARATION_REVIEW: 'record.declaration-review',
-  RECORD_DECLARATION_ARCHIVE: 'record.declaration-archive',
-  RECORD_DECLARATION_REINSTATE: 'record.declaration-reinstate',
-  RECORD_REVIEW_DUPLICATES: 'record.review-duplicates',
   RECORD_SUBMIT_FOR_APPROVAL: 'record.submit-for-approval',
   RECORD_SUBMIT_FOR_UPDATES: 'record.submit-for-updates',
-  RECORD_REGISTRATION_VERIFY_CERTIFIED_COPIES:
-    'record.registration-verify-certified-copies',
+  RECORD_DECLARATION_EDIT: 'record.declaration-edit',
+  RECORD_REVIEW_DUPLICATES: 'record.review-duplicates',
+  RECORD_DECLARATION_ARCHIVE: 'record.declaration-archive',
+  RECORD_DECLARATION_REINSTATE: 'record.declaration-reinstate',
 
   // register
   RECORD_REGISTER: 'record.register',
 
   // certify
-  RECORD_PRINT_RECORDS: 'record.print-records',
-  RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS:
-    'record.print-records-supporting-documents',
   RECORD_EXPORT_RECORDS: 'record.export-records',
-  RECORD_PRINT_ISSUE_CERTIFIED_COPIES: 'record.print-issue-certified-copies',
-  RECORD_BULK_PRINT_CERTIFIED_COPIES: 'record.bulk-print-certified-copies',
+  RECORD_DECLARATION_PRINT: 'record.declaration-print',
+  RECORD_PRINT_RECORDS_SUPPORTING_DOCUMENTS:
+    'record.declaration.print-supporting-documents',
+  RECORD_REGISTRATION_PRINT: 'record.registration-print',
+  RECORD_PRINT_ISSUE_CERTIFIED_COPIES:
+    'record.registration-print&issue-certified-copies',
+  RECORD_PRINT_CERTIFIED_COPIES: 'record.registration-print-certified-copies',
+  RECORD_BULK_PRINT_CERTIFIED_COPIES:
+    'record.registration-bulk-print-certified-copies',
+  RECORD_REGISTRATION_VERIFY_CERTIFIED_COPIES:
+    'record.registration-verify-certified-copies',
 
   // correct
   RECORD_REGISTRATION_REQUEST_CORRECTION:
@@ -90,20 +94,15 @@ export const SCOPES = {
   RECORD_CREATE_COMMENTS: 'record.create-comments',
 
   // profile
-  PROFILE_UPDATE_SIGNATURE: 'profile.update-signature',
-  PROFILE_UPDATE_PHONE_NUMBER: 'profile.update-phone-number',
-  PROFILE_UPDATE_NAME: 'profile.update-name',
-  PROFILE_UPDATE_PROFILE_IMAGE: 'profile.update-profile-image',
+  PROFILE_UPDATE: 'profile.update',
   PROFILE_ELECTRONIC_SIGNATURE: 'profile.electronic-signature',
 
   // performance
-  PERFORMANCE_READ_MY_OFFICE: 'performance.read:my-office',
   PERFORMANCE_READ: 'performance.read',
   PERFORMANCE_READ_DASHBOARDS: 'performance.read-dashboards',
-  PERFORMANCE_EXPORT_VITAL_STATISTICS: 'performance.export-vital-statistics',
+  PERFORMANCE_EXPORT_VITAL_STATISTICS: 'performance.vital-statistics-export',
 
   // organisation
-  ORGANISATION_READ: 'organisation.read:all',
   ORGANISATION_READ_LOCATIONS: 'organisation.read-locations:all',
   ORGANISATION_READ_LOCATIONS_MY_OFFICE:
     'organisation.read-locations:my-office',