diff --git a/backend/dataall/core/environment/api/queries.py b/backend/dataall/core/environment/api/queries.py
index a1bd9bc57..3d9e84567 100644
--- a/backend/dataall/core/environment/api/queries.py
+++ b/backend/dataall/core/environment/api/queries.py
@@ -32,6 +32,7 @@
 
 getTrustAccount = gql.QueryField(
     name='getTrustAccount',
+    args=[gql.Argument(name='organizationUri', type=gql.NonNullableType(gql.String))],
     type=gql.String,
     resolver=get_trust_account,
     test_scope='Environment',
diff --git a/backend/dataall/core/environment/api/resolvers.py b/backend/dataall/core/environment/api/resolvers.py
index 537e6de93..2f3301c74 100644
--- a/backend/dataall/core/environment/api/resolvers.py
+++ b/backend/dataall/core/environment/api/resolvers.py
@@ -18,10 +18,8 @@
 log = logging.getLogger()
 
 
-def get_trust_account(context: Context, source, **kwargs):
-    current_account = SessionHelper.get_account()
-    print('current_account  = ', current_account)
-    return current_account
+def get_trust_account(context: Context, source, organizationUri):
+    return EnvironmentService.get_trust_account(uri=organizationUri)
 
 
 def create_environment(context: Context, source, input={}):
@@ -203,8 +201,7 @@ def resolve_user_role(context: Context, source: Environment):
 
 
 def list_environment_group_permissions(context, source, environmentUri: str = None, groupUri: str = None):
-    with context.engine.scoped_session() as session:
-        return EnvironmentService.list_group_permissions(session=session, uri=environmentUri, group_uri=groupUri)
+    return EnvironmentService.list_group_permissions(uri=environmentUri, group_uri=groupUri)
 
 
 @is_feature_enabled('core.features.env_aws_actions')
@@ -214,12 +211,12 @@ def get_environment_assume_role_url(
     environmentUri: str = None,
     groupUri: str = None,
 ):
-    return EnvironmentService.get_environment_assume_role_url(environmentUri=environmentUri, groupUri=groupUri)
+    return EnvironmentService.get_environment_assume_role_url(uri=environmentUri, groupUri=groupUri)
 
 
 @is_feature_enabled('core.features.env_aws_actions')
 def generate_environment_access_token(context, source, environmentUri: str = None, groupUri: str = None):
-    credentials = EnvironmentService.generate_environment_access_token(environmentUri=environmentUri, groupUri=groupUri)
+    credentials = EnvironmentService.generate_environment_access_token(uri=environmentUri, groupUri=groupUri)
     return json.dumps(credentials)
 
 
@@ -245,31 +242,33 @@ def delete_environment(context: Context, source, environmentUri: str = None, del
 
 
 def enable_subscriptions(context: Context, source, environmentUri: str = None, input: dict = None):
-    EnvironmentService.enable_subscriptions(environmentUri, input)
+    EnvironmentService.enable_subscriptions(uri=environmentUri, input=input)
     StackService.deploy_stack(targetUri=environmentUri)
     return True
 
 
 def disable_subscriptions(context: Context, source, environmentUri: str = None):
-    EnvironmentService.disable_subscriptions(environmentUri)
+    EnvironmentService.disable_subscriptions(uri=environmentUri)
     StackService.deploy_stack(targetUri=environmentUri)
     return True
 
 
 def get_pivot_role_template(context: Context, source, organizationUri=None):
-    return EnvironmentService.get_template_from_resource_bucket(organizationUri, 'pivot_role_prefix')
+    return EnvironmentService.get_template_from_resource_bucket(uri=organizationUri, template_name='pivot_role_prefix')
 
 
 def get_cdk_exec_policy_template(context: Context, source, organizationUri=None):
-    return EnvironmentService.get_template_from_resource_bucket(organizationUri, 'cdk_exec_policy_prefix')
+    return EnvironmentService.get_template_from_resource_bucket(
+        uri=organizationUri, template_name='cdk_exec_policy_prefix'
+    )
 
 
 def get_external_id(context: Context, source, organizationUri=None):
-    return EnvironmentService.get_external_id(organizationUri)
+    return EnvironmentService.get_external_id(uri=organizationUri)
 
 
 def get_pivot_role_name(context: Context, source, organizationUri=None):
-    return EnvironmentService.get_pivot_role(organizationUri)
+    return EnvironmentService.get_pivot_role(uri=organizationUri)
 
 
 def resolve_environment(context, source, **kwargs):
diff --git a/backend/dataall/core/environment/services/environment_service.py b/backend/dataall/core/environment/services/environment_service.py
index 4ff768b07..c9833b27f 100644
--- a/backend/dataall/core/environment/services/environment_service.py
+++ b/backend/dataall/core/environment/services/environment_service.py
@@ -135,7 +135,7 @@ def validate_org_group(org_uri, group, session):
 
 class EnvironmentService:
     @staticmethod
-    def validate_permissions(session, uri, g_permissions, group):
+    def _validate_permissions(session, uri, g_permissions, group):
         """
         g_permissions: coming from frontend = ENVIRONMENT_INVITATION_REQUEST
 
@@ -160,7 +160,7 @@ def validate_permissions(session, uri, g_permissions, group):
             )
 
     @staticmethod
-    def get_pivot_role_as_part_of_environment():
+    def _get_pivot_role_as_part_of_environment():
         ssm_param = ParameterStoreManager.get_parameter_value(
             region=os.getenv('AWS_REGION', 'eu-west-1'),
             parameter_path=f"/dataall/{os.getenv('envname', 'local')}/pivotRole/enablePivotRoleAutoCreate",
@@ -168,7 +168,7 @@ def get_pivot_role_as_part_of_environment():
         return ssm_param == 'True'
 
     @staticmethod
-    def check_cdk_resources(account_id, region, data) -> str:
+    def _check_cdk_resources(account_id, region, data) -> str:
         """
         Check if all necessary cdk resources exists in the account
         :return : pivot role name
@@ -181,7 +181,7 @@ def check_cdk_resources(account_id, region, data) -> str:
 
         log.info('Checking cdk resources for environment.')
 
-        pivot_role_as_part_of_environment = EnvironmentService.get_pivot_role_as_part_of_environment()
+        pivot_role_as_part_of_environment = EnvironmentService._get_pivot_role_as_part_of_environment()
         log.info(f'Pivot role as part of environment = {pivot_role_as_part_of_environment}')
 
         cdk_look_up_role_arn = SessionHelper.get_cdk_look_up_role_arn(accountid=account_id, region=region)
@@ -216,6 +216,11 @@ def check_cdk_resources(account_id, region, data) -> str:
 
         return cdk_role_name
 
+    @staticmethod
+    @ResourcePolicyService.has_resource_permission(LINK_ENVIRONMENT)
+    def get_trust_account(uri):
+        return SessionHelper.get_account()
+
     @staticmethod
     @TenantPolicyService.has_tenant_permission(MANAGE_ENVIRONMENTS)
     @ResourcePolicyService.has_resource_permission(LINK_ENVIRONMENT)
@@ -223,7 +228,7 @@ def create_environment(uri, data=None):
         context = get_context()
         with context.db_engine.scoped_session() as session:
             EnvironmentRequestValidationService.validate_creation_params(data, uri, session)
-            cdk_role_name = EnvironmentService.check_cdk_resources(data.get('AwsAccountId'), data.get('region'), data)
+            cdk_role_name = EnvironmentService._check_cdk_resources(data.get('AwsAccountId'), data.get('region'), data)
             env = Environment(
                 organizationUri=data.get('organizationUri'),
                 label=data.get('label', 'Unnamed'),
@@ -323,7 +328,7 @@ def update_environment(uri, data=None):
         with get_context().db_engine.scoped_session() as session:
             environment = EnvironmentService.get_environment_by_uri(session, uri)
             previous_resource_prefix = environment.resourcePrefix
-            EnvironmentService.check_cdk_resources(
+            EnvironmentService._check_cdk_resources(
                 account_id=environment.AwsAccountId, region=environment.region, data=data
             )
 
@@ -366,7 +371,7 @@ def invite_group(uri, data=None) -> (Environment, EnvironmentGroup):
         group: str = data['groupUri']
 
         with get_context().db_engine.scoped_session() as session:
-            EnvironmentService.validate_permissions(session, uri, data['permissions'], group)
+            EnvironmentService._validate_permissions(session, uri, data['permissions'], group)
 
             environment = EnvironmentService.get_environment_by_uri(session, uri)
 
@@ -493,7 +498,7 @@ def update_group_permissions(uri, data=None):
         group = data['groupUri']
 
         with get_context().db_engine.scoped_session() as session:
-            EnvironmentService.validate_permissions(session, uri, data['permissions'], group)
+            EnvironmentService._validate_permissions(session, uri, data['permissions'], group)
 
             environment = EnvironmentService.get_environment_by_uri(session, uri)
 
@@ -521,7 +526,7 @@ def update_group_permissions(uri, data=None):
 
     @staticmethod
     @ResourcePolicyService.has_resource_permission(environment_permissions.LIST_ENVIRONMENT_GROUP_PERMISSIONS)
-    def list_group_permissions(session, uri, group_uri):
+    def list_group_permissions(uri, group_uri):
         # the permission checked
         with get_context().db_engine.scoped_session() as session:
             return EnvironmentService.list_group_permissions_internal(session, uri, group_uri)
@@ -924,7 +929,7 @@ def get_boolean_env_param(session, env: Environment, param: str) -> bool:
         return param is not None and param.value.lower() == 'true'
 
     @staticmethod
-    def is_user_invited(uri):
+    def _is_user_invited(uri):
         context = get_context()
         with context.db_engine.scoped_session() as session:
             return EnvironmentRepository.is_user_invited_to_environment(session=session, groups=context.groups, uri=uri)
@@ -935,23 +940,17 @@ def resolve_user_role(environment: Environment):
             return EnvironmentPermission.Owner.value
         elif environment.SamlGroupName in get_context().groups:
             return EnvironmentPermission.Admin.value
-        elif EnvironmentService.is_user_invited(environment.environmentUri):
+        elif EnvironmentService._is_user_invited(environment.environmentUri):
             return EnvironmentPermission.Invited.value
         return EnvironmentPermission.NotInvited.value
 
     @staticmethod
     @TenantPolicyService.has_tenant_permission(MANAGE_ENVIRONMENTS)
-    def enable_subscriptions(environmentUri: str = None, input: dict = None):
+    @ResourcePolicyService.has_resource_permission(ENABLE_ENVIRONMENT_SUBSCRIPTIONS)
+    def enable_subscriptions(uri, input: dict = None):
         context = get_context()
         with context.db_engine.scoped_session() as session:
-            ResourcePolicyService.check_user_resource_permission(
-                session=session,
-                username=context.username,
-                groups=context.groups,
-                resource_uri=environmentUri,
-                permission_name=ENABLE_ENVIRONMENT_SUBSCRIPTIONS,
-            )
-            environment = EnvironmentService.get_environment_by_uri(session, environmentUri)
+            environment = EnvironmentService.get_environment_by_uri(session, uri)
             if input.get('producersTopicArn'):
                 environment.subscriptionsProducersTopicName = input.get('producersTopicArn')
                 environment.subscriptionsProducersTopicImported = True
@@ -977,17 +976,11 @@ def enable_subscriptions(environmentUri: str = None, input: dict = None):
 
     @staticmethod
     @TenantPolicyService.has_tenant_permission(MANAGE_ENVIRONMENTS)
-    def disable_subscriptions(environment_uri: str = None):
+    @ResourcePolicyService.has_resource_permission(ENABLE_ENVIRONMENT_SUBSCRIPTIONS)
+    def disable_subscriptions(uri):
         context = get_context()
         with context.db_engine.scoped_session() as session:
-            ResourcePolicyService.check_user_resource_permission(
-                session=session,
-                username=context.username,
-                groups=context.groups,
-                resource_uri=environment_uri,
-                permission_name=ENABLE_ENVIRONMENT_SUBSCRIPTIONS,
-            )
-            environment = EnvironmentService.get_environment_by_uri(session, environment_uri)
+            environment = EnvironmentService.get_environment_by_uri(session, uri)
 
             environment.subscriptionsConsumersTopicName = None
             environment.subscriptionsConsumersTopicImported = False
@@ -1039,20 +1032,11 @@ def _get_environment_group_aws_session(session, username, groups, environment, g
 
     @staticmethod
     @TenantPolicyService.has_tenant_permission(MANAGE_ENVIRONMENTS)
-    def get_environment_assume_role_url(
-        environmentUri: str = None,
-        groupUri: str = None,
-    ):
+    @ResourcePolicyService.has_resource_permission(CREDENTIALS_ENVIRONMENT)
+    def get_environment_assume_role_url(uri, groupUri):
         context = get_context()
         with context.db_engine.scoped_session() as session:
-            ResourcePolicyService.check_user_resource_permission(
-                session=session,
-                username=context.username,
-                groups=context.groups,
-                resource_uri=environmentUri,
-                permission_name=CREDENTIALS_ENVIRONMENT,
-            )
-            environment = EnvironmentService.get_environment_by_uri(session, environmentUri)
+            environment = EnvironmentService.get_environment_by_uri(session, uri)
             url = SessionHelper.get_console_access_url(
                 EnvironmentService._get_environment_group_aws_session(
                     session=session,
@@ -1067,17 +1051,11 @@ def get_environment_assume_role_url(
 
     @staticmethod
     @TenantPolicyService.has_tenant_permission(MANAGE_ENVIRONMENTS)
-    def generate_environment_access_token(environmentUri: str = None, groupUri: str = None):
+    @ResourcePolicyService.has_resource_permission(CREDENTIALS_ENVIRONMENT)
+    def generate_environment_access_token(uri, groupUri):
         context = get_context()
         with context.db_engine.scoped_session() as session:
-            ResourcePolicyService.check_user_resource_permission(
-                session=session,
-                username=context.username,
-                groups=context.groups,
-                resource_uri=environmentUri,
-                permission_name=CREDENTIALS_ENVIRONMENT,
-            )
-            environment = EnvironmentService.get_environment_by_uri(session, environmentUri)
+            environment = EnvironmentService.get_environment_by_uri(session, uri)
             c = EnvironmentService._get_environment_group_aws_session(
                 session=session,
                 username=context.username,
@@ -1092,16 +1070,8 @@ def generate_environment_access_token(environmentUri: str = None, groupUri: str
             }
 
     @staticmethod
-    def get_pivot_role(organization_uri):
-        context = get_context()
-        with context.db_engine.scoped_session() as session:
-            ResourcePolicyService.check_user_resource_permission(
-                session=session,
-                username=context.username,
-                groups=context.groups,
-                resource_uri=organization_uri,
-                permission_name=GET_ORGANIZATION,
-            )
+    @ResourcePolicyService.has_resource_permission(LINK_ENVIRONMENT)
+    def get_pivot_role(uri):
         pivot_role_name = SessionHelper.get_delegation_role_name(region='<REGION>')
         if not pivot_role_name:
             raise exceptions.AWSResourceNotFound(
@@ -1111,47 +1081,31 @@ def get_pivot_role(organization_uri):
         return pivot_role_name
 
     @staticmethod
-    def get_external_id(organization_uri):
-        context = get_context()
-        with context.db_engine.scoped_session() as session:
-            ResourcePolicyService.check_user_resource_permission(
-                session=session,
-                username=context.username,
-                groups=context.groups,
-                resource_uri=organization_uri,
-                permission_name=GET_ORGANIZATION,
+    @ResourcePolicyService.has_resource_permission(LINK_ENVIRONMENT)
+    def get_external_id(uri):
+        external_id = SessionHelper.get_external_id_secret()
+        if not external_id:
+            raise exceptions.AWSResourceNotFound(
+                action='GET_EXTERNAL_ID',
+                message='External Id could not be found on AWS Secretsmanager',
             )
-            external_id = SessionHelper.get_external_id_secret()
-            if not external_id:
-                raise exceptions.AWSResourceNotFound(
-                    action='GET_EXTERNAL_ID',
-                    message='External Id could not be found on AWS Secretsmanager',
-                )
-            return external_id
+        return external_id
 
     @staticmethod
-    def get_template_from_resource_bucket(organization_uri, template_name):
-        context = get_context()
-        with context.db_engine.scoped_session() as session:
-            ResourcePolicyService.check_user_resource_permission(
-                session=session,
-                username=context.username,
-                groups=context.groups,
-                resource_uri=organization_uri,
-                permission_name=GET_ORGANIZATION,
+    @ResourcePolicyService.has_resource_permission(LINK_ENVIRONMENT)
+    def get_template_from_resource_bucket(uri, template_name):
+        envname = os.getenv('envname', 'local')
+        region = os.getenv('AWS_REGION', 'eu-central-1')
+
+        resource_bucket = Parameter().get_parameter(env=envname, path='s3/resources_bucket_name')
+        template_key = Parameter().get_parameter(env=envname, path=f's3/{template_name}')
+        if not resource_bucket or not template_key:
+            raise AWSResourceNotFound(
+                action='GET_TEMPLATE',
+                message=f'{template_name} Yaml template file could not be found on Amazon S3 bucket',
             )
-            envname = os.getenv('envname', 'local')
-            region = os.getenv('AWS_REGION', 'eu-central-1')
-
-            resource_bucket = Parameter().get_parameter(env=envname, path='s3/resources_bucket_name')
-            template_key = Parameter().get_parameter(env=envname, path=f's3/{template_name}')
-            if not resource_bucket or not template_key:
-                raise AWSResourceNotFound(
-                    action='GET_TEMPLATE',
-                    message=f'{template_name} Yaml template file could not be found on Amazon S3 bucket',
-                )
 
-            return S3_client.get_presigned_url(region, resource_bucket, template_key)
+        return S3_client.get_presigned_url(region, resource_bucket, template_key)
 
     @staticmethod
     @ResourcePolicyService.has_resource_permission(environment_permissions.GET_ENVIRONMENT)
diff --git a/backend/dataall/core/groups/api/resolvers.py b/backend/dataall/core/groups/api/resolvers.py
index a17507d4b..4571a91bd 100644
--- a/backend/dataall/core/groups/api/resolvers.py
+++ b/backend/dataall/core/groups/api/resolvers.py
@@ -14,8 +14,7 @@
 def resolve_group_environment_permissions(context, source, environmentUri):
     if not source:
         return None
-    with context.engine.scoped_session() as session:
-        return EnvironmentService.list_group_permissions(session=session, uri=environmentUri, group_uri=source.groupUri)
+    return EnvironmentService.list_group_permissions(uri=environmentUri, group_uri=source.groupUri)
 
 
 def resolve_group_tenant_permissions(context, source):
diff --git a/backend/dataall/modules/dashboards/api/queries.py b/backend/dataall/modules/dashboards/api/queries.py
index 9912375b8..a4b005adc 100644
--- a/backend/dataall/modules/dashboards/api/queries.py
+++ b/backend/dataall/modules/dashboards/api/queries.py
@@ -3,7 +3,6 @@
     get_dashboard,
     get_monitoring_dashboard_id,
     get_monitoring_vpc_connection_id,
-    get_quicksight_author_session,
     get_quicksight_designer_url,
     get_quicksight_reader_session,
     get_quicksight_reader_url,
@@ -37,14 +36,6 @@
     resolver=get_monitoring_vpc_connection_id,
 )
 
-getPlatformAuthorSession = gql.QueryField(
-    name='getPlatformAuthorSession',
-    args=[
-        gql.Argument(name='awsAccount', type=gql.NonNullableType(gql.String)),
-    ],
-    type=gql.String,
-    resolver=get_quicksight_author_session,
-)
 
 getPlatformReaderSession = gql.QueryField(
     name='getPlatformReaderSession',
diff --git a/backend/dataall/modules/dashboards/api/resolvers.py b/backend/dataall/modules/dashboards/api/resolvers.py
index 67ae59169..7a9bbe133 100644
--- a/backend/dataall/modules/dashboards/api/resolvers.py
+++ b/backend/dataall/modules/dashboards/api/resolvers.py
@@ -115,10 +115,6 @@ def create_quicksight_data_source_set(context, source, vpcConnectionId: str = No
     return DashboardQuicksightService.create_quicksight_data_source_set(vpcConnectionId)
 
 
-def get_quicksight_author_session(context, source, awsAccount: str = None):
-    return DashboardQuicksightService.get_quicksight_author_session(awsAccount)
-
-
 def get_quicksight_reader_session(context, source, dashboardId: str = None):
     return DashboardQuicksightService.get_quicksight_reader_session(dashboardId)
 
diff --git a/backend/dataall/modules/dashboards/services/dashboard_quicksight_service.py b/backend/dataall/modules/dashboards/services/dashboard_quicksight_service.py
index 478a2c8c4..67edc6a19 100644
--- a/backend/dataall/modules/dashboards/services/dashboard_quicksight_service.py
+++ b/backend/dataall/modules/dashboards/services/dashboard_quicksight_service.py
@@ -119,11 +119,6 @@ def create_quicksight_data_source_set(cls, vpc_connection_id):
 
         return datasource_id
 
-    @classmethod
-    def get_quicksight_author_session(cls, aws_account):
-        DashboardQuicksightService._check_user_must_be_admin()
-        return cls._client(aws_account).get_author_session()
-
     @classmethod
     def get_quicksight_reader_session(cls, dashboard_uri):
         cls._check_user_must_be_admin()
diff --git a/frontend/src/modules/Administration/components/AdministratorDashboardViewer.js b/frontend/src/modules/Administration/components/AdministratorDashboardViewer.js
index 8c660e0cb..d00cef940 100644
--- a/frontend/src/modules/Administration/components/AdministratorDashboardViewer.js
+++ b/frontend/src/modules/Administration/components/AdministratorDashboardViewer.js
@@ -1,4 +1,4 @@
-import { AddOutlined, ArrowRightAlt } from '@mui/icons-material';
+import { AddOutlined } from '@mui/icons-material';
 import { LoadingButton } from '@mui/lab';
 import {
   Box,
@@ -17,12 +17,11 @@ import * as ReactIf from 'react-if';
 import * as Yup from 'yup';
 import { useSettings } from 'design';
 import { SET_ERROR, useDispatch } from 'globalErrors';
-import { getTrustAccount, useClient } from 'services';
+import { useClient } from 'services';
 import {
   createQuicksightDataSourceSet,
   getMonitoringDashboardId,
   getMonitoringVPCConnectionId,
-  getPlatformAuthorSession,
   getPlatformReaderSession,
   updateSSMParameter
 } from '../services';
@@ -35,21 +34,10 @@ export const DashboardViewer = () => {
   const { settings } = useSettings();
   const [dashboardId, setDashboardId] = useState('');
   const [vpcConnectionId, setVpcConnectionId] = useState('');
-  const [trustedAccount, setTrustedAccount] = useState(null);
   const [dashboardRef] = useState(createRef());
   const [sessionUrl, setSessionUrl] = useState(null);
-  const [isOpeningSession, setIsOpeningSession] = useState(false);
   const [isCreatingDataSource, setIsCreatingDataSource] = useState(false);
 
-  const fetchTrustedAccount = useCallback(async () => {
-    const response = await client.query(getTrustAccount());
-    if (!response.errors) {
-      setTrustedAccount(response.data.getTrustAccount);
-    } else {
-      dispatch({ type: SET_ERROR, error: response.errors[0].message });
-    }
-  }, [client, dispatch]);
-
   const fetchMonitoringVPCConnectionId = useCallback(async () => {
     const response = await client.query(getMonitoringVPCConnectionId());
     if (!response.errors) {
@@ -99,16 +87,12 @@ export const DashboardViewer = () => {
       fetchMonitoringVPCConnectionId().catch((e) =>
         dispatch({ type: SET_ERROR, error: e.message })
       );
-      fetchTrustedAccount().catch((e) =>
-        dispatch({ type: SET_ERROR, error: e.message })
-      );
     }
   }, [
     client,
     dispatch,
     fetchMonitoringDashboardId,
-    fetchMonitoringVPCConnectionId,
-    fetchTrustedAccount
+    fetchMonitoringVPCConnectionId
   ]);
 
   async function submitVpc(values, setStatus, setSubmitting, setErrors) {
@@ -183,19 +167,6 @@ export const DashboardViewer = () => {
     setIsCreatingDataSource(false);
   }
 
-  const startAuthorSession = async () => {
-    setIsOpeningSession(true);
-    const response = await client.query(
-      getPlatformAuthorSession(trustedAccount)
-    );
-    if (!response.errors) {
-      window.open(response.data.getPlatformAuthorSession, '_blank');
-    } else {
-      dispatch({ type: SET_ERROR, error: response.errors[0].message });
-    }
-    setIsOpeningSession(false);
-  };
-
   return (
     <Container maxWidth={settings.compact ? 'xl' : false}>
       <Grid container justifyContent="space-between" spacing={3}>
@@ -206,8 +177,9 @@ export const DashboardViewer = () => {
             <CardContent>
               <Box>
                 <Typography color="textSecondary" variant="subtitle2">
-                  1. Enable Quicksight Enterprise Edition in AWS Account ={' '}
-                  {trustedAccount}. Check the user guide for more details.
+                  1. Enable Quicksight Enterprise Edition in the infrastructure
+                  data.all central account. Check the user guide for more
+                  details.
                 </Typography>
               </Box>
               <Box>
@@ -343,20 +315,6 @@ export const DashboardViewer = () => {
                     Dashboard. Check the user guide for more details.
                   </Typography>
                 </Box>
-                <Grid container justifyContent="space-between" spacing={3}>
-                  <Grid item lg={12} xl={12} xs={12}>
-                    <LoadingButton
-                      loading={isOpeningSession}
-                      color="primary"
-                      endIcon={<ArrowRightAlt fontSize="small" />}
-                      variant="outlined"
-                      onClick={startAuthorSession}
-                      sx={{ mt: 1, mb: 2, ml: 2 }}
-                    >
-                      Start Quicksight session
-                    </LoadingButton>
-                  </Grid>
-                </Grid>
               </Box>
               <Box>
                 <Box mb={1}>
diff --git a/frontend/src/modules/Administration/services/getPlatformAuthorSession.js b/frontend/src/modules/Administration/services/getPlatformAuthorSession.js
deleted file mode 100644
index 391dd9e99..000000000
--- a/frontend/src/modules/Administration/services/getPlatformAuthorSession.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { gql } from 'apollo-boost';
-
-export const getPlatformAuthorSession = (awsAccount) => ({
-  variables: {
-    awsAccount
-  },
-  query: gql`
-    query getPlatformAuthorSession($awsAccount: String!) {
-      getPlatformAuthorSession(awsAccount: $awsAccount)
-    }
-  `
-});
diff --git a/frontend/src/modules/Administration/services/index.js b/frontend/src/modules/Administration/services/index.js
index a07cd1853..c74d17891 100644
--- a/frontend/src/modules/Administration/services/index.js
+++ b/frontend/src/modules/Administration/services/index.js
@@ -1,7 +1,6 @@
 export * from './createQuicksightDataSourceSet';
 export * from './getMonitoringDashboardId';
 export * from './getMonitoringVPCConnectionId';
-export * from './getPlatformAuthorSession';
 export * from './getPlatformReaderSession';
 export * from './listTenantGroups';
 export * from './listTenantPermissions';
diff --git a/frontend/src/modules/Environments/services/getTrustAccount.js b/frontend/src/modules/Environments/services/getTrustAccount.js
new file mode 100644
index 000000000..2a1f91eb4
--- /dev/null
+++ b/frontend/src/modules/Environments/services/getTrustAccount.js
@@ -0,0 +1,12 @@
+import { gql } from 'apollo-boost';
+
+export const getTrustAccount = (organizationUri) => ({
+  variables: {
+    organizationUri
+  },
+  query: gql`
+    query GetTrustAccount($organizationUri: String!) {
+      getTrustAccount(organizationUri: $organizationUri)
+    }
+  `
+});
diff --git a/frontend/src/modules/Environments/services/index.js b/frontend/src/modules/Environments/services/index.js
index c83178c4d..b053bd045 100644
--- a/frontend/src/modules/Environments/services/index.js
+++ b/frontend/src/modules/Environments/services/index.js
@@ -16,6 +16,7 @@ export * from './getPivotRoleExternalId';
 export * from './getPivotRoleName';
 export * from './getPivotRolePresignedUrl';
 export * from './getCDKExecPolicyPresignedUrl.js';
+export * from './getTrustAccount';
 export * from './inviteGroup';
 export * from './listAllEnvironmentConsumptionRoles';
 export * from './listAllEnvironmentGroups';
diff --git a/frontend/src/modules/Environments/views/EnvironmentCreateForm.js b/frontend/src/modules/Environments/views/EnvironmentCreateForm.js
index bbe55e522..e2c2a8275 100644
--- a/frontend/src/modules/Environments/views/EnvironmentCreateForm.js
+++ b/frontend/src/modules/Environments/views/EnvironmentCreateForm.js
@@ -35,7 +35,8 @@ import {
   getPivotRoleExternalId,
   getPivotRoleName,
   getPivotRolePresignedUrl,
-  getCDKExecPolicyPresignedUrl
+  getCDKExecPolicyPresignedUrl,
+  getTrustAccount
 } from '../services';
 import {
   SanitizedHTML,
@@ -45,12 +46,7 @@ import {
   useSettings
 } from 'design';
 import { SET_ERROR, useDispatch } from 'globalErrors';
-import {
-  getOrganization,
-  getTrustAccount,
-  useClient,
-  useGroups
-} from 'services';
+import { getOrganization, useClient, useGroups } from 'services';
 import {
   AwsRegions,
   isAnyEnvironmentModuleEnabled,
@@ -84,13 +80,13 @@ const EnvironmentCreateForm = (props) => {
     setLoading(false);
   }, [client, dispatch, params.uri]);
   const fetchTrustedAccount = useCallback(async () => {
-    const response = await client.query(getTrustAccount());
+    const response = await client.query(getTrustAccount(params.uri));
     if (!response.errors) {
       setTrustedAccount(response.data.getTrustAccount);
     } else {
       dispatch({ type: SET_ERROR, error: response.errors[0].message });
     }
-  }, [client, dispatch]);
+  }, [client, dispatch, params.uri]);
   const getRoleName = useCallback(async () => {
     const response = await client.query(getPivotRoleName(params.uri));
     if (!response.errors) {
diff --git a/frontend/src/services/graphql/Environment/getTrustAccount.js b/frontend/src/services/graphql/Environment/getTrustAccount.js
deleted file mode 100644
index 97aba5e40..000000000
--- a/frontend/src/services/graphql/Environment/getTrustAccount.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { gql } from 'apollo-boost';
-
-export const getTrustAccount = () => ({
-  query: gql`
-    query GetTrustAccount {
-      getTrustAccount
-    }
-  `
-});
diff --git a/frontend/src/services/graphql/Environment/index.js b/frontend/src/services/graphql/Environment/index.js
index 96d75039d..6da42b990 100644
--- a/frontend/src/services/graphql/Environment/index.js
+++ b/frontend/src/services/graphql/Environment/index.js
@@ -1,4 +1,3 @@
-export * from './getTrustAccount';
 export * from './listAllGroups';
 export * from './listAllConsumptionRoles';
 export * from './listEnvironmentConsumptionRoles';
diff --git a/tests/conftest.py b/tests/conftest.py
index 50af73a38..99a17b4c4 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -187,11 +187,11 @@ def patch_stack_tasks(module_mocker):
 @pytest.fixture(scope='module', autouse=True)
 def patch_check_env(module_mocker):
     module_mocker.patch(
-        'dataall.core.environment.services.environment_service.EnvironmentService.check_cdk_resources',
+        'dataall.core.environment.services.environment_service.EnvironmentService._check_cdk_resources',
         return_value='CDKROLENAME',
     )
     module_mocker.patch(
-        'dataall.core.environment.services.environment_service.EnvironmentService.get_pivot_role_as_part_of_environment',
+        'dataall.core.environment.services.environment_service.EnvironmentService._get_pivot_role_as_part_of_environment',
         return_value=False,
     )
 
diff --git a/tests_new/integration_tests/modules/dashboards/queries.py b/tests_new/integration_tests/modules/dashboards/queries.py
index c012b68ce..047fb7de3 100644
--- a/tests_new/integration_tests/modules/dashboards/queries.py
+++ b/tests_new/integration_tests/modules/dashboards/queries.py
@@ -4,7 +4,6 @@
 # # IF MONITORING ON (TODO)
 # getMonitoringDashboardId
 # getMonitoringVpcConnectionId
-# getPlatformAuthorSession
 # getPlatformReaderSession