diff --git a/odoo/base.yml b/odoo/base.yml
index b74822c..f2bc9c9 100644
--- a/odoo/base.yml
+++ b/odoo/base.yml
@@ -54,6 +54,8 @@ services:
       LIST_DB: "False"
       POSTGRES_USER: odoo
       POSTGRES_PASSWORD: somethingToChange
+      DEV: 0
+      PROXY_MODE: "True"
 
   openerp60:
     init: true
@@ -119,13 +121,21 @@ services:
 
   odoo10:
     init: true
-    extends:
-      file: base.yml
-      service: odoobase10
     build:
       context: ./odoo
       dockerfile: Dockerfile.ext.10
     image: registry.yaltik.net/odoo:yaltik10
+    environment:
+      DB_MAXCONN: 20
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      WORKERS: 2
+      LIMIT_TIME_CPU: 720
+      LIMIT_TIME_REAL: 1440
+      ADMIN_PASSWORD: somethingToChange
+      LIST_DB: "False"
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
 
   odoobase10c7:
     init: true
@@ -147,13 +157,21 @@ services:
 
   odoo10c7:
     init: true
-    extends:
-      file: base.yml
-      service: odoobase10c7
     build:
       context: ./odoo
       dockerfile: Dockerfile.ext.10.centos7
     image: registry.yaltik.net/odoo:yaltik10c7
+    environment:
+      DB_MAXCONN: 20
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      WORKERS: 2
+      LIMIT_TIME_CPU: 720
+      LIMIT_TIME_REAL: 1440
+      ADMIN_PASSWORD: somethingToChange
+      LIST_DB: "False"
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
 
   odoo11:
     init: true
@@ -193,13 +211,21 @@ services:
 
   odoo12:
     init: true
-    extends:
-      file: base.yml
-      service: odoobase12
     build:
       context: ./odoo
       dockerfile: Dockerfile.ext.12
     image: registry.yaltik.net/odoo:yaltik12
+    environment:
+      DB_MAXCONN: 20
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      WORKERS: 2
+      LIMIT_TIME_CPU: 720
+      LIMIT_TIME_REAL: 1440
+      ADMIN_PASSWORD: somethingToChange
+      LIST_DB: "False"
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
 
   flectra:
     init: true
@@ -221,13 +247,21 @@ services:
 
   flectrapg10:
     init: true
-    extends:
-      file: base.yml
-      service: flectra
     build:
       context: ./flectra
       dockerfile: Dockerfile.pg10
     image: registry.yaltik.net/flectra:yaltik1pg10
+    environment:
+      DB_MAXCONN: 20
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      WORKERS: 2
+      LIMIT_TIME_CPU: 720
+      LIMIT_TIME_REAL: 1440
+      ADMIN_PASSWORD: somethingToChange
+      LIST_DB: "False"
+      POSTGRES_USER: flectra
+      POSTGRES_PASSWORD: somethingToChange
 
   odoocmd:
     build:
diff --git a/odoo/dev.yml b/odoo/dev.yml
index dc658dc..013a138 100644
--- a/odoo/dev.yml
+++ b/odoo/dev.yml
@@ -16,14 +16,14 @@ services:
       ODOO_SERVER_NAMES: localodoo odoo ocb
 
   odoodev:
-    extends:
-      file: base.yml
-      service: odoo
     build:
       context: ./odoo
       dockerfile: Dockerfile.dev
     image: registry.yaltik.net/odoodev:yaltik8
     environment:
+      DB_MAXCONN: 20
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
       ADMIN_PASSWORD: dev
       LIST_DB: "True"
       DB_MAXCONN: 20
@@ -32,16 +32,18 @@ services:
       LIMIT_TIME_REAL: 6000
       DEV: 1
       PROXY_MODE: "False"
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
 
   odoo8c7dev:
-    extends:
-      file: base.yml
-      service: odoo8c7
     build:
       context: ./odoo
       dockerfile: Dockerfile.8.centos7.dev
     image: registry.yaltik.net/odoodev:yaltik8c7
     environment:
+      DB_MAXCONN: 20
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
       ADMIN_PASSWORD: dev
       LIST_DB: "True"
       DB_MAXCONN: 20
@@ -50,16 +52,17 @@ services:
       LIMIT_TIME_REAL: 6000
       DEV: 1
       PROXY_MODE: "False"
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
 
   odoodev10:
-    extends:
-      file: base.yml
-      service: odoo10
     build:
       context: ./odoo
       dockerfile: Dockerfile.10.dev
     image: registry.yaltik.net/odoodev:yaltik10
     environment:
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
       DEV: 1
       CODE_FOLDER: code
       ADMIN_PASSWORD: dev
@@ -70,16 +73,17 @@ services:
       LIMIT_TIME_REAL: 6000
       LIMIT_MEMORY_SOFT: 7000000000
       LIMIT_MEMORY_HARD: 16000000000
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
 
   odoodev10c7:
-    extends:
-      file: base.yml
-      service: odoo10c7
     build:
       context: ./odoo
       dockerfile: Dockerfile.10.centos7.dev
     image: registry.yaltik.net/odoodev:yaltik10c7
     environment:
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
       DEV: 1
       CODE_FOLDER: code
       ADMIN_PASSWORD: dev
@@ -90,11 +94,10 @@ services:
       LIMIT_TIME_REAL: 6000
       LIMIT_MEMORY_SOFT: 7000000000
       LIMIT_MEMORY_HARD: 16000000000
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
 
   odoodev12:
-    extends:
-      file: base.yml
-      service: odoo12
     build:
       context: ./odoo
       dockerfile: Dockerfile.12.dev
@@ -110,6 +113,10 @@ services:
       LIMIT_TIME_REAL: 6000
       LIMIT_MEMORY_SOFT: 7000000000
       LIMIT_MEMORY_HARD: 16000000000
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
 
   openupgrade9:
     init: true
@@ -148,9 +155,6 @@ services:
       POSTGRES_PASSWORD: somethingToChange
 
   flectradev:
-    extends:
-      file: base.yml
-      service: flectra
     build:
       context: ./flectra
       dockerfile: Dockerfile.dev
@@ -166,13 +170,29 @@ services:
       LIMIT_TIME_REAL: 6000
       LIMIT_MEMORY_SOFT: 7000000000
       LIMIT_MEMORY_HARD: 16000000000
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      POSTGRES_USER: flectra
+      POSTGRES_PASSWORD: somethingToChange
 
   flectradevpg10:
     init: true
-    extends:
-      file: dev.yml
-      service: flectradev
     build:
       context: ./flectra
       dockerfile: Dockerfile.dev.pg10
     image: registry.yaltik.net/flectradev:yaltik1pg10
+    environment:
+      DEV: 1
+      CODE_FOLDER: code
+      ADMIN_PASSWORD: dev
+      LIST_DB: "True"
+      DB_MAXCONN: 20
+      WORKERS: 2
+      LIMIT_TIME_CPU: 3000
+      LIMIT_TIME_REAL: 6000
+      LIMIT_MEMORY_SOFT: 7000000000
+      LIMIT_MEMORY_HARD: 16000000000
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      POSTGRES_USER: flectra
+      POSTGRES_PASSWORD: somethingToChange
diff --git a/odoo/golem/base.yml b/odoo/golem/base.yml
index 2a4a14a..353cfd7 100644
--- a/odoo/golem/base.yml
+++ b/odoo/golem/base.yml
@@ -1,24 +1,59 @@
 version: '2.2'
 services:
   golemv2:
+    init: true
     build: .
     image: registry.yaltik.net/golem:yaltikv2
-    extends:
-      file: ../base.yml
-      service: odoo
+    environment:
+      DB_MAXCONN: 20
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      WORKERS: 2
+      LIMIT_TIME_CPU: 720
+      LIMIT_TIME_REAL: 1440
+      ADMIN_PASSWORD: somethingToChange
+      LIST_DB: "False"
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
+      DEV: 0
+      PROXY_MODE: "True"
+
   golemmaster:
     build:
       context: .
       dockerfile: Dockerfile.master
     image: registry.yaltik.net/golem:yaltikmaster
-    extends:
-      file: ../base.yml
-      service: odoo
+    init: true
+    environment:
+      DB_MAXCONN: 20
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      WORKERS: 2
+      LIMIT_TIME_CPU: 720
+      LIMIT_TIME_REAL: 1440
+      ADMIN_PASSWORD: somethingToChange
+      LIST_DB: "False"
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
+      DEV: 0
+      PROXY_MODE: "True"
+
   golem:
     build:
       context: .
       dockerfile: Dockerfile.v3
     image: registry.yaltik.net/golem:yaltikstable
-    extends:
-      file: ../base.yml
-      service: odoo
+    init: true
+    environment:
+      DB_MAXCONN: 20
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      WORKERS: 2
+      LIMIT_TIME_CPU: 720
+      LIMIT_TIME_REAL: 1440
+      ADMIN_PASSWORD: somethingToChange
+      LIST_DB: "False"
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
+      DEV: 0
+      PROXY_MODE: "True"
diff --git a/odoo/golem/dev.yml b/odoo/golem/dev.yml
index 4b8c7b3..bacd502 100644
--- a/odoo/golem/dev.yml
+++ b/odoo/golem/dev.yml
@@ -2,26 +2,61 @@ version: '2.2'
 services:
 
   golemdev2:
-    extends:
-      file: ../dev.yml
-      service: odoodev
     build: .
     image: registry.yaltik.net/golem:yaltikv2dev
+    environment:
+      DB_MAXCONN: 20
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      ADMIN_PASSWORD: dev
+      LIST_DB: "True"
+      DB_MAXCONN: 20
+      WORKERS: 2
+      LIMIT_TIME_CPU: 3000
+      LIMIT_TIME_REAL: 6000
+      DEV: 1
+      PROXY_MODE: "False"
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
 
   golemdev3:
-    extends:
-      file: ../dev.yml
-      service: odoodev10
     build:
       context: .
       dockerfile: Dockerfile.v3.dev
     image: registry.yaltik.net/golem:yaltikv3dev
+    environment:
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      DEV: 1
+      CODE_FOLDER: code
+      ADMIN_PASSWORD: dev
+      LIST_DB: "True"
+      DB_MAXCONN: 20
+      WORKERS: 2
+      LIMIT_TIME_CPU: 3000
+      LIMIT_TIME_REAL: 6000
+      LIMIT_MEMORY_SOFT: 7000000000
+      LIMIT_MEMORY_HARD: 16000000000
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
 
   golemdevmaster:
-    extends:
-      file: ../dev.yml
-      service: odoodev10
     build:
       context: .
       dockerfile: Dockerfile.master.dev
     image: registry.yaltik.net/golem:yaltikdev
+    environment:
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      DEV: 1
+      CODE_FOLDER: code
+      ADMIN_PASSWORD: dev
+      LIST_DB: "True"
+      DB_MAXCONN: 20
+      WORKERS: 2
+      LIMIT_TIME_CPU: 3000
+      LIMIT_TIME_REAL: 6000
+      LIMIT_MEMORY_SOFT: 7000000000
+      LIMIT_MEMORY_HARD: 16000000000
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
diff --git a/odoo/prod.yml b/odoo/prod.yml
index f4c64e8..730abe2 100644
--- a/odoo/prod.yml
+++ b/odoo/prod.yml
@@ -13,14 +13,3 @@ services:
     ports:
       - "80:80"
       - "443:443"
-
-  odoo:
-    extends:
-      file: base.yml
-      service: odoo
-    build:
-      context: ./odoo
-    environment:
-      LIST_DB: "False"
-      DEV: 0
-      PROXY_MODE: "True"
diff --git a/odoo/py3o.yml b/odoo/py3o.yml
index 33b3cb3..3976d59 100644
--- a/odoo/py3o.yml
+++ b/odoo/py3o.yml
@@ -20,7 +20,6 @@ services:
       POSTGRES_PASSWORD: somethingToChange
 
   odoodevpy3o10:
-    extends: odoopy3o10
     build:
       context: ./odoo
       dockerfile: Dockerfile.py3o.10.dev
@@ -36,6 +35,10 @@ services:
       LIMIT_TIME_REAL: 6000
       LIMIT_MEMORY_SOFT: 7000000000
       LIMIT_MEMORY_HARD: 16000000000
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
 
   odoopy3o10c7:
     init: true
@@ -56,7 +59,6 @@ services:
       POSTGRES_PASSWORD: somethingToChange
 
   odoodevpy3o10c7:
-    extends: odoopy3o10c7
     build:
       context: ./odoo
       dockerfile: Dockerfile.py3o.10.centos7.dev
@@ -65,6 +67,8 @@ services:
       DEV: 1
       CODE_FOLDER: code
       ADMIN_PASSWORD: dev
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
       LIST_DB: "True"
       DB_MAXCONN: 20
       WORKERS: 2
@@ -72,3 +76,5 @@ services:
       LIMIT_TIME_REAL: 6000
       LIMIT_MEMORY_SOFT: 7000000000
       LIMIT_MEMORY_HARD: 16000000000
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange