diff --git a/odoo/golem/Dockerfile.dev b/odoo/golem/Dockerfile.dev
new file mode 100644
index 0000000..3c539b1
--- /dev/null
+++ b/odoo/golem/Dockerfile.dev
@@ -0,0 +1,11 @@
+FROM odoodev: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/community-data-files \
+      && git clone --depth 1 -b 8.0 https://github.com/OCA/l10n-france \
+      && git clone --depth 1 -b 8.0 https://github.com/OCA/partner-contact \
+      && git clone --depth 1 -b 8.0 https://github.com/OCA/vertical-association
+
+RUN mkdir /opt/odoo/custom-addons/yaltik && mkdir /opt/odoo/custom-addons/golem
+WORKDIR /opt/odoo
diff --git a/odoo/golem/dev.yml b/odoo/golem/dev.yml
index e27f231..515e2e3 100644
--- a/odoo/golem/dev.yml
+++ b/odoo/golem/dev.yml
@@ -1,9 +1,11 @@
 version: '2'
 services:
-  odoo:
+  odoodev:
     extends:
-      file: base.yml
-      service: odoo
+      file: ../dev.yml
+      service: odoodev
+    build: .
+    image: golem:dev
     volumes:
-      - /home/fabien/bak/code/odoo/yaltik:/opt/odoo/extra-addons/yaltik:ro
-      - /home/fabien/bak/code/odoo/golem:/opt/odoo/extra-addons/golem:ro
+      - /home/fabien/bak/code/odoo/yaltik:/opt/odoo/custom-addons/yaltik:ro
+      - /home/fabien/bak/code/odoo/golem:/opt/odoo/custom-addons/golem:ro