diff --git a/odoo/golem/Dockerfile.master b/odoo/golem/Dockerfile.master
index 76ce955..aed7df5 100644
--- a/odoo/golem/Dockerfile.master
+++ b/odoo/golem/Dockerfile.master
@@ -1,4 +1,4 @@
-FROM registry.yaltik.net/odoo:yaltik8
+FROM registry.yaltik.net/odoo:yaltik10
 MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
 
 WORKDIR /opt/odoo/extra-addons
diff --git a/odoo/golem/Dockerfile.master.dev b/odoo/golem/Dockerfile.master.dev
new file mode 100644
index 0000000..cbea077
--- /dev/null
+++ b/odoo/golem/Dockerfile.master.dev
@@ -0,0 +1,7 @@
+FROM registry.yaltik.net/golem:yaltikmaster
+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 782d1da..4b8c7b3 100644
--- a/odoo/golem/dev.yml
+++ b/odoo/golem/dev.yml
@@ -1,17 +1,14 @@
 version: '2.2'
 services:
 
-  odoodev:
+  golemdev2:
     extends:
       file: ../dev.yml
       service: odoodev
     build: .
     image: registry.yaltik.net/golem:yaltikv2dev
-    volumes:
-      - /home/fabien/bak/code/odoo/yaltik:/opt/odoo/custom-addons/yaltik:ro
-      - /home/fabien/bak/code/odoo/golem:/opt/odoo/custom-addons/golem:ro
 
-  odoodev10:
+  golemdev3:
     extends:
       file: ../dev.yml
       service: odoodev10
@@ -19,6 +16,12 @@ services:
       context: .
       dockerfile: Dockerfile.v3.dev
     image: registry.yaltik.net/golem:yaltikv3dev
-    volumes:
-      - /home/fabien/bak/code/odoo/yaltik:/opt/odoo/custom-addons/yaltik:ro
-      - /home/fabien/bak/code/odoo/golem:/opt/odoo/custom-addons/golem:ro
+
+  golemdevmaster:
+    extends:
+      file: ../dev.yml
+      service: odoodev10
+    build:
+      context: .
+      dockerfile: Dockerfile.master.dev
+    image: registry.yaltik.net/golem:yaltikdev