diff --git a/apps/api-gateway/src/connection/connection.controller.ts b/apps/api-gateway/src/connection/connection.controller.ts
index b4e7ac48b..2cb6bb804 100644
--- a/apps/api-gateway/src/connection/connection.controller.ts
+++ b/apps/api-gateway/src/connection/connection.controller.ts
@@ -111,18 +111,17 @@ export class ConnectionController {
     
     @Get('orgs/:orgId/question-answer/question/:tenantId')
     @UseGuards(AuthGuard('jwt'), OrgRolesGuard)
-    @Roles(OrgRoles.OWNER, OrgRoles.ADMIN, OrgRoles.ISSUER, OrgRoles.VERIFIER, OrgRoles.MEMBER)
+    @Roles(OrgRoles.OWNER, OrgRoles.ADMIN, OrgRoles.ISSUER, OrgRoles.VERIFIER, OrgRoles.MEMBER, OrgRoles.HOLDER, OrgRoles.SUPER_ADMIN, OrgRoles.PLATFORM_ADMIN)
     @ApiOperation({
         summary: `Get question-answer record`,
         description: `Get question-answer record`
     })
     @ApiResponse({ status: HttpStatus.OK, description: 'Success', type: ApiResponseDto })
     async getQuestionAnswersRecord(
-        @Param('tenantId') tenantId: string,
         @Param('orgId') orgId: string,
         @Res() res: Response
     ): Promise<Response> {
-        const record = await this.connectionService.getQuestionAnswersRecord(tenantId, orgId);
+        const record = await this.connectionService.getQuestionAnswersRecord(orgId);
         const finalResponse: IResponse = {
             statusCode: HttpStatus.OK,
             message: ResponseMessages.connection.success.questionAnswerRecord,
@@ -161,14 +160,13 @@ export class ConnectionController {
     }
 
     @Post('/orgs/:orgId/question-answer/question/:connectionId/:tenantId')
-    @ApiOperation({ summary: '', description: 'question-answer/question' })
+    @ApiOperation({ summary: '', description: 'send question' })
     @UseGuards(AuthGuard('jwt'), OrgRolesGuard)
-    @Roles(OrgRoles.OWNER, OrgRoles.ADMIN, OrgRoles.ISSUER, OrgRoles.VERIFIER, OrgRoles.MEMBER)
+    @Roles(OrgRoles.OWNER, OrgRoles.ADMIN, OrgRoles.ISSUER, OrgRoles.VERIFIER, OrgRoles.MEMBER, OrgRoles.HOLDER, OrgRoles.SUPER_ADMIN, OrgRoles.PLATFORM_ADMIN)
     @ApiResponse({ status: HttpStatus.CREATED, description: 'Created', type: ApiResponseDto })
     async sendQuestion(
         @Param('orgId') orgId: string,
         @Param('connectionId') connectionId: string,
-        @Param('tenantId') tenantId: string,
         @Body() questionDto: QuestionDto,
         @User() reqUser: IUserRequestInterface,
         @Res() res: Response
@@ -176,7 +174,6 @@ export class ConnectionController {
 
         questionDto.orgId = orgId;
         questionDto.connectionId = connectionId;
-        questionDto.tenantId = tenantId;
         const questionData = await this.connectionService.sendQuestion(questionDto);
         const finalResponse: IResponse = {
             statusCode: HttpStatus.CREATED,
diff --git a/apps/api-gateway/src/connection/connection.service.ts b/apps/api-gateway/src/connection/connection.service.ts
index f80a425b5..c01321093 100644
--- a/apps/api-gateway/src/connection/connection.service.ts
+++ b/apps/api-gateway/src/connection/connection.service.ts
@@ -88,11 +88,10 @@ export class ConnectionService extends BaseService {
 
 
   getQuestionAnswersRecord(
-    tenantId: string,
     orgId: string
   ): Promise<object> {
-    const payload = {  tenantId, orgId };
-    return this.sendNatsMessage(this.connectionServiceProxy, 'get-question-answer-record', payload);
+    
+    return this.sendNatsMessage(this.connectionServiceProxy, 'get-question-answer-record', orgId);
   }
 
   receiveInvitationUrl(
diff --git a/apps/api-gateway/src/connection/dtos/question-answer.dto.ts b/apps/api-gateway/src/connection/dtos/question-answer.dto.ts
index 49ceafdb7..583448183 100644
--- a/apps/api-gateway/src/connection/dtos/question-answer.dto.ts
+++ b/apps/api-gateway/src/connection/dtos/question-answer.dto.ts
@@ -33,7 +33,6 @@ export class QuestionDto {
 
     orgId: string;
     connectionId: string;
-    tenantId: string;
 }
 
 export class QuestionAnswerWebhookDto {
diff --git a/apps/connection/src/connection.controller.ts b/apps/connection/src/connection.controller.ts
index c30bbed6c..923a15190 100644
--- a/apps/connection/src/connection.controller.ts
+++ b/apps/connection/src/connection.controller.ts
@@ -12,7 +12,7 @@ import {
 } from './interfaces/connection.interfaces';
 import { IConnectionList, ICreateConnectionUrl } from '@credebl/common/interfaces/connection.interface';
 import { IConnectionDetailsById } from 'apps/api-gateway/src/interfaces/IConnectionSearch.interface';
-import { IQuestionAnswerPayload, IQuestionPayload } from './interfaces/question-answer.interfaces';
+import { IQuestionPayload } from './interfaces/question-answer.interfaces';
 
 @Controller()
 export class ConnectionController {
@@ -84,8 +84,7 @@ export class ConnectionController {
   }
 
   @MessagePattern({ cmd: 'get-question-answer-record' })
-  async getQuestionAnswersRecord(payload: IQuestionAnswerPayload): Promise<object> {
-    const { tenantId, orgId } = payload;
-    return this.connectionService.getQuestionAnswersRecord(tenantId, orgId);
+  async getQuestionAnswersRecord(orgId: string): Promise<object> {
+    return this.connectionService.getQuestionAnswersRecord(orgId);
   }
 }
diff --git a/apps/connection/src/connection.service.ts b/apps/connection/src/connection.service.ts
index 28734c003..7dbb306f7 100644
--- a/apps/connection/src/connection.service.ts
+++ b/apps/connection/src/connection.service.ts
@@ -313,7 +313,7 @@ export class ConnectionService {
     }
   }
 
-  async getQuestionAnswersRecord(tenantId: string, orgId: string): Promise<object> {
+  async getQuestionAnswersRecord(orgId: string): Promise<object> {
     try {
       const agentDetails = await this.connectionRepository.getAgentEndPoint(orgId);
       const orgAgentType = await this.connectionRepository.getOrgAgentType(agentDetails?.orgAgentTypeId);
@@ -421,7 +421,7 @@ export class ConnectionService {
     label: string,
     orgAgentType: string,
     agentEndPoint: string,
-    tenantId: string,
+    tenantId?: string,
     connectionId?: string
   ): Promise<string> {
     try {
diff --git a/apps/connection/src/interfaces/question-answer.interfaces.ts b/apps/connection/src/interfaces/question-answer.interfaces.ts
index a1434d2e8..6fcabd9ef 100644
--- a/apps/connection/src/interfaces/question-answer.interfaces.ts
+++ b/apps/connection/src/interfaces/question-answer.interfaces.ts
@@ -9,8 +9,3 @@ export interface IValidResponses {
     connectionId?: string;
     tenantId?: string;
   }
-
-  export interface IQuestionAnswerPayload {
-    tenantId: string;
-    orgId: string;
-  }
\ No newline at end of file