diff --git a/odoo/golem/Dockerfile.master b/odoo/golem/Dockerfile.master
new file mode 100644
index 0000000..0096bb5
--- /dev/null
+++ b/odoo/golem/Dockerfile.master
@@ -0,0 +1,13 @@
+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/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
+
+WORKDIR /opt/odoo/custom-addons
+ADD code/yaltik.tar.gz yaltik/
+ADD code/golemmaster.tar.gz golem/
+WORKDIR /opt/odoo
diff --git a/odoo/golem/base.yml b/odoo/golem/base.yml
index c880bd0..df5709b 100644
--- a/odoo/golem/base.yml
+++ b/odoo/golem/base.yml
@@ -1,8 +1,16 @@
 version: '2'
 services:
-  odoo:
+  golem:
     build: .
     image: golem:base
     extends:
       file: ../base.yml
       service: odoo
+  golemmaster:
+    build:
+      context: .
+      dockerfile: Dockerfile.master
+    image: golem:master
+    extends:
+      file: ../base.yml
+      service: odoo
diff --git a/odoo/golem/code.sh b/odoo/golem/code.sh
index 5a58c6b..89efac3 100644
--- a/odoo/golem/code.sh
+++ b/odoo/golem/code.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 CODE_PATH="/home/fabien/bak/code"
-LOCAL_PATH="$CODE_PATH/linux/dockerfiles/images/odoo/golem/code"
+LOCAL_PATH="$CODE_PATH/linux/docker/images/odoo/golem/code"
 cd $CODE_PATH/odoo/yaltik/ && git archive --format=tar.gz master \
   > $LOCAL_PATH/yaltik.tar.gz &&
 cd $CODE_PATH/odoo/golem && git archive --format=tar.gz stable \
-> $LOCAL_PATH/golem.tar.gz
+> $LOCAL_PATH/golem.tar.gz &&
+git archive --format=tar.gz master > $LOCAL_PATH/golemmaster.tar.gz
diff --git a/odoo/golem/code/golemmaster.tar.gz b/odoo/golem/code/golemmaster.tar.gz
new file mode 100644
index 0000000..4973459
Binary files /dev/null and b/odoo/golem/code/golemmaster.tar.gz differ