diff --git a/odoo/golem/Dockerfile.v3.dev b/odoo/golem/Dockerfile.v3.dev
new file mode 100644
index 0000000..a56c93b
--- /dev/null
+++ b/odoo/golem/Dockerfile.v3.dev
@@ -0,0 +1,7 @@
+FROM registry.yaltik.net/golem:yaltikv3
+MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
+
+RUN pip install --user watchdog
+COPY shell10.sh ./
+COPY launch10.dev.sh ./launch10.sh
+ENV DEV 1
diff --git a/odoo/golem/dev.yml b/odoo/golem/dev.yml
index cbc79d7..2eb40f0 100644
--- a/odoo/golem/dev.yml
+++ b/odoo/golem/dev.yml
@@ -17,7 +17,7 @@ services:
       service: odoodev10
     build:
       context: .
-      dockerfile: Dockerfile.v3
+      dockerfile: Dockerfile.v3.dev
     image: golem:yaltikdev10
     volumes:
       - /home/fabien/bak/code/odoo/yaltik:/opt/odoo/custom-addons/yaltik:ro
diff --git a/odoo/golem/launch10.dev.sh b/odoo/golem/launch10.dev.sh
new file mode 100644
index 0000000..eb7c5f7
--- /dev/null
+++ b/odoo/golem/launch10.dev.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+CONF=/opt/odoo/odoo.conf
+ODOOCMD="python /opt/odoo/OCB/odoo-bin --config $CONF"
+
+if [ "$DEV" == 1 ]; then
+  ODOOCMD="$ODOOCMD --dev xml --log-handler :DEBUG"
+fi
+
+# Configuration generation and Odoo launch
+bash genconf.sh && $ODOOCMD
diff --git a/odoo/golem/shell10.sh b/odoo/golem/shell10.sh
new file mode 100644
index 0000000..c1ee521
--- /dev/null
+++ b/odoo/golem/shell10.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python OCB/odoo-bin shell -c odoo.conf -d "$@" --xmlrpc-port=8999