diff --git a/java-spring/accounts-command-side-service/Dockerfile b/java-spring/accounts-command-side-service/Dockerfile
new file mode 100644
index 0000000..deb6ed0
--- /dev/null
+++ b/java-spring/accounts-command-side-service/Dockerfile
@@ -0,0 +1,5 @@
+FROM java:openjdk-8u91-jdk
+RUN mkdir /app
+WORKDIR /app
+COPY ./build/libs  /app
+CMD java ${JAVA_OPTS} -jar /app/accounts-command-side-service.jar
diff --git a/java-spring/accounts-query-side-service/Dockerfile b/java-spring/accounts-query-side-service/Dockerfile
new file mode 100644
index 0000000..204b9d1
--- /dev/null
+++ b/java-spring/accounts-query-side-service/Dockerfile
@@ -0,0 +1,5 @@
+FROM java:openjdk-8u91-jdk
+RUN mkdir /app
+WORKDIR /app
+COPY ./build/libs  /app
+CMD java ${JAVA_OPTS} -jar /app/accounts-query-side-service.jar
diff --git a/java-spring/api-gateway-service/Dockerfile b/java-spring/api-gateway-service/Dockerfile
new file mode 100644
index 0000000..29f38f0
--- /dev/null
+++ b/java-spring/api-gateway-service/Dockerfile
@@ -0,0 +1,6 @@
+FROM java:openjdk-8u91-jdk
+RUN mkdir /app
+WORKDIR /app
+COPY ./build/libs  /app
+CMD java ${JAVA_OPTS} -jar /app/api-gateway-service.jar --accounts.commandside.service.host=accountscommandside --transfers.commandside.service.host=transactionscommandside --accounts.queryside.service.host=accountsqueryside --customers.commandside.service.host=customerscommandside  --customers.queryside.service.host=customersqueryside
+
diff --git a/java-spring/customers-command-side-service/Dockerfile b/java-spring/customers-command-side-service/Dockerfile
new file mode 100644
index 0000000..4cea95e
--- /dev/null
+++ b/java-spring/customers-command-side-service/Dockerfile
@@ -0,0 +1,5 @@
+FROM java:openjdk-8u91-jdk
+RUN mkdir /app
+WORKDIR /app
+COPY ./build/libs  /app
+CMD java ${JAVA_OPTS} -jar /app/customers-command-side-service.jar
diff --git a/java-spring/customers-query-side-service/Dockerfile b/java-spring/customers-query-side-service/Dockerfile
new file mode 100644
index 0000000..4bb9024
--- /dev/null
+++ b/java-spring/customers-query-side-service/Dockerfile
@@ -0,0 +1,5 @@
+FROM java:openjdk-8u91-jdk
+RUN mkdir /app
+WORKDIR /app
+COPY ./build/libs  /app
+CMD java ${JAVA_OPTS} -jar /app/customers-query-side-service.jar
diff --git a/java-spring/docker-compose-common.yml b/java-spring/docker-compose-common.yml
index 5116036..66956b6 100644
--- a/java-spring/docker-compose-common.yml
+++ b/java-spring/docker-compose-common.yml
@@ -1,40 +1,34 @@
 apigateway:
-  image: java:openjdk-8u91-jdk
-  command: java ${JAVA_OPTS} -jar /app/api-gateway-service.jar --accounts.commandside.service.host=accountscommandside --transfers.commandside.service.host=transactionscommandside --accounts.queryside.service.host=accountsqueryside --customers.commandside.service.host=customerscommandside  --customers.queryside.service.host=customersqueryside
+  build: ./api-gateway-service/
   environment:
     SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb
   ports:
     - "8080:8080"
 
 accountscommandside:
-  image: java:openjdk-8u91-jdk
-  command: java ${JAVA_OPTS} -jar /app/accounts-command-side-service.jar
+  build: ./accounts-command-side-service/
   ports:
     - "8085:8080"
 
 transactionscommandside:
-  image: java:openjdk-8u91-jdk
-  command: java ${JAVA_OPTS} -jar /app/transactions-command-side-service.jar
+  build: ./transactions-command-side-service/
   ports:
     - "8082:8080"
 
 accountsqueryside:
-  image: java:openjdk-8u91-jdk
-  command: java ${JAVA_OPTS} -jar /app/accounts-query-side-service.jar
+  build: ./accounts-query-side-service/
   environment:
     SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb
   ports:
     - "8081:8080"
 
 customerscommandside:
-  image: java:openjdk-8u91-jdk
-  command: java ${JAVA_OPTS} -jar /app/customers-command-side-service.jar
+  build: ./customers-command-side-service/
   ports:
     - "8083:8080"
 
 customersqueryside:
-  image: java:openjdk-8u91-jdk
-  command: java ${JAVA_OPTS} -jar /app/customers-query-side-service.jar
+  build: ./customers-query-side-service/
   ports:
     - "8084:8080"
   environment:
diff --git a/java-spring/docker-compose-eventuate-local.yml b/java-spring/docker-compose-eventuate-local.yml
index 7807871..4c07d2e 100644
--- a/java-spring/docker-compose-eventuate-local.yml
+++ b/java-spring/docker-compose-eventuate-local.yml
@@ -54,8 +54,6 @@ apigateway:
   extends:
     file: docker-compose-common.yml
     service: apigateway
-  volumes:
-    - ./api-gateway-service/build/libs:/app
   links:
     - accountscommandside
     - transactionscommandside
@@ -68,8 +66,6 @@ accountscommandside:
   extends:
     file: docker-compose-common.yml
     service: accountscommandside
-  volumes:
-    - ./accounts-command-side-service/build/libs:/app
   links:
     - mysql
     - kafka
@@ -89,8 +85,6 @@ transactionscommandside:
   extends:
     file: docker-compose-common.yml
     service: transactionscommandside
-  volumes:
-    - ./transactions-command-side-service/build/libs:/app
   links:
     - mysql
     - kafka
@@ -105,14 +99,10 @@ transactionscommandside:
     EVENTUATELOCAL_CDC_DB_USER_NAME: root
     EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
 
-
-
 accountsqueryside:
   extends:
     file: docker-compose-common.yml
     service: accountsqueryside
-  volumes:
-    - ./accounts-query-side-service/build/libs:/app
   links:
     - mongodb
     - mysql
@@ -134,8 +124,6 @@ customerscommandside:
   extends:
     file: docker-compose-common.yml
     service: customerscommandside
-  volumes:
-    - ./customers-command-side-service/build/libs:/app
   links:
     - mysql
     - kafka
@@ -154,8 +142,6 @@ customersqueryside:
   extends:
     file: docker-compose-common.yml
     service: customersqueryside
-  volumes:
-    - ./customers-query-side-service/build/libs:/app
   links:
     - mongodb
     - mysql
diff --git a/java-spring/docker-compose.yml b/java-spring/docker-compose.yml
index e5d3625..e64c3f8 100644
--- a/java-spring/docker-compose.yml
+++ b/java-spring/docker-compose.yml
@@ -2,8 +2,6 @@ apigateway:
   extends:
     file: docker-compose-common.yml
     service: apigateway
-  volumes:
-    - ./api-gateway-service/build/libs:/app
   links:
     - accountscommandside
     - transactionscommandside
@@ -16,8 +14,6 @@ accountscommandside:
   extends:
     file: docker-compose-common.yml
     service: accountscommandside
-  volumes:
-    - ./accounts-command-side-service/build/libs:/app
   environment:
     EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID}
     EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET}
@@ -26,8 +22,6 @@ transactionscommandside:
   extends:
     file: docker-compose-common.yml
     service: transactionscommandside
-  volumes:
-    - ./transactions-command-side-service/build/libs:/app
   environment:
     EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID}
     EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET}
@@ -37,8 +31,6 @@ accountsqueryside:
   extends:
     file: docker-compose-common.yml
     service: accountsqueryside
-  volumes:
-    - ./accounts-query-side-service/build/libs:/app
   links:
     - mongodb
   environment:
@@ -49,8 +41,6 @@ customerscommandside:
   extends:
     file: docker-compose-common.yml
     service: customerscommandside
-  volumes:
-    - ./customers-command-side-service/build/libs:/app
   environment:
     EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID}
     EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET}
@@ -60,8 +50,6 @@ customersqueryside:
     file: docker-compose-common.yml
     service: customersqueryside
   image: java:openjdk-8u91-jdk
-  volumes:
-    - ./customers-query-side-service/build/libs:/app
   links:
     - mongodb
   environment:
diff --git a/java-spring/transactions-command-side-service/Dockerfile b/java-spring/transactions-command-side-service/Dockerfile
new file mode 100644
index 0000000..2a67c69
--- /dev/null
+++ b/java-spring/transactions-command-side-service/Dockerfile
@@ -0,0 +1,5 @@
+FROM java:openjdk-8u91-jdk
+RUN mkdir /app
+WORKDIR /app
+COPY ./build/libs  /app
+CMD java ${JAVA_OPTS} -jar /app/transactions-command-side-service.jar