diff --git a/Dockerfiles/Dockerfile.agent-service b/Dockerfiles/Dockerfile.agent-service
index 1e6a1dbd33..41de1cb78f 100644
--- a/Dockerfiles/Dockerfile.agent-service
+++ b/Dockerfiles/Dockerfile.agent-service
@@ -33,4 +33,4 @@ COPY --from=build /app/dist/apps/agent-service/ ./dist/apps/agent-service/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/agent-service/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deployy && cd ../.. && node dist/apps/agent-service/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.api-gateway b/Dockerfiles/Dockerfile.api-gateway
index 2d92323122..f8db645482 100644
--- a/Dockerfiles/Dockerfile.api-gateway
+++ b/Dockerfiles/Dockerfile.api-gateway
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/api-gateway/ ./dist/apps/api-gateway/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/api-gateway/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/api-gateway/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.cloud-wallet b/Dockerfiles/Dockerfile.cloud-wallet
index 1f60b6ba4f..1299b9b7b3 100644
--- a/Dockerfiles/Dockerfile.cloud-wallet
+++ b/Dockerfiles/Dockerfile.cloud-wallet
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/cloud-wallet/ ./dist/apps/cloud-wallet/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/cloud-wallet/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/cloud-wallet/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.connection b/Dockerfiles/Dockerfile.connection
index efda730c84..799c1f5bcf 100644
--- a/Dockerfiles/Dockerfile.connection
+++ b/Dockerfiles/Dockerfile.connection
@@ -1,7 +1,7 @@
 # Stage 1: Build the application
 FROM node:24-alpine3.21 AS build
 RUN apk update && apk upgrade && apk add --no-cache openssl=3.3.6-r0 \
-     && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/*
 RUN npm install -g pnpm@9.15.3 --ignore-scripts
 WORKDIR /app
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/connection/ ./dist/apps/connection/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/connection/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/connection/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.ecosystem b/Dockerfiles/Dockerfile.ecosystem
index 05706725b6..dad9a00c92 100644
--- a/Dockerfiles/Dockerfile.ecosystem
+++ b/Dockerfiles/Dockerfile.ecosystem
@@ -1,7 +1,7 @@
 # Stage 1: Build the application
 FROM node:24-alpine3.21 AS build
 RUN apk update && apk upgrade && apk add --no-cache openssl=3.3.6-r0 \
-     && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/*
 RUN npm install -g pnpm@9.15.3 --ignore-scripts
 WORKDIR /app
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/ecosystem/ ./dist/apps/ecosystem/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/ecosystem/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/ecosystem/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.geolocation b/Dockerfiles/Dockerfile.geolocation
index 93cedacee6..8d9cedcadb 100644
--- a/Dockerfiles/Dockerfile.geolocation
+++ b/Dockerfiles/Dockerfile.geolocation
@@ -1,7 +1,7 @@
 # Stage 1: Build the application
 FROM node:24-alpine3.21 AS build
 RUN apk update && apk upgrade && apk add --no-cache openssl=3.3.6-r0 \
-     && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/*
 RUN npm install -g pnpm@9.15.3 --ignore-scripts
 WORKDIR /app
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/geo-location/ ./dist/apps/geo-location/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/geo-location/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/geo-location/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.issuance b/Dockerfiles/Dockerfile.issuance
index 30f8e7d56d..d210754a8b 100644
--- a/Dockerfiles/Dockerfile.issuance
+++ b/Dockerfiles/Dockerfile.issuance
@@ -1,7 +1,7 @@
 # Stage 1: Build the application
 FROM node:24-alpine3.21 AS build
 RUN apk update && apk upgrade && apk add --no-cache openssl=3.3.6-r0 \
-     && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/*
 RUN npm install -g pnpm@9.15.3 --ignore-scripts
 WORKDIR /app
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/issuance/ ./dist/apps/issuance/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/issuance/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/issuance/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.ledger b/Dockerfiles/Dockerfile.ledger
index a9fd0a0b87..6dba6c192b 100644
--- a/Dockerfiles/Dockerfile.ledger
+++ b/Dockerfiles/Dockerfile.ledger
@@ -1,7 +1,7 @@
 # Stage 1: Build the application
 FROM node:24-alpine3.21 AS build
 RUN apk update && apk upgrade && apk add --no-cache openssl=3.3.6-r0 \
-     && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/*
 RUN npm install -g pnpm@9.15.3 --ignore-scripts
 WORKDIR /app
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/ledger/ ./dist/apps/ledger/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/ledger/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/ledger/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.notification b/Dockerfiles/Dockerfile.notification
index ceea806862..24587eefdc 100644
--- a/Dockerfiles/Dockerfile.notification
+++ b/Dockerfiles/Dockerfile.notification
@@ -22,4 +22,4 @@ COPY --from=build /app/dist/apps/notification/ ./dist/apps/notification/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/notification/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/notification/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.oid4vc-issuance b/Dockerfiles/Dockerfile.oid4vc-issuance
index 6c04387f34..220e998ab5 100644
--- a/Dockerfiles/Dockerfile.oid4vc-issuance
+++ b/Dockerfiles/Dockerfile.oid4vc-issuance
@@ -22,4 +22,4 @@ COPY --from=build /app/dist/apps/oid4vc-issuance/ ./dist/apps/oid4vc-issuance/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/oid4vc-issuance/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/oid4vc-issuance/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.oid4vc-verification b/Dockerfiles/Dockerfile.oid4vc-verification
index 794fcb39ae..199374ef13 100644
--- a/Dockerfiles/Dockerfile.oid4vc-verification
+++ b/Dockerfiles/Dockerfile.oid4vc-verification
@@ -1,7 +1,7 @@
 # Stage 1: Build the application
 FROM node:24-alpine3.21 AS build
 RUN apk update && apk upgrade && apk add --no-cache openssl=3.3.6-r0 \
-     && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/*
 RUN npm install -g pnpm@9.15.3 --ignore-scripts
 WORKDIR /app
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/oid4vc-verification/ ./dist/apps/oid4vc-verific
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/oid4vc-verification/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/oid4vc-verification/main.js"]
diff --git a/Dockerfiles/Dockerfile.organization b/Dockerfiles/Dockerfile.organization
index 906320b05e..80efd77c44 100644
--- a/Dockerfiles/Dockerfile.organization
+++ b/Dockerfiles/Dockerfile.organization
@@ -1,7 +1,7 @@
 # Stage 1: Build the application
 FROM node:24-alpine3.21 AS build
 RUN apk update && apk upgrade && apk add --no-cache openssl=3.3.6-r0 \
-     && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/*
 RUN npm install -g pnpm@9.15.3 --ignore-scripts
 WORKDIR /app
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/organization/ ./dist/apps/organization/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/organization/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/organization/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.seed b/Dockerfiles/Dockerfile.seed
index b1b37c4747..39213de213 100644
--- a/Dockerfiles/Dockerfile.seed
+++ b/Dockerfiles/Dockerfile.seed
@@ -13,4 +13,4 @@ RUN pnpm i --frozen-lockfile --ignore-scripts \
     && cd libs/prisma-service && npx prisma generate \
     && chown -R nextjs:nodejs /app
 USER nextjs
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma db seed"]
\ No newline at end of file
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma db seed"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.user b/Dockerfiles/Dockerfile.user
index 71e27d0505..7fbfe1d9eb 100644
--- a/Dockerfiles/Dockerfile.user
+++ b/Dockerfiles/Dockerfile.user
@@ -1,7 +1,7 @@
 # Stage 1: Build the application
 FROM node:24-alpine3.21 AS build
 RUN apk update && apk upgrade && apk add --no-cache openssl=3.3.6-r0 \
-     && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/*
 RUN npm install -g pnpm@9.15.3 --ignore-scripts
 WORKDIR /app
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/user/ ./dist/apps/user/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/user/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/user/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.utility b/Dockerfiles/Dockerfile.utility
index 6f696be41e..7b503cce94 100644
--- a/Dockerfiles/Dockerfile.utility
+++ b/Dockerfiles/Dockerfile.utility
@@ -1,7 +1,7 @@
 # Stage 1: Build the application
 FROM node:24-alpine3.21 AS build
 RUN apk update && apk upgrade && apk add --no-cache openssl=3.3.6-r0 \
-     && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/*
 RUN npm install -g pnpm@9.15.3 --ignore-scripts
 WORKDIR /app
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/utility/ ./dist/apps/utility/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/utility/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/utility/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.verification b/Dockerfiles/Dockerfile.verification
index 013c6afe6f..9bd2a7123c 100644
--- a/Dockerfiles/Dockerfile.verification
+++ b/Dockerfiles/Dockerfile.verification
@@ -1,7 +1,7 @@
 # Stage 1: Build the application
 FROM node:24-alpine3.21 AS build
 RUN apk update && apk upgrade && apk add --no-cache openssl=3.3.6-r0 \
-     && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/*
 RUN npm install -g pnpm@9.15.3 --ignore-scripts
 WORKDIR /app
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/verification/ ./dist/apps/verification/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/verification/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/verification/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.webhook b/Dockerfiles/Dockerfile.webhook
index 67d516d57e..a086575048 100644
--- a/Dockerfiles/Dockerfile.webhook
+++ b/Dockerfiles/Dockerfile.webhook
@@ -1,7 +1,7 @@
 # Stage 1: Build the application
 FROM node:24-alpine3.21 AS build
 RUN apk update && apk upgrade && apk add --no-cache openssl=3.3.6-r0 \
-     && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/*
 RUN npm install -g pnpm@9.15.3 --ignore-scripts
 WORKDIR /app
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/webhook/ ./dist/apps/webhook/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/webhook/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/webhook/main.js"]
\ No newline at end of file
diff --git a/Dockerfiles/Dockerfile.x509 b/Dockerfiles/Dockerfile.x509
index d1e4cd756f..2ab1c4e760 100644
--- a/Dockerfiles/Dockerfile.x509
+++ b/Dockerfiles/Dockerfile.x509
@@ -1,7 +1,7 @@
 # Stage 1: Build the application
 FROM node:24-alpine3.21 AS build
 RUN apk update && apk upgrade && apk add --no-cache openssl=3.3.6-r0 \
-     && rm -rf /var/cache/apk/*
+    && rm -rf /var/cache/apk/*
 RUN npm install -g pnpm@9.15.3 --ignore-scripts
 WORKDIR /app
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -23,4 +23,4 @@ COPY --from=build /app/dist/apps/x509/ ./dist/apps/x509/
 COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules ./node_modules
 USER nextjs
-CMD ["node", "dist/apps/x509/main.js"]
\ No newline at end of file
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/x509/main.js"]
diff --git a/apps/agent-provisioning/AFJ/scripts/docker_start_agent.sh b/apps/agent-provisioning/AFJ/scripts/docker_start_agent.sh
index 5a37541407..ec7afe5a37 100644
--- a/apps/agent-provisioning/AFJ/scripts/docker_start_agent.sh
+++ b/apps/agent-provisioning/AFJ/scripts/docker_start_agent.sh
@@ -126,7 +126,7 @@ cat <<EOF >${CONFIG_FILE}
   "walletPassword": "$WALLET_STORAGE_PASSWORD",
   "walletAdminAccount": "$WALLET_STORAGE_USER",
   "walletAdminPassword": "$WALLET_STORAGE_PASSWORD",
-  "walletScheme": "DatabasePerWallet",
+  "walletScheme": "ProfilePerWallet",
   "indyLedger": $INDY_LEDGER,
   "endpoint": [
     "$AGENT_ENDPOINT"
diff --git a/apps/agent-provisioning/AFJ/scripts/fargate.sh b/apps/agent-provisioning/AFJ/scripts/fargate.sh
index 6033f03c27..d707be9810 100644
--- a/apps/agent-provisioning/AFJ/scripts/fargate.sh
+++ b/apps/agent-provisioning/AFJ/scripts/fargate.sh
@@ -127,7 +127,7 @@ cat <<EOF >$PWD/agent-provisioning/AFJ/agent-config/${AGENCY}_${CONTAINER_NAME}.
   "walletPassword": "$WALLET_STORAGE_PASSWORD",
   "walletAdminAccount": "$WALLET_STORAGE_USER",
   "walletAdminPassword": "$WALLET_STORAGE_PASSWORD",
-  "walletScheme": "DatabasePerWallet",
+  "walletScheme": "ProfilePerWallet",
   "indyLedger": $INDY_LEDGER,
   "endpoint": [
     "$INBOUND_ENDPOINT"
diff --git a/apps/agent-provisioning/AFJ/scripts/on_premises_agent.sh b/apps/agent-provisioning/AFJ/scripts/on_premises_agent.sh
index 5b1136290e..563c1ca065 100644
--- a/apps/agent-provisioning/AFJ/scripts/on_premises_agent.sh
+++ b/apps/agent-provisioning/AFJ/scripts/on_premises_agent.sh
@@ -214,7 +214,7 @@ cat <<EOF >${CONFIG_FILE}
   "walletPassword": "$WALLET_STORAGE_PASSWORD",
   "walletAdminAccount": "$WALLET_STORAGE_USER",
   "walletAdminPassword": "$WALLET_STORAGE_PASSWORD",
-  "walletScheme": "DatabasePerWallet",
+  "walletScheme": "ProfilePerWallet",
   "indyLedger": $INDY_LEDGER_FORMATTED,
   "endpoint": [
     "$AGENT_ENDPOINT"
diff --git a/apps/agent-provisioning/AFJ/scripts/start_agent.sh b/apps/agent-provisioning/AFJ/scripts/start_agent.sh
index db8c49b244..c15c2ce834 100755
--- a/apps/agent-provisioning/AFJ/scripts/start_agent.sh
+++ b/apps/agent-provisioning/AFJ/scripts/start_agent.sh
@@ -126,7 +126,7 @@ cat <<EOF >"$CONFIG_FILE"
   "walletPassword": "$WALLET_STORAGE_PASSWORD",
   "walletAdminAccount": "$WALLET_STORAGE_USER",
   "walletAdminPassword": "$WALLET_STORAGE_PASSWORD",
-  "walletScheme": "DatabasePerWallet",
+  "walletScheme": "ProfilePerWallet",
   "indyLedger": $INDY_LEDGER,
   "endpoint": [
     "$AGENT_ENDPOINT"
diff --git a/apps/agent-provisioning/AFJ/scripts/start_agent_ecs.sh b/apps/agent-provisioning/AFJ/scripts/start_agent_ecs.sh
index 03a989c928..bfc7e8610c 100644
--- a/apps/agent-provisioning/AFJ/scripts/start_agent_ecs.sh
+++ b/apps/agent-provisioning/AFJ/scripts/start_agent_ecs.sh
@@ -124,7 +124,7 @@ cat <<EOF >/app/agent-provisioning/AFJ/agent-config/${AGENCY}_${CONTAINER_NAME}.
   "walletPassword": "$WALLET_STORAGE_PASSWORD",
   "walletAdminAccount": "$WALLET_STORAGE_USER",
   "walletAdminPassword": "$WALLET_STORAGE_PASSWORD",
-  "walletScheme": "DatabasePerWallet",
+  "walletScheme": "ProfilePerWallet",
   "indyLedger": $INDY_LEDGER,
   "endpoint": [
     "$INBOUND_ENDPOINT"
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 66bcbbd618..59d392828d 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -129,6 +129,7 @@ services:
       - ./.env
     environment:
       - ROOT_PATH=$PWD/apps/agent-provisioning/AFJ/agent-config
+    user: root
     volumes:
       - $PWD/apps/agent-provisioning/AFJ/agent-config:/app/agent-provisioning/AFJ/agent-config
       - /var/run/docker.sock:/var/run/docker.sock
@@ -151,6 +152,7 @@ services:
       dockerfile: Dockerfiles/Dockerfile.agent-service
     env_file:
       - ./.env
+    user: root
     volumes:
     - /var/run/docker.sock:/var/run/docker.sock
     volumes_from:
@@ -191,9 +193,42 @@ services:
       dockerfile: Dockerfiles/Dockerfile.webhook
     env_file:
       - ./.env
-  
-  
-
+  ecosystem:
+    depends_on:
+      - nats
+      - api-gateway
+    build:
+      context: ./  # Adjust the context path as needed
+      dockerfile: Dockerfiles/Dockerfile.ecosystem
+    env_file:
+      - ./.env
+  oid4vc-issuance:
+    depends_on:
+      - nats
+      - api-gateway
+    build:
+      context: ./  # Adjust the context path as needed
+      dockerfile: Dockerfiles/Dockerfile.oid4vc-issuance
+    env_file:
+      - ./.env
+  oid4vc-verification:
+    depends_on:
+      - nats
+      - api-gateway
+    build:
+      context: ./  # Adjust the context path as needed
+      dockerfile: Dockerfiles/Dockerfile.oid4vc-verification
+    env_file:
+      - ./.env
+  x509:
+    depends_on:
+      - nats
+      - api-gateway
+    build:
+      context: ./  # Adjust the context path as needed
+      dockerfile: Dockerfiles/Dockerfile.x509
+    env_file:
+      - ./.env
   
 volumes:
   cache:
diff --git a/docker-compose.yml b/docker-compose.yml
index 95aee4d672..a2701cfa2e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
     env_file:
       - ./.env
     volumes:
-      - $PWD/libs/prisma-service/prisma/data/credebl-master-table.json:/app/libs/prisma-service/prisma/data/credebl-master-table.json
+      - $PWD/libs/prisma-service/prisma/data/credebl-master-table/credebl-master-table.json:/app/libs/prisma-service/prisma/data/credebl-master-table.json
   api-gateway:
     depends_on:
       - nats  # Use depends_on instead of needs
@@ -118,6 +118,7 @@ services:
       - ./.env
     environment:
       - ROOT_PATH=$PWD/apps/agent-provisioning/AFJ/agent-config
+    user: root
     volumes:
       - $PWD/apps/agent-provisioning/AFJ/agent-config:/app/agent-provisioning/AFJ/agent-config
       - /var/run/docker.sock:/var/run/docker.sock
@@ -138,6 +139,7 @@ services:
     image: ghcr.io/credebl/agent-service:latest
     env_file:
       - ./.env
+    user: root
     volumes:
     - /var/run/docker.sock:/var/run/docker.sock
     volumes_from:
@@ -170,6 +172,42 @@ services:
     image: ghcr.io/credebl/webhook:latest
     env_file:
       - ./.env
+  ecosystem:
+    depends_on:
+      - nats
+      - api-gateway
+    build:
+      context: ./  # Adjust the context path as needed
+      dockerfile: Dockerfiles/Dockerfile.ecosystem
+    env_file:
+      - ./.env
+  oid4vc-issuance:
+    depends_on:
+      - nats
+      - api-gateway
+    build:
+      context: ./  # Adjust the context path as needed
+      dockerfile: Dockerfiles/Dockerfile.oid4vc-issuance
+    env_file:
+      - ./.env
+  oid4vc-verification:
+    depends_on:
+      - nats
+      - api-gateway
+    build:
+      context: ./  # Adjust the context path as needed
+      dockerfile: Dockerfiles/Dockerfile.oid4vc-verification
+    env_file:
+      - ./.env
+  x509:
+    depends_on:
+      - nats
+      - api-gateway
+    build:
+      context: ./  # Adjust the context path as needed
+      dockerfile: Dockerfiles/Dockerfile.x509
+    env_file:
+      - ./.env
   schema-file-server:
     container_name: schema-file-server
     image: ghcr.io/credebl/schema-file-server:latest