diff --git a/odoo/dev.yml b/odoo/dev.yml
index d08c4c3..aa188e8 100644
--- a/odoo/dev.yml
+++ b/odoo/dev.yml
@@ -4,6 +4,10 @@ services:
     extends:
       file: base.yml
       service: odoo
+    build:
+      context: ./odoo
+      dockerfile: Dockerfile.dev
+    image: odoodev:8.0
     environment:
       ADMIN_PASSWORD: admin
       LIST_DB: "True"
@@ -11,3 +15,5 @@ services:
       WORKERS: 4
       LIMIT_TIME_CPU: 3000
       LIMIT_TIME_REAL: 6000
+    volumes:
+      - /home/fabien/tmp/programming/py/server-tools:/opt/odoo/custom-addons/server-tools:ro
diff --git a/odoo/golem/base.yml b/odoo/golem/base.yml
index 3afb1ad..c880bd0 100644
--- a/odoo/golem/base.yml
+++ b/odoo/golem/base.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   odoo:
-    build: ./golem
+    build: .
     image: golem:base
     extends:
       file: ../base.yml
diff --git a/odoo/odoo/Dockerfile b/odoo/odoo/Dockerfile
index 5badeae..a14ad9c 100644
--- a/odoo/odoo/Dockerfile
+++ b/odoo/odoo/Dockerfile
@@ -55,7 +55,8 @@ VOLUME "/opt/odoo/data"
 # Odoo default ports
 EXPOSE 8069 8071
 
-COPY ./launch ./
+COPY ./launch.sh ./
+COPY ./genconf.sh ./
 # Default user : odoo
 USER odoo
-CMD [ "bash", "launch" ]
+CMD [ "bash", "launch.sh" ]
diff --git a/odoo/odoo/Dockerfile.dev b/odoo/odoo/Dockerfile.dev
new file mode 100644
index 0000000..1061b0e
--- /dev/null
+++ b/odoo/odoo/Dockerfile.dev
@@ -0,0 +1,8 @@
+FROM odoo:8.0
+MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
+
+WORKDIR /opt/odoo/extra-addons
+RUN git clone --depth 1 -b 8.0 https://github.com/OCA/server-tools
+
+WORKDIR /opt/odoo
+ADD shell.sh ./
diff --git a/odoo/odoo/launch b/odoo/odoo/genconf.sh
old mode 100755
new mode 100644
similarity index 87%
rename from odoo/odoo/launch
rename to odoo/odoo/genconf.sh
index 47a58da..a591689
--- a/odoo/odoo/launch
+++ b/odoo/odoo/genconf.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
 # Small program, inspired from Yajo's one : https://bitbucket.org/yajo/docker-odoo
-# It generates configuration file and launch OCB Odoo
+# It generates configuration file
 
 CONF=/opt/odoo/odoo.conf
-ODOOCMD="python /opt/odoo/OCB/odoo.py --config $CONF"
 ADDONS_PATH="/opt/odoo/OCB/addons,/opt/odoo/data/addons"
 
 cd extra-addons
@@ -37,6 +36,3 @@ workers = ${WORKERS:=1}
 limit_time_cpu = ${LIMIT_TIME_CPU:=60}
 limit_time_real = ${LIMIT_TIME_REAL:=120}
 admin_passwd = ${ADMIN_PASSWORD:=admin}" > $CONF
-
-# Odoo launch
-$ODOOCMD
diff --git a/odoo/odoo/launch.sh b/odoo/odoo/launch.sh
new file mode 100755
index 0000000..d4ab834
--- /dev/null
+++ b/odoo/odoo/launch.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+CONF=/opt/odoo/odoo.conf
+ODOOCMD="python /opt/odoo/OCB/odoo.py --config $CONF"
+
+# Configuration generation and Odoo launch
+bash genconf.sh && $ODOOCMD
diff --git a/odoo/odoo/shell.sh b/odoo/odoo/shell.sh
new file mode 100644
index 0000000..b921e76
--- /dev/null
+++ b/odoo/odoo/shell.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python OCB/odoo.py --addons-path=/opt/odoo/custom-addons/server-tools/ shell -c odoo.conf -d "$@" --xmlrpc-port=8999