diff --git a/build.gradle b/build.gradle
index 95fe1cc..5e54b4a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,4 @@
 group = 'com.lbs'
-version = '0.0.1-SNAPSHOT'
 
 ext {
     scalaVersion = "2.12.6"
@@ -7,7 +6,6 @@ ext {
 
 allprojects {
     group = 'com.lbs'
-    version = '1.0.0-SNAPSHOT'
 }
 
 apply plugin: 'idea'
diff --git a/server/src/main/docker/Dockerfile b/docker/Dockerfile
similarity index 54%
rename from server/src/main/docker/Dockerfile
rename to docker/Dockerfile
index 81da40c..7fb91f2 100644
--- a/server/src/main/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,8 @@
 FROM openjdk:8-jdk-alpine
 
 RUN apk update && apk upgrade && apk add netcat-openbsd
-RUN mkdir -p /usr/local/luxmedbookingservice
-ADD @project.build.finalName@.jar /usr/local/luxmedbookingservice/
+RUN mkdir -p /app
+ADD server.jar /app
 ADD run.sh run.sh
 RUN chmod +x run.sh
 CMD ./run.sh
\ No newline at end of file
diff --git a/server/src/main/docker/docker-compose.yml b/docker/docker-compose.yml
similarity index 53%
rename from server/src/main/docker/docker-compose.yml
rename to docker/docker-compose.yml
index 4a6de7c..3c6e46a 100644
--- a/server/src/main/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,18 +1,25 @@
-version: '3'
+version: '3.4'
 services:
   luxmedbookingservice:
      build: .
      environment:
-       TELEGRAM_TOKEN: ${TELEGRAM_TOKEN}
-       SECURITY_SECRET: ${SECURITY_SECRET}
        DB_HOST: "database"
      volumes:
-        - ./log:/usr/local/luxmedbookingservice/log
+        - lbs:/lbs
+
   database:
-      image: postgres:9.5
+      image: postgres:10.6
+      volumes:
+        - postgres:/var/lib/postgresql/data
       ports:
         - "5432:5432"
       environment:
         - POSTGRES_USER=lbs
         - POSTGRES_PASSWORD=lsb123
-        - POSTGRES_DB=lbs
\ No newline at end of file
+        - POSTGRES_DB=lbs
+
+volumes:
+  postgres:
+    name: postgres
+  lbs:
+    name: lbs
\ No newline at end of file
diff --git a/server/src/main/docker/run.sh b/docker/run.sh
similarity index 54%
rename from server/src/main/docker/run.sh
rename to docker/run.sh
index a03a22a..d0cc1db 100644
--- a/server/src/main/docker/run.sh
+++ b/docker/run.sh
@@ -6,7 +6,27 @@ echo "********************************************************"
 while ! `nc -z database 5432`; do sleep 3; done
 echo "******** Database Server has started "
 
+echo "********************************************************"
+echo "Reading env file"
+echo "********************************************************"
+
+env="/lbs/config/env"
+
+if [ -f "$env" ]
+then
+  while IFS='=' read -r key value
+  do
+    key=$(echo ${key} | tr '.' '_')
+    export ${key}=${value}
+  done < "$env"
+
+else
+  echo "$env not found."
+  exit 1
+fi
+
 echo "********************************************************"
 echo "Starting Luxmed Booking Service  "
 echo "********************************************************"
-cd /usr/local/luxmedbookingservice && java -jar @project.build.finalName@.jar
+
+cd /app && java -jar server.jar
diff --git a/server/build.gradle b/server/build.gradle
index cc10620..51e246c 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -1,8 +1,6 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
 buildscript {
     ext {
-        springBootVersion = '2.0.2.RELEASE'
+        springBootVersion = '2.1.1.RELEASE'
     }
     repositories {
         mavenCentral()
@@ -34,23 +32,9 @@ dependencies {
     testCompile('com.typesafe.akka:akka-testkit_2.12:2.4.19')
 }
 
-task replaceTokens(type: Copy) {
-    def finalBuildName = project.name + '-' + project.version
-
-    from 'src/main/docker'
-    into 'build/docker'
-    filter(ReplaceTokens, tokens:
-            ['project.build.finalName': finalBuildName,
-             "TELEGRAM_TOKEN"         : System.getenv()['TELEGRAM_TOKEN'],
-             "SECURITY_SECRET"        : System.getenv()['SECURITY_SECRET']
-            ])
-}
-
-task copyJar(type: Copy) {
+task prepare(type: Copy) {
     dependsOn assemble
     from file("${project.buildDir}/libs")
-    into file("${project.buildDir}/docker")
+    into file("${project.rootDir}/docker")
 }
 
-task makeDockerFile(type: Copy, dependsOn: [replaceTokens, copyJar])
-
diff --git a/server/src/main/docker/.env b/server/src/main/docker/.env
deleted file mode 100644
index 78d5718..0000000
--- a/server/src/main/docker/.env
+++ /dev/null
@@ -1,2 +0,0 @@
-TELEGRAM_TOKEN=@TELEGRAM_TOKEN@
-SECURITY_SECRET=@SECURITY_SECRET@
\ No newline at end of file
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index f5cf040..e19dcaa 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -18,7 +18,7 @@ banner:
   location: "classpath:/banner.txt"
 
 logging:
-  file: log/app.log
+  file: /lbs/log/app.log
   level:
     com.lbs: DEBUG
 #    org.hibernate.SQL: DEBUG