diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb40bc8..4d1e63d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
-## v0.0.6 [UNRELEASED]
+## v0.0.6 [18/05/13]
+- 18/05/13 chore(docker): update compose file to format 2.0
 - 18/03/19 fix(dao): fix pagination computing
            refact(dao): factorize ObjectID error
            chore(make): make Makefile Windows compatible
diff --git a/Dockerfile b/Dockerfile
index 42aa503..6ac6666 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,3 +21,4 @@ RUN make all && apk del make git && \
 
 # by default, the exposed ports are 8020 (HTTP)
 EXPOSE 8020
+ENTRYPOINT ["/app/handsongo"]
diff --git a/Dockerfile.multi b/Dockerfile.multi
index 4755720..2efadcc 100644
--- a/Dockerfile.multi
+++ b/Dockerfile.multi
@@ -27,3 +27,4 @@ COPY --from=build-env /go/bin/handsongo /app/
 
 # by default, the exposed ports are 8020 (HTTP)
 EXPOSE 8020
+ENTRYPOINT ["/app/handsongo"]
diff --git a/docker-compose.yml b/docker-compose.yml
index b5f1aea..0297b33 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,25 @@
-# handsongo micro-service
-handsongo:
- container_name: handsongo
- image: sfeir/handsongo:latest
- restart: always
- links:
-   - mongo
- ports:
-  - "8020:8020"
- command: /app/handsongo -port 8020 -logl debug -logf text -statd 15s -db mongodb://mongo/spirits
+version: '2'
 
-# bdd mockup
-mongo:
- container_name: handsongo-mongo
- image: mongo:3.4
- restart: always
- ports:
-  - "27017:27017"
+services:
+  # handsongo micro-service
+  handsongo:
+   container_name: handsongo
+   image: sfeir/handsongo:latest
+   restart: always
+   external_links:
+     - mongo:mongo
+   ports:
+    - "8020:8020"
+   command: -port 8020
+            -logl debug
+            -logf text
+            -statd 15s
+            -db mongodb://mongo/spirits
+
+  # mongodb db
+  mongo:
+   container_name: handsongo-mongo
+   image: mongo:3.4
+   restart: always
+   ports:
+    - "27017:27017"