diff --git a/odoo/golem/Dockerfile b/odoo/golem/Dockerfile
index e752bdc..6a0f112 100644
--- a/odoo/golem/Dockerfile
+++ b/odoo/golem/Dockerfile
@@ -9,5 +9,5 @@ RUN git clone --depth 1 -b 8.0 https://github.com/OCA/community-data-files \
 
 WORKDIR /opt/odoo/custom-addons
 ADD code/yaltik8.tar.gz yaltik/
-ADD code/golem.tar.gz golem/
+ADD code/golemv2.tar.gz golem/
 WORKDIR /opt/odoo
diff --git a/odoo/golem/Dockerfile.master b/odoo/golem/Dockerfile.master
index b32ffbe..76ce955 100644
--- a/odoo/golem/Dockerfile.master
+++ b/odoo/golem/Dockerfile.master
@@ -2,12 +2,13 @@ FROM registry.yaltik.net/odoo:yaltik8
 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 git clone --depth 1 -b 10.0 https://github.com/OCA/community-data-files \
+      && git clone --depth 1 -b 10.0 https://github.com/OCA/l10n-france \
+      && git clone --depth 1 -b 10.0 https://github.com/OCA/partner-contact \
+      && git clone --depth 1 -b 10.0 https://github.com/OCA/vertical-association \
+      && git clone --depth 1 -b 10.0 https://github.com/OCA/web
 
 WORKDIR /opt/odoo/custom-addons
-ADD code/yaltik8.tar.gz yaltik/
+ADD code/yaltik10.tar.gz yaltik/
 ADD code/golemmaster.tar.gz golem/
 WORKDIR /opt/odoo
diff --git a/odoo/golem/Dockerfile.v3 b/odoo/golem/Dockerfile.v3
index b66c048..1c5b368 100644
--- a/odoo/golem/Dockerfile.v3
+++ b/odoo/golem/Dockerfile.v3
@@ -1,4 +1,4 @@
-FROM registry.yaltik.net/odoo:yaltik10
+FROM registry.yaltik.net/odoo:yaltikstable
 MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
 
 WORKDIR /opt/odoo/extra-addons
@@ -10,5 +10,5 @@ RUN git clone --depth 1 -b 10.0 https://github.com/OCA/community-data-files \
 
 WORKDIR /opt/odoo/custom-addons
 ADD code/yaltik10.tar.gz yaltik/
-ADD code/golemv3.tar.gz golem/
+ADD code/golem.tar.gz golem/
 WORKDIR /opt/odoo
diff --git a/odoo/golem/Dockerfile.v3.dev b/odoo/golem/Dockerfile.v3.dev
index a56c93b..cf1067c 100644
--- a/odoo/golem/Dockerfile.v3.dev
+++ b/odoo/golem/Dockerfile.v3.dev
@@ -1,4 +1,4 @@
-FROM registry.yaltik.net/golem:yaltikv3
+FROM registry.yaltik.net/golem:yaltikstable
 MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
 
 RUN pip install --user watchdog
diff --git a/odoo/golem/base.yml b/odoo/golem/base.yml
index 8516b3d..6d62199 100644
--- a/odoo/golem/base.yml
+++ b/odoo/golem/base.yml
@@ -1,8 +1,8 @@
 version: '2'
 services:
-  golem:
+  golemv2:
     build: .
-    image: registry.yaltik.net/golem:yaltikbase
+    image: registry.yaltik.net/golem:yaltikv2
     extends:
       file: ../base.yml
       service: odoo
@@ -14,11 +14,11 @@ services:
     extends:
       file: ../base.yml
       service: odoo
-  golemv3:
+  golem:
     build:
       context: .
       dockerfile: Dockerfile.v3
-    image: registry.yaltik.net/golem:yaltikv3
+    image: registry.yaltik.net/golem:yaltikstable
     extends:
       file: ../base.yml
       service: odoo
diff --git a/odoo/golem/code.sh b/odoo/golem/code.sh
index bb9e313..dc9388a 100644
--- a/odoo/golem/code.sh
+++ b/odoo/golem/code.sh
@@ -5,7 +5,7 @@ cd $CODE_PATH/odoo/yaltik/ && git archive --format=tar.gz 8.0 \
   > $LOCAL_PATH/yaltik8.tar.gz &&
 cd $CODE_PATH/odoo/yaltik/ && git archive --format=tar.gz 10.0 \
   > $LOCAL_PATH/yaltik10.tar.gz &&
-cd $CODE_PATH/odoo/golem && git archive --format=tar.gz stable \
-> $LOCAL_PATH/golem.tar.gz &&
+cd $CODE_PATH/odoo/golem && git archive --format=tar.gz 2 \
+> $LOCAL_PATH/golemv2.tar.gz &&
 git archive --format=tar.gz master > $LOCAL_PATH/golemmaster.tar.gz
-git archive --format=tar.gz 3 > $LOCAL_PATH/golemv3.tar.gz
+git archive --format=tar.gz stable > $LOCAL_PATH/golem.tar.gz
diff --git a/odoo/golem/dev.yml b/odoo/golem/dev.yml
index 2eb40f0..fb8d6b3 100644
--- a/odoo/golem/dev.yml
+++ b/odoo/golem/dev.yml
@@ -6,7 +6,7 @@ services:
       file: ../dev.yml
       service: odoodev
     build: .
-    image: golem:yaltikdev
+    image: golem:yaltikdev8
     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