diff --git a/Makefile b/Makefile
index 1b841ad..2aed7e6 100644
--- a/Makefile
+++ b/Makefile
@@ -185,27 +185,22 @@ image_db_create_erplibre_website:
 	./script/addons/install_addons.sh test hr
 	./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_ecommerce_pos_hr
 
+.PHONY: image_db_create_erplibre_code_generator
+image_db_create_erplibre_code_generator:
+	./script/make.sh addons_install_code_generator_basic
+	./.venv/bin/python3 ./odoo/odoo-bin db --backup --database code_generator --restore_image erplibre_code_generator_basic
+	./script/make.sh addons_install_code_generator_featured
+	./.venv/bin/python3 ./odoo/odoo-bin db --backup --database code_generator --restore_image erplibre_code_generator_featured
+	./script/make.sh addons_install_code_generator_full
+	./.venv/bin/python3 ./odoo/odoo-bin db --backup --database code_generator --restore_image erplibre_code_generator_full
+
 .PHONY: image_db_create_all
 image_db_create_all:
-	./script/make.sh db_create_db_test
-	./script/addons/install_addons.sh test erplibre_base
-	./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_base
-	./script/addons/install_addons.sh test website,erplibre_website_snippets_basic_html,erplibre_website_snippets_cards,erplibre_website_snippets_structures,erplibre_website_snippets_timelines,website_form_builder
-	./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_website
-	./script/addons/install_addons.sh test crm,website_crm
-	./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_website_crm
-	./script/addons/install_addons.sh test website_livechat
-	./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_website_chat_crm
-	./script/addons/install_addons.sh test website_sale,erplibre_base_quebec
-	./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_ecommerce_base
-	./script/addons/install_addons.sh test stock,purchase,website_sale_management
-	./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_ecommerce_advance
-	./script/addons/install_addons.sh test project
-	./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_ecommerce_project
-	./script/addons/install_addons.sh test pos_sale
-	./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_ecommerce_pos
-	./script/addons/install_addons.sh test hr
-	./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_ecommerce_pos_hr
+	#./script/make.sh config_gen_image_db
+	./script/make.sh image_db_create_erplibre_base
+	./script/make.sh image_db_create_erplibre_website
+	./script/make.sh image_db_create_erplibre_code_generator
+	#./script/make.sh config_gen_all
 
 .PHONY: image_diff_base_website
 image_diff_base_website:
@@ -481,6 +476,12 @@ config_gen_code_generator:
 	./script/git_repo_update_group.py --group base,code_generator
 	./script/install_locally.sh
 
+# generate config repo image_db
+.PHONY: config_gen_image_db
+config_gen_image_db:
+	./script/git_repo_update_group.py --group base,image_db
+	./script/install_locally.sh
+
 ##########
 #  I18n  #
 ##########
diff --git a/manifest/default.dev.xml b/manifest/default.dev.xml
index 0013b55..cfde160 100644
--- a/manifest/default.dev.xml
+++ b/manifest/default.dev.xml
@@ -51,7 +51,7 @@
   <project name="connector-jira.git" path="addons/OCA_connector-jira" remote="OCA" groups="addons"/>
   <project name="connector-telephony.git" path="addons/OCA_connector-telephony" remote="OCA" groups="addons"/>
   <project name="connector.git" path="addons/OCA_connector" remote="OCA" groups="addons"/>
-  <project name="contract.git" path="addons/OCA_contract" remote="OCA" revision="12.0_dev" groups="addons,code_generator"/>
+  <project name="contract.git" path="addons/OCA_contract" remote="OCA" revision="12.0_dev" groups="addons,code_generator,image_db"/>
   <project name="credit-control.git" path="addons/OCA_credit-control" remote="OCA" groups="addons"/>
   <project name="crm.git" path="addons/OCA_crm" remote="OCA" groups="addons"/>
   <project name="currency.git" path="addons/OCA_currency" remote="OCA" groups="addons"/>
@@ -65,12 +65,12 @@
   <project name="e-commerce.git" path="addons/OCA_e-commerce" remote="OCA" groups="addons"/>
   <project name="edi.git" path="addons/OCA_edi" remote="OCA" groups="addons"/>
   <project name="erplibre_addons.git" path="addons/ERPLibre_erplibre_addons" remote="ERPLibre" groups="addons,base"/>
-  <project name="erplibre_theme_addons.git" path="addons/ERPLibre_erplibre_theme_addons" remote="ERPLibre" groups="addons,code_generator"/>
+  <project name="erplibre_theme_addons.git" path="addons/ERPLibre_erplibre_theme_addons" remote="ERPLibre" groups="addons,code_generator,image_db"/>
   <project name="event.git" path="addons/OCA_event" remote="OCA" groups="addons"/>
   <project name="field-service.git" path="addons/OCA_field-service" remote="OCA" groups="addons"/>
   <project name="fleet.git" path="addons/OCA_fleet" remote="OCA" groups="addons"/>
-  <project name="geospatial.git" path="addons/OCA_geospatial" remote="OCA" groups="addons,code_generator"/>
-  <project name="helpdesk.git" path="addons/OCA_helpdesk" remote="OCA" revision="12.0_dev" groups="addons,code_generator"/>
+  <project name="geospatial.git" path="addons/OCA_geospatial" remote="OCA" groups="addons,code_generator,image_db"/>
+  <project name="helpdesk.git" path="addons/OCA_helpdesk" remote="OCA" revision="12.0_dev" groups="addons,code_generator,image_db"/>
   <project name="hr.git" path="addons/OCA_hr" remote="OCA" groups="addons"/>
   <project name="interface-github.git" path="addons/OCA_interface-github" remote="OCA" groups="addons"/>
   <project name="knowledge.git" path="addons/OCA_knowledge" remote="OCA" groups="addons"/>
@@ -93,14 +93,14 @@
   <project name="odoo-base-addons.git" path="addons/Numigi_odoo-base-addons" remote="Numigi" revision="12.0_dev" groups="addons"/>
   <project name="odoo-business-spending-management-quebec-canada.git" path="addons/MathBenTech_odoo-business-spending-management-quebec-canada" remote="MathBenTech" revision="12.0_sale_order_line_timesheet_attribution" groups="addons,base"/>
   <project name="odoo-cloud-platform.git" path="addons/camptocamp_odoo-cloud-platform" remote="camptocamp" revision="12.0_dev" groups="addons"/>
-  <project name="odoo-code-generator-template.git" path="addons/TechnoLibre_odoo-code-generator-template" revision="12.0" remote="TechnoLibre" groups="addons,code_generator"/>
-  <project name="odoo-code-generator.git" path="addons/TechnoLibre_odoo-code-generator" remote="TechnoLibre" revision="12.0" groups="addons,code_generator"/>
+  <project name="odoo-code-generator-template.git" path="addons/TechnoLibre_odoo-code-generator-template" revision="12.0" remote="TechnoLibre" groups="addons,code_generator,image_db"/>
+  <project name="odoo-code-generator.git" path="addons/TechnoLibre_odoo-code-generator" remote="TechnoLibre" revision="12.0" groups="addons,code_generator,image_db"/>
   <project name="odoo-development.git" path="doc/itpp-labs_odoo-development" remote="itpp-labs" revision="12.0_dev" groups="odoo"/>
   <project name="odoo-entertainment-addons.git" path="addons/Numigi_odoo-entertainment-addons" remote="Numigi" revision="12.0_dev" groups="addons"/>
   <project name="odoo-git-addons.git" path="addons/Numigi_odoo-git-addons" remote="Numigi" revision="12.0_dev" groups="addons"/>
   <project name="odoo-hr-addons.git" path="addons/Numigi_odoo-hr-addons" remote="Numigi" groups="addons"/>
   <project name="odoo-module-migrator.git" path="script/OCA_odoo-module-migrator" remote="OCA" revision="master" groups="odoo"/>
-  <project name="odoo-partner-addons.git" path="addons/Numigi_odoo-partner-addons" remote="Numigi" revision="12.0_dev" groups="addons"/>
+  <project name="odoo-partner-addons.git" path="addons/Numigi_odoo-partner-addons" remote="Numigi" revision="12.0_dev" groups="addons,image_db"/>
   <project name="odoo-product-addons.git" path="addons/Numigi_odoo-product-addons" remote="Numigi" revision="12.0_dev" groups="addons"/>
   <project name="odoo-port-docs.git" path="doc/itpp-labs_odoo-port-docs" remote="itpp-labs" revision="master" groups="odoo"/>
   <project name="odoo-product-configurator.git" path="addons/pledra_odoo-product-configurator" remote="pledra" groups="addons"/>
@@ -111,7 +111,7 @@
   <project name="odoo-test-docs.git" path="doc/itpp-labs_odoo-test-docs" remote="itpp-labs" revision="master" groups="odoo"/>
   <project name="odoo-timesheet-addons.git" path="addons/Numigi_odoo-timesheet-addons" remote="Numigi" revision="12.0_dev" groups="addons"/>
   <project name="odoo-web-addons.git" path="addons/Numigi_odoo-web-addons" remote="Numigi" groups="addons"/>
-  <project name="odoo.git" path="odoo" remote="odoo" revision="ERPLibre/12.0" clone-depth="10" groups="odoo,base,code_generator"/>
+  <project name="odoo.git" path="odoo" remote="odoo" revision="ERPLibre/12.0" clone-depth="10" groups="odoo,base"/>
   <project name="odoo_addons.git" path="addons/Smile-SA_odoo_addons" remote="Smile-SA" revision="12.0_remote_autoinstall" groups="addons"/>
   <project name="odoo_dhtmlxgantt.git" path="addons/obayit_odoo_dhtmlxgantt" remote="obayit" groups="addons"/>
   <project name="odooapps.git" path="addons/odoomates_odooapps" remote="odoomates" groups="addons"/>
@@ -151,6 +151,6 @@
   <project name="web.git" path="addons/OCA_web" remote="OCA" revision="12.0_dev" groups="addons,base"/>
   <project name="website-addons.git" path="addons/itpp-labs_website-addons" remote="itpp-labs" revision="12.0_dev" groups="addons"/>
   <project name="website-cms.git" path="addons/OCA_website-cms" remote="OCA" groups="addons"/>
-  <project name="website.git" path="addons/OCA_website" remote="OCA" revision="12.0_dev" groups="addons,code_generator"/>
+  <project name="website.git" path="addons/OCA_website" remote="OCA" revision="12.0_dev" groups="addons,code_generator,image_db"/>
   <project name="wms.git" path="addons/OCA_wms" remote="OCA" groups="addons"/>
 </manifest>