diff --git a/Dockerfile.bene-portal b/Dockerfile.bene-portal
index 41d4c35..bff5cd5 100644
--- a/Dockerfile.bene-portal
+++ b/Dockerfile.bene-portal
@@ -41,12 +41,12 @@ USER ${container_user}
 # Environment variables
 ENV PYTHONUNBUFFERED=1
 ENV PYTHONDONTWRITEBYTECODE=1
-ENV SPAR_BENE_PORTAL_HOST=0.0.0.0
-ENV SPAR_BENE_PORTAL_PORT=8000
-ENV SPAR_BENE_PORTAL_NO_OF_WORKERS=4
+ENV G2P_SPAR_BENE_PORTAL_HOST=0.0.0.0
+ENV G2P_SPAR_BENE_PORTAL_PORT=8000
+ENV G2P_SPAR_BENE_PORTAL_NO_OF_WORKERS=4
 
 # Set working directory to the bene portal API
 WORKDIR /app/openg2p-spar-bene-portal-api
 
 # Run application
-CMD ["sh", "-c", "gunicorn main:app --workers ${SPAR_BENE_PORTAL_NO_OF_WORKERS} --worker-class uvicorn.workers.UvicornWorker --bind ${SPAR_BENE_PORTAL_HOST}:${SPAR_BENE_PORTAL_PORT} --access-logfile - --error-logfile -"]
+CMD ["sh", "-c", "gunicorn main:app --workers ${G2P_SPAR_BENE_PORTAL_NO_OF_WORKERS} --worker-class uvicorn.workers.UvicornWorker --bind ${G2P_SPAR_BENE_PORTAL_HOST}:${G2P_SPAR_BENE_PORTAL_PORT} --access-logfile - --error-logfile -"]
diff --git a/Dockerfile.mapper b/Dockerfile.mapper
index edd8a78..f4d64cc 100644
--- a/Dockerfile.mapper
+++ b/Dockerfile.mapper
@@ -42,12 +42,12 @@ USER ${container_user}
 # Environment variables
 ENV PYTHONUNBUFFERED=1
 ENV PYTHONDONTWRITEBYTECODE=1
-ENV SPAR_MAPPER_API_HOST=0.0.0.0
-ENV SPAR_MAPPER_API_PORT=8000
-ENV SPAR_MAPPER_API_NO_OF_WORKERS=4
+ENV G2P_SPAR_MAPPER_API_HOST=0.0.0.0
+ENV G2P_SPAR_MAPPER_API_PORT=8000
+ENV G2P_SPAR_MAPPER_API_NO_OF_WORKERS=4
 
 # Set working directory to the mapper API
 WORKDIR /app/openg2p-spar-mapper-api
 
 # Run application
-CMD ["sh", "-c", "gunicorn main:app --workers ${SPAR_MAPPER_API_NO_OF_WORKERS} --worker-class uvicorn.workers.UvicornWorker --bind ${SPAR_MAPPER_API_HOST}:${SPAR_MAPPER_API_PORT} --access-logfile - --error-logfile -"]
+CMD ["sh", "-c", "gunicorn main:app --workers ${G2P_SPAR_MAPPER_API_NO_OF_WORKERS} --worker-class uvicorn.workers.UvicornWorker --bind ${G2P_SPAR_MAPPER_API_HOST}:${G2P_SPAR_MAPPER_API_PORT} --access-logfile - --error-logfile -"]
diff --git a/openg2p-spar-bene-portal-api/.env.example b/openg2p-spar-bene-portal-api/.env.example
index e69de29..8b11130 100644
--- a/openg2p-spar-bene-portal-api/.env.example
+++ b/openg2p-spar-bene-portal-api/.env.example
@@ -0,0 +1,7 @@
+G2P_SPAR_BENE_PORTAL_API_DB_DBNAME=openg2p_spar_db
+G2P_SPAR_BENE_PORTAL_API_WORKER_TYPE=gunicorn
+G2P_SPAR_BENE_PORTAL_API_HOST=0.0.0.0
+G2P_SPAR_BENE_PORTAL_API_NO_OF_WORKERS=1
+G2P_SPAR_BENE_PORTAL_API_DB_USERNAME=postgres
+G2P_SPAR_BENE_PORTAL_API_DEFAULT_ISSUERS=["http://localhost:8080/realms/openg2p-beneficiary"]
+G2P_SPAR_BENE_PORTAL_API_DEFAULT_JWKS_URLS=["http://localhost:8080/realms/openg2p-beneficiary/protocol/openid-connect/certs"]
diff --git a/openg2p-spar-mapper-api/.env.example b/openg2p-spar-mapper-api/.env.example
index e69de29..fcb866f 100644
--- a/openg2p-spar-mapper-api/.env.example
+++ b/openg2p-spar-mapper-api/.env.example
@@ -0,0 +1,8 @@
+G2P_SPAR_MAPPER_API_DB_DBNAME=openg2p_spar_db
+G2P_SPAR_MAPPER_API_WORKER_TYPE=gunicorn
+G2P_SPAR_MAPPER_API_HOST=0.0.0.0
+G2P_SPAR_MAPPER_API_NO_OF_WORKERS=1
+G2P_SPAR_MAPPER_API_OPENAPI_ROOT_PATH="/api/mapper"
+G2P_SPAR_MAPPER_API_DB_USERNAME=postgres
+G2P_SPAR_MAPPER_API_DEFAULT_ISSUERS=["http://localhost:8080/realms/openg2p-beneficiary"]
+G2P_SPAR_MAPPER_API_DEFAULT_JWKS_URLS=["http://localhost:8080/realms/openg2p-beneficiary/protocol/openid-connect/certs"]