diff --git a/Dockerfile b/Dockerfile
index ae8ebe9..8d98b0a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
 # Builder stage
-FROM node:16-alpine AS builder
+FROM node:16-bullseye-slim AS builder
 WORKDIR /home/node/app
 
 COPY . .
 RUN yarn cache clean && yarn --frozen-lockfile && yarn build
 
 # Production stage
-FROM node:16-alpine AS production
+FROM node:16-bullseye-slim AS production
 WORKDIR /home/node/app
 
 COPY --from=builder /home/node/app/package.json .
diff --git a/cli/Dockerfile b/cli/Dockerfile
index a3acf86..30e13d3 100644
--- a/cli/Dockerfile
+++ b/cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-alpine
+FROM node:16-bullseye-slim
 
 WORKDIR /home/node/app
 
diff --git a/development.Dockerfile b/development.Dockerfile
index b8cb7e5..0f0ac8d 100644
--- a/development.Dockerfile
+++ b/development.Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-alpine
+FROM node:16-bullseye-slim
 WORKDIR /home/node/app
 
 # Copy package.json and yarn.lock and npmrc to the container
diff --git a/samples/wallet-mock/config.js b/samples/wallet-mock/config.js
index 16273e0..ccc94b4 100644
--- a/samples/wallet-mock/config.js
+++ b/samples/wallet-mock/config.js
@@ -1,5 +1,5 @@
 module.exports = {
-	walletBackendUrl: "http://127.0.0.1:8002",
+	walletBackendUrl: "http://wallet-backend-server:8002",
 	// trustedIssuerDID: "did:ebsi:zc6MhmU4NbKSAtAHx8XgpEW",
 	uoaTrustedIssuerDID: "did:ebsi:zpq1XFkNWgsGB6MuvJp21vA",
 	vidTrustedIssuerDID: "did:ebsi:zyhE5cJ7VVqYT4gZmoKadFt",
diff --git a/samples/wallet-mock/development.Dockerfile b/samples/wallet-mock/development.Dockerfile
index 5dee910..b3120b6 100644
--- a/samples/wallet-mock/development.Dockerfile
+++ b/samples/wallet-mock/development.Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-alpine
+FROM node:16-bullseye-slim
 WORKDIR /home/node/app
 
 # Copy package.json and yarn.lock and npmrc to the container