diff --git a/docker-compose-common.yml b/docker-compose-common.yml
deleted file mode 100644
index 8244647..0000000
--- a/docker-compose-common.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-surveil:
-  build: .
-
-shinken:
-  build: tools/docker/shinken_container/
-
-mongo:
-  image: mongo
-
-influxdb:
-  image: savoirfairelinux/influxdb
-
-grafana:
-  image: savoirfairelinux/grafana
-  environment:
-    INFLUXDB_HOST: "influxdb"
-    INFLUXDB_PORT: "8086"
-    INFLUXDB_NAME: "db"
-    INFLUXDB_USER: "root"
-    INFLUXDB_PASS: "root"
-
-bansho:
-  image: savoirfairelinux/bansho
-  environment:
-    BANSHO_BACKEND: "surveil"
-    BANSHO_SURVEIL_URL: "http://surveil:8080/"
diff --git a/docker-compose-production.yml b/docker-compose-production.yml
index 44be662..1fc00af 100644
--- a/docker-compose-production.yml
+++ b/docker-compose-production.yml
@@ -1,7 +1,6 @@
 surveil:
-  extends:
-    file: docker-compose-common.yml
-    service: surveil
+  #build: .
+  image: savoirfairelinux/surveil:0.1.0
   links:
    - mongo
    - influxdb
@@ -12,9 +11,8 @@ surveil:
     PBR_VERSION: "PROD"
 
 shinken:
-  extends:
-    file: docker-compose-common.yml
-    service: shinken
+  #build: tools/docker/shinken_container/
+  image: savoirfairelinux/surveil-shinken:0.1.0
   links:
     - mongo
     - influxdb
@@ -22,9 +20,7 @@ shinken:
     - "7767:7767"
 
 mongo:
-  extends:
-    file: docker-compose-common.yml
-    service: mongo
+  image: mongo
   ports:
    - "27017:27017"
   command:
@@ -33,9 +29,7 @@ mongo:
    - ./container-data/mongodb:/data/db
 
 influxdb:
-  extends:
-    file: docker-compose-common.yml
-    service: influxdb
+  image: savoirfairelinux/influxdb
   environment:
     PRE_CREATE_DB: "db"
   ports:
@@ -45,19 +39,24 @@ influxdb:
    - ./container-data/influxdb:/data
 
 grafana:
-  extends:
-    file: docker-compose-common.yml
-    service: grafana
+  image: savoirfairelinux/grafana
+  environment:
+    INFLUXDB_HOST: "influxdb"
+    INFLUXDB_PORT: "8086"
+    INFLUXDB_NAME: "db"
+    INFLUXDB_USER: "root"
+    INFLUXDB_PASS: "root"
   ports:
-    - "80:80"
+    - "8888:80"
   links:
     - influxdb
 
 bansho:
-  extends:
-    file: docker-compose-common.yml
-    service: bansho
+  image: savoirfairelinux/bansho:0.2.0
+  environment:
+    BANSHO_BACKEND: "surveil"
+    BANSHO_SURVEIL_URL: "http://surveil:8080/"
   ports:
-    - "8888:8888"
+    - "80:8888"
   links:
     - surveil
diff --git a/docker-compose.yml b/docker-compose.yml
index b3bb869..c4e8f8a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,5 @@
 surveil:
-  extends:
-    file: docker-compose-common.yml
-    service: surveil
+  build: .
   links:
    - mongo
    - influxdb
@@ -15,9 +13,7 @@ surveil:
   command: bash -c "cd /surveil/ && python setup.py develop && ((sleep 40 && surveil-init --demo) &) && sleep 20 && surveil-api --reload"
 
 shinken:
-  extends:
-    file: docker-compose-common.yml
-    service: shinken
+  build: tools/docker/shinken_container/
   links:
     - mongo
     - influxdb
@@ -25,18 +21,14 @@ shinken:
     - "7767:7767"
 
 mongo:
-  extends:
-    file: docker-compose-common.yml
-    service: mongo
+  image: mongo
   ports:
    - "27017:27017"
   command:
       "mongod --nojournal --smallfiles"
 
 influxdb:
-  extends:
-    file: docker-compose-common.yml
-    service: influxdb
+  image: savoirfairelinux/influxdb
   environment:
     PRE_CREATE_DB: "db"
   ports:
@@ -44,18 +36,23 @@ influxdb:
     - "8086:8086"
 
 grafana:
-  extends:
-    file: docker-compose-common.yml
-    service: grafana
+  image: savoirfairelinux/grafana
+  environment:
+    INFLUXDB_HOST: "influxdb"
+    INFLUXDB_PORT: "8086"
+    INFLUXDB_NAME: "db"
+    INFLUXDB_USER: "root"
+    INFLUXDB_PASS: "root"
   ports:
     - "80:80"
   links:
     - influxdb
 
 bansho:
-  extends:
-    file: docker-compose-common.yml
-    service: bansho
+  image: savoirfairelinux/bansho
+  environment:
+    BANSHO_BACKEND: "surveil"
+    BANSHO_SURVEIL_URL: "http://surveil:8080/"
   ports:
     - "8888:8888"
   links: