diff --git a/Dockerfile b/Dockerfile
index dba9001..782a98b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,14 +41,10 @@ RUN cd /tmp/work && ./generateAll.sh -k2c
 # final container
 FROM wollud1969/dotnetcore5sdk:1.0.0
 
-ENV Database__Host "xxx"
-ENV Database__User "xxx"
-ENV Database__Password "xxx"
-ENV Database__Name "xxx"
-
 RUN \
   useradd -d /opt/service -m service && \
-  mkdir /opt/service/output && chown service:service /opt/service/output
+  mkdir /opt/service/output && chown service:service /opt/service/output && \
+  mkdir /opt/service/config && chown service:service /opt/service/config
 
 USER service
 WORKDIR /opt/service
@@ -59,6 +55,7 @@ COPY --from=stage2-builder /tmp/work/output/ ./output/
 RUN ./generateAll.sh -kb
 
 EXPOSE 8080
+VOLUME /opt/service/config
 
 CMD [ "./generateAll.sh", "-kx" ]
 
diff --git a/ENV b/ENV
index 47d11a6..c1b8200 100644
--- a/ENV
+++ b/ENV
@@ -4,11 +4,6 @@ export PACKAGE_NAME
 ROUTE_PREFIX="pdb/v2"
 export ROUTE_PREFIX
 
-# DO NOT USE IN CI/CD ENVIRONMENT, ONLY FOR MANUAL BUILDS AND RUNS
-# Database__User=apiservicetestdb
-# Database__Host=172.16.10.18
-# Database__Password=xxx
-# Database__Name=apiservicetestdb
-# export Database__User Database__Host Database__Password Database__Name
-
+Database__InfoFile=../../../databaseInfo.json
+export Database__InfoFile