diff --git a/.env.demo b/.env.demo
index f9130b987..369af85d3 100644
--- a/.env.demo
+++ b/.env.demo
@@ -29,7 +29,7 @@ NATS_URL=nats://your-ip:4222
 REDIS_HOST=your-ip
 REDIS_PORT=6379
 
-SENDGRID_API_KEY= 
+SENDGRID_API_KEY=
 
 WALLET_STORAGE_HOST=your-ip
 WALLET_STORAGE_PORT=5432
@@ -76,7 +76,7 @@ AWS_ORG_LOGO_BUCKET_NAME=
 # Required (As connecting to org requires Shortened url)
 AWS_S3_STOREOBJECT_ACCESS_KEY=
 AWS_S3_STOREOBJECT_SECRET_KEY=
-AWS_S3_STOREOBJECT_REGION= 
+AWS_S3_STOREOBJECT_REGION=
 AWS_S3_STOREOBJECT_BUCKET=
 
 # Please refere AWS to determine your bucket url
@@ -84,7 +84,7 @@ AWS_S3_STOREOBJECT_BUCKET=
 SHORTENED_URL_DOMAIN='https://AWS_S3_STOREOBJECT_REGION.amazonaws.com/AWS_S3_STOREOBJECT_BUCKET'
 DEEPLINK_DOMAIN='https://link.credebl.id?url='
 
-ENABLE_CORS_IP_LIST=http://localhost:3000, http://localhost:3001, http://localhost:5000,http://localhost:8085,https://verify.credebl.id,https://verifyed.credebl.id,https://verify-api.credebl.id,https://qa.credebl.id,https://dev.credebl.id,https://credebl.id
+ENABLE_CORS_IP_LIST=http://localhost:3000,http://localhost:3001,http://localhost:5000,http://localhost:8085
 
 USER_NKEY_SEED=
 API_GATEWAY_NKEY_SEED=
diff --git a/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
new file mode 100644
index 000000000..4a95540b9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
@@ -0,0 +1,73 @@
+name: "\U0001F680 Feature Request - new"
+title: "feat: "
+description: Suggest an idea or enhancement for CREDEBL platform
+labels: [enhancement, triage]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Reporting a feature request/enhancement to CREDEBL
+        
+        Thank you for taking time to create a feature request for CREDEBL, your contribution will help
+        make the product better for everyone.
+
+        Make sure your issue has a generous description that will help others understand and fix it at earliest.
+
+  - type: checkboxes
+    id: preliminary-checks
+    attributes:
+      label: "✅ Preliminary Checks"
+      description: "Please confirm the following before submitting."
+      options:
+        - label: "I've read the [contibution guide](https://docs.credebl.id/docs/contribute/how-to-contribute) and agree to it"
+          required: true
+        - label: "I have searched [existing issues](https://github.com/credebl/platform/issues) and [pull requests](https://github.com/credebl/platform/pulls) to avoid duplicates."
+          required: true
+        - label: "I'm willing to create a PR for this feature. (if applicable)."
+
+  - type: textarea
+    id: problem-statement
+    attributes:
+      label: "🧩 Problem Statement"
+      description: "Is your feature request related to a problem? Please describe it clearly."
+      placeholder: "Ex: I'm always frustrated when [...]"
+    validations:
+      required: true
+
+  - type: textarea
+    id: proposed-solution
+    attributes:
+      label: "💡 Proposed Solution"
+      description: "A clear and concise description of what you want to happen."
+      placeholder: "Ex: It would be great if [...]"
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives-considered
+    attributes:
+      label: "🔄 Alternatives Considered"
+      description: "Have you considered any alternative solutions or features?"
+      placeholder: "Ex: I also thought about [...], but [...]"
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: "📎 Additional Context"
+      description: "Add any other context, references, mockups, or screenshots here."
+    validations:
+      required: false
+
+  - type: textarea
+    id: acceptance-criteria
+    attributes:
+      label: "✅ Acceptance Criteria"
+      description: "List specific tasks or outcomes that define when this request is complete."
+      placeholder: |
+        - A new endpoint `/v1/...` is added
+        - Docs updated
+        - Tests written and passing
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 08cd90e3e..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Prerequisites**
-
-**Steps to Reproduce**
-
-**Current behavior**
-
-**Expected behavior**
-
-**Environment**
-
-**Desktop**
- - OS: 
- - Browser:
- - Browser Version:
- - CREDEBL Version:
- 
-**Smartphone**
- - Device: 
- - OS: 
- - ADEYA version:
-
-**Screenshots or Screen recording**
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..a9f326c77
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,90 @@
+name: "🐛 Bug Report"
+description: Report a bug or unexpected behavior in the project
+labels: [bug]
+title: "fix: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Reporting a bug on CREDEBL
+        
+        Thank you for taking time to report the bug on CREDEBL, your contribution will help
+        make the product better for everyone.
+
+        Make sure your issue has a generous description that will help others understand and fix it at earliest.
+  - type: checkboxes
+    id: agreement
+    attributes:
+      label: Preliminary Checks
+      options:
+        - label: I have read the contributions guide [contibution guide](https://docs.credebl.id/docs/contribute/how-to-contribute) and agree to it
+          required: true
+        - label: I have searched [existing issues](https://github.com/credebl/platform/issues) and [pull requests](https://github.com/credebl/platform/pulls) to avoid duplicates.
+          required: true
+        - label: "I'm willing to create a PR for this feature. (if applicable)."
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: "🧪 Steps to Reproduce"
+      description: "Provide clear steps to reproduce the bug."
+      placeholder: |
+        1. Go to '...'
+        2. Click on '...'
+        3. Scroll down to '...'
+        4. See error
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: "✅ Expected Behavior"
+      description: "What did you expect to happen?"
+      placeholder: |
+        Ex: After clicking 'Submit', I expected a confirmation modal to appear.
+    validations:
+      required: true
+
+  - type: textarea
+    id: current-behavior
+    attributes:
+      label: "❌ Current Behavior"
+      description: "What is currently happening instead?"
+      placeholder: |
+        Ex: The page crashed with a 500 error when clicking 'Submit'.
+    validations:
+      required: true
+
+  - type: input
+    id: affected-version
+    attributes:
+      label: "📌 Affected Version/Commit"
+      description: "Version number, branch name, or commit hash where the bug occurs."
+      placeholder: "e.g., v1.2.3, main, 4f3e2d1"
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: environment
+    attributes:
+      label: "💻 Environment"
+      description: "Where did the issue occur?"
+      options:
+        - label: "Local development"
+        - label: "Production"
+        - label: "CI/CD"
+        - label: "Other"
+
+  - type: textarea
+    id: logs-and-screenshots
+    attributes:
+      label: "🧾 Relevant Logs, Screenshots, or Stack Traces"
+      description: "Paste any error messages or screenshots that can help diagnose the issue."
+      placeholder: |
+        Please include:
+        - Error logs
+        - Screenshots
+        - Console output
+        - Stack traces
+    validations:
+      required: false
diff --git a/Dockerfiles/Dockerfile.cloud-wallet b/Dockerfiles/Dockerfile.cloud-wallet
index a9d6d95af..db7e31f1e 100644
--- a/Dockerfiles/Dockerfile.cloud-wallet
+++ b/Dockerfiles/Dockerfile.cloud-wallet
@@ -1,10 +1,9 @@
 # Stage 1: Build the application
-FROM node:18-slim as build
+FROM node:18-alpine AS build
 # Install OpenSSL
+RUN apk add --no-cache openssl
 RUN npm install -g pnpm
 
-RUN apt-get update -y
-RUN apt-get --no-install-recommends install -y openssl
 # Set the working directory
 WORKDIR /app
 
@@ -25,10 +24,10 @@ RUN cd libs/prisma-service && npx prisma generate
 RUN pnpm run build cloud-wallet
 
 # Stage 2: Create the final image
-FROM node:18-slim
+FROM node:18-alpine
+
+RUN apk add --no-cache openssl
 
-RUN apt-get update -y
-RUN apt-get --no-install-recommends install -y openssl
 # Set the working directory
 WORKDIR /app
 # RUN npm install -g pnpm
diff --git a/Dockerfiles/Dockerfile.seed b/Dockerfiles/Dockerfile.seed
index f4c51da87..b7c6611b7 100644
--- a/Dockerfiles/Dockerfile.seed
+++ b/Dockerfiles/Dockerfile.seed
@@ -1,16 +1,18 @@
-FROM node:18 as build
+FROM node:18-alpine
 
 # Install pnpm
 RUN npm install -g pnpm
 
-# Install PostgreSQL client (use apt for Debian-based images)
-RUN apt-get update && apt-get install -y postgresql-client
+RUN apk add --no-cache postgresql-client openssl 
 
 # Set working directory
 WORKDIR /app
 
 COPY . .
+RUN chmod +x /app/libs/prisma-service/prisma/scripts/geo_location_data_import.sh
+RUN chmod +x /app/libs/prisma-service/prisma/scripts/update_client_credential_data.sh
 
+ENV PUPPETEER_SKIP_DOWNLOAD=true
 RUN pnpm i --ignore-scripts
 
 # Run Prisma commands
diff --git a/Dockerfiles/Dockerfile.user b/Dockerfiles/Dockerfile.user
index 41bc20ddc..8969f6e77 100644
--- a/Dockerfiles/Dockerfile.user
+++ b/Dockerfiles/Dockerfile.user
@@ -1,32 +1,20 @@
 # Stage 1: Build the application
-FROM node:18-slim as build
-
-
+FROM node:18-alpine AS build
 
+# Install OpenSSL
+RUN apk add --no-cache openssl
 RUN npm install -g pnpm
 
-# We don't need the standalone Chromium
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-ENV PUPPETEER_SKIP_DOWNLOAD true
-
-# Install Google Chrome Stable and fonts
-# Note: this installs the necessary libs to make the browser work with Puppeteer.
-RUN apt-get update && apt-get install openssl gnupg wget -y && \
-    wget --quiet --output-document=- https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /etc/apt/trusted.gpg.d/google-archive.gpg && \
-    sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
-    apt-get update && \
-    apt-get install google-chrome-stable -y --no-install-recommends && \
-    rm -rf /var/lib/apt/lists/*
-
-# RUN apk update && apk list --all-versions chromium
 # Set the working directory
 WORKDIR /app
 
 # Copy package.json and package-lock.json
 COPY package.json ./
 
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
 # Install dependencies
-RUN pnpm install
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
@@ -37,24 +25,11 @@ RUN cd libs/prisma-service && npx prisma generate
 RUN pnpm run build user
 
 # Stage 2: Create the final image
-FROM node:18-slim
-
-# We don't need the standalone Chromium
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-ENV PUPPETEER_SKIP_DOWNLOAD true
-
-# Install Google Chrome Stable and fonts
-# Note: this installs the necessary libs to make the browser work with Puppeteer.
-RUN apt-get update && apt-get install openssl gnupg wget -y && \
-    wget --quiet --output-document=- https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /etc/apt/trusted.gpg.d/google-archive.gpg && \
-    sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
-    apt-get update && \
-    apt-get install google-chrome-stable -y --no-install-recommends && \
-    rm -rf /var/lib/apt/lists/*
+FROM node:18-alpine
 
+RUN apk add --no-cache openssl
 # Set the working directory
 WORKDIR /app
-RUN npm install -g pnpm
 
 # Copy the compiled code from the build stage
 COPY --from=build /app/dist/apps/user/ ./dist/apps/user/
diff --git a/Dockerfiles/Dockerfile.utility b/Dockerfiles/Dockerfile.utility
index ad96df022..a39aef3b8 100644
--- a/Dockerfiles/Dockerfile.utility
+++ b/Dockerfiles/Dockerfile.utility
@@ -1,10 +1,9 @@
 # Stage 1: Build the application
-FROM node:18-slim as build
+FROM node:18-alpine AS build
 
+# Install OpenSSL
+RUN apk add --no-cache openssl
 RUN npm install -g pnpm
-
-RUN apt-get update -y
-RUN apt-get --no-install-recommends install -y openssl
 # Set the working directory
 WORKDIR /app
 
@@ -25,10 +24,9 @@ RUN cd libs/prisma-service && npx prisma generate
 RUN pnpm run build utility
 
 # Stage 2: Create the final image
-FROM node:18-slim
+FROM node:18-alpine
 
-RUN apt-get update -y
-RUN apt-get --no-install-recommends install -y openssl
+RUN apk add --no-cache openssl
 # Set the working directory
 WORKDIR /app
 # RUN npm install -g pnpm
diff --git a/README.md b/README.md
index efebe8b60..71336eb02 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ docker run --name some-postgres -p 5432:5432 -e POSTGRES_PASSWORD=<secretpasswor
 **Run prisma to generate db schema**
 
 ```bash
-cd ./libs/prisma-servie/prisma
+cd ./libs/prisma-service/prisma
 npx prisma generate
 npx prisma db push
 ```
@@ -33,7 +33,7 @@ npx prisma db push
 **Seed initial data**
 
 ```bash
-cd ./libs/prisma-servie
+cd ./libs/prisma-service
 npx prisma db seed
 ```
 
diff --git a/agent.env b/agent.env
index 1398f6239..41bf0c008 100644
--- a/agent.env
+++ b/agent.env
@@ -20,7 +20,7 @@ RPC_URL=https://polygon-rpc.com
 # RPC_URL=https://rpc-amoy.polygon.technology
 
 # Add url and token from your file server 
-SERVER_URL=https://schema.credebl.id
+SERVER_URL=
 FILE_SERVER_TOKEN=
 
 BCOVRIN_TEST_GENESIS='{"reqSignature":{},"txn":{"data":{"data":{"alias":"Node1","blskey":"4N8aUNHSgjQVgkpm8nhNEfDf6txHznoYREg9kirmJrkivgL4oSEimFF6nsQ6M41QvhM2Z33nves5vfSn9n1UwNFJBYtWVnHYMATn76vLuL3zU88KyeAYcHfsih3He6UHcXDxcaecHVz6jhCYz1P2UZn2bDVruL5wXpehgBfBaLKm3Ba","blskey_pop":"RahHYiCvoNCtPTrVtP7nMC5eTYrsUA8WjXbdhNc8debh1agE9bGiJxWBXYNFbnJXoXhWFMvyqhqhRoq737YQemH5ik9oL7R4NTTCz2LEZhkgLJzB3QRQqJyBNyv7acbdHrAT8nQ9UkLbaVL9NBpnWXBTw4LEMePaSHEw66RzPNdAX1","client_ip":"138.197.138.255","client_port":9702,"node_ip":"138.197.138.255","node_port":9701,"services":["VALIDATOR"]},"dest":"Gw6pDLhcBcoQesN72qfotTgFa7cbuqZpkX3Xo6pLhPhv"},"metadata":{"from":"Th7MpTaRZVRYnPiabds81Y"},"type":"0"},"txnMetadata":{"seqNo":1,"txnId":"fea82e10e894419fe2bea7d96296a6d46f50f93f9eeda954ec461b2ed2950b62"},"ver":"1"}
diff --git a/apps/issuance/src/issuance.processor.ts b/apps/issuance/src/issuance.processor.ts
index be45d2a36..23365f909 100644
--- a/apps/issuance/src/issuance.processor.ts
+++ b/apps/issuance/src/issuance.processor.ts
@@ -11,16 +11,12 @@ export class BulkIssuanceProcessor {
 
   @OnQueueActive()
   onActive(job: Job): void {
-    this.logger.log(
-      `Emitting job status${job.id} of type ${job.name} with data ${JSON.stringify(job.data)}...`
-    );
+    this.logger.log(`Emitting job status${job.id} of type ${job.name} ...`);
   }
 
   @Process()
-  async issueCredential(job: Job<IQueuePayload>):Promise<void> {
-    this.logger.log(
-      `Processing job ${job.id} of type ${job.name} with data ${JSON.stringify(job.data)}...`
-    );
+  async issueCredential(job: Job<IQueuePayload>): Promise<void> {
+    this.logger.log(`Processing job ${job.id} of type ${job.name} ...`);
 
     this.issuanceService.processIssuanceData(job.data);
   }
diff --git a/apps/organization/repositories/organization.repository.ts b/apps/organization/repositories/organization.repository.ts
index dfec7845b..017c6816f 100644
--- a/apps/organization/repositories/organization.repository.ts
+++ b/apps/organization/repositories/organization.repository.ts
@@ -1,45 +1,45 @@
 /* eslint-disable prefer-destructuring */
 /* eslint-disable camelcase */
 
-import { ConflictException, Injectable, Logger, NotFoundException, InternalServerErrorException } from '@nestjs/common';
-// eslint-disable-next-line camelcase
+import { ConflictException, Injectable, InternalServerErrorException, Logger, NotFoundException } from '@nestjs/common';
 import {
-  Prisma,
-  agent_invitations,
-  org_agents,
-  org_invitations,
-  user,
-  user_org_roles,
-  organisation,
-  org_roles
-} from '@prisma/client';
-
-import { CreateOrganizationDto } from '../dtos/create-organization.dto';
+  IDeleteOrganization,
+  IOrganization,
+  IOrganizationDashboard,
+  IOrganizationInvitations
+} from '@credebl/common/interfaces/organization.interface';
 import {
-  IGetDids,
   IDidDetails,
   IDidList,
+  IGetDids,
   IGetOrgById,
   IGetOrganization,
-  IPrimaryDidDetails,
-  IUpdateOrganization,
-  ILedgerNameSpace,
-  OrgInvitation,
   ILedgerDetails,
+  ILedgerNameSpace,
+  IOrgDetails,
   IOrgRoleDetails,
-  IOrgDetails
+  IPrimaryDidDetails,
+  IUpdateOrganization,
+  OrgInvitation
 } from '../interfaces/organization.interface';
 import { Invitation, PrismaTables, SortValue } from '@credebl/enum/enum';
-import { PrismaService } from '@credebl/prisma-service';
-import { UserOrgRolesService } from '@credebl/user-org-roles';
-import { ResponseMessages } from '@credebl/common/response-messages';
+// eslint-disable-next-line camelcase
 import {
-  IOrganizationInvitations,
-  IOrganization,
-  IOrganizationDashboard,
-  IDeleteOrganization
-} from '@credebl/common/interfaces/organization.interface';
+  Prisma,
+  agent_invitations,
+  org_agents,
+  org_invitations,
+  org_roles,
+  organisation,
+  user,
+  user_org_roles
+} from '@prisma/client';
+
+import { CreateOrganizationDto } from '../dtos/create-organization.dto';
 import { IOrgRoles } from 'libs/org-roles/interfaces/org-roles.interface';
+import { PrismaService } from '@credebl/prisma-service';
+import { ResponseMessages } from '@credebl/common/response-messages';
+import { UserOrgRolesService } from '@credebl/user-org-roles';
 
 @Injectable()
 export class OrganizationRepository {
@@ -479,6 +479,13 @@ export class OrganizationRepository {
               createDateTime: true,
               tenantId: true,
               agent_invitations: {
+                where: {
+                  multiUse: true
+                },
+                orderBy: {
+                  lastChangedDateTime: SortValue.DESC
+                },
+                take: 1,
                 select: {
                   id: true,
                   connectionInvitation: true,
diff --git a/apps/verification/src/verification.service.ts b/apps/verification/src/verification.service.ts
index 49cb45d86..fe99e8cf8 100644
--- a/apps/verification/src/verification.service.ts
+++ b/apps/verification/src/verification.service.ts
@@ -243,20 +243,14 @@ export class VerificationService {
       const getProofPresentationById = await this._getProofPresentationById(payload);
       return getProofPresentationById?.response;
     } catch (error) {
-      this.logger.error(
-        `[getProofPresentationById] - error in get proof presentation by proofId : ${JSON.stringify(error)}`
-      );
-      const errorStack = error?.response?.error?.reason;
+      this.logger.error(`[getProofPresentationById] - error in get proof presentation by proofId : ${JSON.stringify(error)}`);
+      const errorMessage = error?.response?.error?.reason || error?.message;
 
-      if (errorStack) {
-        throw new RpcException({
-          message: ResponseMessages.verification.error.proofNotFound,
-          statusCode: error?.response?.status,
-          error: errorStack
-        });
-      } else {
-        throw new RpcException(error.response ? error.response : error);
+      if (errorMessage?.includes('not found')) {
+        throw new NotFoundException(errorMessage);
       }
+
+      throw new RpcException(error.response ? error.response : error);
     }
   }
 
diff --git a/libs/prisma-service/prisma/scripts/geo_location_data_import.sh b/libs/prisma-service/prisma/scripts/geo_location_data_import.sh
index e598ce5f8..61247b088 100755
--- a/libs/prisma-service/prisma/scripts/geo_location_data_import.sh
+++ b/libs/prisma-service/prisma/scripts/geo_location_data_import.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Database connection details
 DB_URL=$1
diff --git a/libs/prisma-service/prisma/scripts/update_client_credential_data.sh b/libs/prisma-service/prisma/scripts/update_client_credential_data.sh
index 2b6d49a54..1c62ffa4a 100755
--- a/libs/prisma-service/prisma/scripts/update_client_credential_data.sh
+++ b/libs/prisma-service/prisma/scripts/update_client_credential_data.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Database connection URL
 DB_URL=$1
@@ -30,7 +30,7 @@ update_client_credentials() {
 }
 
 # Check if CLIENT_ID and CLIENT_SECRET are not empty
-if [[ -n "$CLIENT_ID" && -n "$CLIENT_SECRET" ]]; then
+if [ -n "$CLIENT_ID" ] && [ -n "$CLIENT_SECRET" ]; then
     # Update client credentials if both CLIENT_ID and CLIENT_SECRET are provided
     update_client_credentials
 else