diff --git a/Makefile b/Makefile
index fd697cf68..14a22a566 100644
--- a/Makefile
+++ b/Makefile
@@ -61,8 +61,8 @@ download_backup:
 	Filename=$$(basename $$LinkDB); \
 	echo "Downloading $$Filename from: $$LinkDB"; \
 	${PWD}/setup/download_backup.sh $$LinkDB backup.zip
+#$(MAKE) download_backup LINKDB=${BACKUP}
 gen_config:
-	$(MAKE) download_backup LINKDB=${BACKUP}
 	${PWD}/setup/init_config.sh --native ${ADDONS} ${DB_USER} ${DB_PASSWORD} ${DB_SERVER} ${DB_PORT}
 run_server:
 	${PYTHON} odoo-bin --config=${CONFIG} 
@@ -94,13 +94,17 @@ drop_database:
 run_test_docker: 
 	sudo ${DOCKER_EXEC} ${CONTAINER_ID} odoo --test-tags :TestAccountMove.test_out_invoice_auto_post_monthly,TestAccountMove.test_included_tax  --log-level=test --test-enable -d testdb-${TAG} --stop-after-init --config=/etc/odoo/${CONFIG} --xmlrpc-port=8071 && \
 	sudo ${DOCKER_EXEC} ${CONTAINER_ID} odoo db --config=/etc/odoo/${CONFIG} drop testdb-${TAG}  
+# $(MAKE) download_backup LINKDB=${BACKUP}
 gen_config_docker: 
-	$(MAKE) download_backup LINKDB=${BACKUP}
 	${PWD}/setup/init_config.sh --docker ${ODOO_IMAGE} ${TAG} ${CONTAINER_ID}
 build_image:
 	(cd ${DEPLOY_PATH} && \
 	DOCKER_BUILDKIT=1 ${DOCKER_BUILD} . --progress=plain --no-cache --tag $$(echo ${ODOO_IMAGE} | tr A-Z a-z):${TAG}\
 	)
+build_image_cache:
+	(cd ${DEPLOY_PATH} && \
+	DOCKER_BUILDKIT=1 ${DOCKER_BUILD} . --progress=plain --tag $$(echo ${ODOO_IMAGE} | tr A-Z a-z):${TAG}\
+	)
 push_image:
 	$(DOCKER_PUSH) $(shell echo ${ODOO_IMAGE}| tr A-Z a-z):${TAG}
 run_server_docker: 
diff --git a/deployment b/deployment
index e22704716..228690b78 160000
--- a/deployment
+++ b/deployment
@@ -1 +1 @@
-Subproject commit e22704716ffa9ef37485335797acd396b9e7684a
+Subproject commit 228690b7874449c629fa5e78e0f1faeb80ab4ef9
diff --git a/extra-addons b/extra-addons
index bdeeb68d5..7b345aceb 160000
--- a/extra-addons
+++ b/extra-addons
@@ -1 +1 @@
-Subproject commit bdeeb68d5a47702a48ab8c97da032bb938fc0b1b
+Subproject commit 7b345acebd9280764e363702982e2e184008cd89