diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..155b81d
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,56 @@
+accountscommandside:
+  image: java:8
+  working_dir: /app
+  volumes:
+    - ./accounts-command-side-service/build/libs:/app
+  command: java -jar /app/accounts-command-side-service.jar 
+  ports:
+    - "8080:8080"
+  environment:
+    EVENT_STORE_USER_ID:
+    EVENT_STORE_PASSWORD:
+    EVENT_STORE_URL:
+    EVENT_STORE_STOMP_SERVER_HOST:
+    EVENT_STORE_STOMP_SERVER_PORT:
+
+transactionscommandside:
+  image: java:8
+  working_dir: /app
+  volumes:
+    - ./transactions-command-side-service/build/libs:/app
+  command: java -jar /app/transactions-command-side-service.jar 
+  ports:
+    - "8082:8080"
+  environment:
+    EVENT_STORE_USER_ID:
+    EVENT_STORE_PASSWORD:
+    EVENT_STORE_URL:
+    EVENT_STORE_STOMP_SERVER_HOST:
+    EVENT_STORE_STOMP_SERVER_PORT:
+
+
+accountsqueryside:
+  image: java:8
+  working_dir: /app
+  volumes:
+    - ./accounts-query-side-service/build/libs:/app
+  command: java -jar /app/accounts-query-side-service.jar --spring.data.mongodb_uri=mongodb://database/CQRS
+  ports:
+    - "8081:8080"
+  links:
+    - mongodb
+  environment:
+    EVENT_STORE_USER_ID:
+    EVENT_STORE_PASSWORD:
+    EVENT_STORE_URL:
+    EVENT_STORE_STOMP_SERVER_HOST:
+    EVENT_STORE_STOMP_SERVER_PORT:
+    SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb
+
+mongodb:
+  image: mongo:latest
+  hostname: mongodb
+  command: mongod --smallfiles
+  ports:
+    - "27017:27017"
+
diff --git a/java-spring/accounts-command-side-backend/build.gradle b/java-spring/accounts-command-side-backend/build.gradle
index 3c6b33f..decb30b 100644
--- a/java-spring/accounts-command-side-backend/build.gradle
+++ b/java-spring/accounts-command-side-backend/build.gradle
@@ -4,7 +4,6 @@ dependencies {
 
     compile project(":common-backend")
     compile "net.chrisrichardson.eventstore.client:eventstore-java-client:$eventStoreClientVersion"
-    compile "org.springframework.boot:spring-boot-starter-data-mongodb:$springBootVersion"
 
     compile 'com.fasterxml.jackson.core:jackson-core:2.4.3'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.4.3'
diff --git a/java-spring/transactions-command-side-backend/build.gradle b/java-spring/transactions-command-side-backend/build.gradle
index 3c6b33f..decb30b 100644
--- a/java-spring/transactions-command-side-backend/build.gradle
+++ b/java-spring/transactions-command-side-backend/build.gradle
@@ -4,7 +4,6 @@ dependencies {
 
     compile project(":common-backend")
     compile "net.chrisrichardson.eventstore.client:eventstore-java-client:$eventStoreClientVersion"
-    compile "org.springframework.boot:spring-boot-starter-data-mongodb:$springBootVersion"
 
     compile 'com.fasterxml.jackson.core:jackson-core:2.4.3'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.4.3'
diff --git a/wait-for-docker-services.sh b/wait-for-docker-services.sh
new file mode 100755
index 0000000..d9a856f
--- /dev/null
+++ b/wait-for-docker-services.sh
@@ -0,0 +1,9 @@
+while [[ true ]]; do
+	nc -z -w 4 ${SERVICE_HOST?} 8080 && nc -z -w 4 ${SERVICE_HOST?} 8081 && nc -z -w 4 ${SERVICE_HOST?} 8082
+	if [[ "$?" -eq "0" ]]; then
+		echo connected
+		break
+	fi
+	echo -n . 
+	sleep 1
+done
\ No newline at end of file