diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef66396131214b637130f01a94eaa55364f96df7..272f452b55b07bc60e6058d4f4ee7fa13cba1f0f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,88 +7,22 @@
 # See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
 image: docker:26
 include:
-- template: Security/Container-Scanning.gitlab-ci.yml
-- template: Security/Secret-Detection.gitlab-ci.yml
+  - template: Security/Container-Scanning.gitlab-ci.yml
+  - template: Security/Secret-Detection.gitlab-ci.yml
 container_scanning:
   variables:
     CS_IMAGE: "$CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH"
     CS_DOCKERFILE_PATH: "$CI_COMMIT_BRANCH.Dockerfile"
     GIT_STRATEGY: fetch
-docker-build-10.0:
-  image: docker:26
-  stage: build
-  services:
-  - docker:26-dind
-  before_script:
-  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-  script:
-  - docker build --pull -f 10.0.Dockerfile -t "$CI_REGISTRY_IMAGE:10.0" .
-  - docker push "$CI_REGISTRY_IMAGE:10.0"
-  only:
-  - '10.0'
-docker-build-12.0:
-  image: docker:26
-  stage: build
-  services:
-  - docker:26-dind
-  before_script:
-  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-  script:
-  - docker build --pull -f 12.0.Dockerfile -t "$CI_REGISTRY_IMAGE:12.0" .
-  - docker build --pull -f 12.0_ml.Dockerfile -t "$CI_REGISTRY_IMAGE:12.0_ml" .
-  - docker build --pull -f 12.0_py3.6.Dockerfile -t "$CI_REGISTRY_IMAGE:12.0_py3.6"
-    .
-  - docker push "$CI_REGISTRY_IMAGE:12.0"
-  - docker push "$CI_REGISTRY_IMAGE:12.0_ml"
-  - docker push "$CI_REGISTRY_IMAGE:12.0_py3.6"
-  only:
-  - '12.0'
-docker-build-14.0:
-  image: docker:26
-  stage: build
-  services:
-  - docker:26-dind
-  before_script:
-  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-  script:
-  - docker build --pull -f 14.0.Dockerfile -t "$CI_REGISTRY_IMAGE:14.0" .
-  - docker push "$CI_REGISTRY_IMAGE:14.0"
-  only:
-  - '14.0'
-docker-build-16.0:
-  image: docker:26
-  stage: build
-  services:
-  - docker:26-dind
-  before_script:
-  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-  script:
-  - docker build --pull -f 16.0.Dockerfile -t "$CI_REGISTRY_IMAGE:16.0" .
-  - docker push "$CI_REGISTRY_IMAGE:16.0"
-  only:
-  - '16.0'
-# docker-build-16.0-scratch:
-#   image: docker:26
-#   stage: build
-#   services:
-#   - docker:26-dind
-#   before_script:
-#   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-#   script:
-#   - docker build --pull -f 16.0-scratch.Dockerfile -t "$CI_REGISTRY_IMAGE:16.0-scratch"
-#     .
-#   - docker push "$CI_REGISTRY_IMAGE:16.0-scratch"
-#   only:
-#   - '16.0'
 docker-build-17.0:
   image: docker:26
   stage: build
   services:
-  - docker:26-dind
+    - docker:26-dind
   before_script:
-  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-  - docker build --pull -f 17.0.Dockerfile -t "$CI_REGISTRY_IMAGE:17.0" .
-  - docker push "$CI_REGISTRY_IMAGE:17.0"
+    - docker build --progress=plain --pull -f 17.0.Dockerfile -t "$CI_REGISTRY_IMAGE:17.0" .
+    - docker push "$CI_REGISTRY_IMAGE:17.0"
   only:
-  - '17.0'
+    - '17.0'
diff --git a/17.0.Dockerfile b/17.0.Dockerfile
index 499632b2953eeb07ca9bafe91fa6071c4cce9681..8bfc4788980f6e8e6441e13768cfd435a3634af8 100644
--- a/17.0.Dockerfile
+++ b/17.0.Dockerfile
@@ -66,6 +66,7 @@ RUN set -x; \
         curl -L https://github.com/OCA/bank-statement-import/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="bank-statement-import" --strip-components 1 &&\
         mv /tmp/oca-repos/bank-statement-import/account_statement_import_base \
            /tmp/oca-repos/bank-statement-import/account_statement_import_file \
+           /tmp/oca-repos/bank-statement-import/account_statement_import_file_reconcile_oca \
 #           /tmp/oca-repos/bank-statement-import/account_statement_import_ofx \
            /opt/odoo/additional_addons/ &&\
         curl -L https://github.com/OCA/crm/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="crm" --strip-components 1 &&\
@@ -78,18 +79,18 @@ RUN set -x; \
 #        mv /tmp/oca-repos/partner-contact/partner_disable_gravatar \
          mv /tmp/oca-repos/partner-contact/partner_firstname \
            /opt/odoo/additional_addons/ &&\
-#        curl -L https://github.com/OCA/project/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="project" --strip-components 1 &&\
-#        mv /tmp/oca-repos/project/project_task_default_stage \
+        curl -L https://github.com/OCA/project/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="project" --strip-components 1 &&\
+        mv /tmp/oca-repos/project/project_task_default_stage \
 #            /tmp/oca-repos/project/project_template \
-#           /opt/odoo/additional_addons/ &&\
+           /opt/odoo/additional_addons/ &&\
 #        curl -L https://github.com/OCA/server-auth/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-auth" --strip-components 1 &&\
 #        mv /tmp/oca-repos/server-auth/password_security \
 #           /opt/odoo/additional_addons/ &&\
-#        curl -L https://github.com/OCA/server-brand/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-brand" --strip-components 1 &&\
-#        mv /tmp/oca-repos/server-brand/disable_odoo_online \
+        curl -L https://github.com/OCA/server-brand/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-brand" --strip-components 1 &&\
+        mv /tmp/oca-repos/server-brand/disable_odoo_online \
 #           /tmp/oca-repos/server-brand/portal_odoo_debranding \
-#           /tmp/oca-repos/server-brand/remove_odoo_enterprise \
-#           /opt/odoo/additional_addons/ &&\
+           /tmp/oca-repos/server-brand/remove_odoo_enterprise \
+           /opt/odoo/additional_addons/ &&\
         curl -L https://github.com/OCA/server-tools/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-tools" --strip-components 1 &&\
         mv /tmp/oca-repos/server-tools/base_view_inheritance_extension \
            /tmp/oca-repos/server-tools/module_change_auto_install \
@@ -99,10 +100,9 @@ RUN set -x; \
            /opt/odoo/additional_addons/ &&\
         curl -L https://github.com/OCA/social/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="social" --strip-components 1 &&\
         mv /tmp/oca-repos/social/mail_debrand \
-#           /tmp/oca-repos/social/mail_tracking \
+           /tmp/oca-repos/social/mail_tracking \
            /opt/odoo/additional_addons/ &&\
         curl -L https://github.com/OCA/web/tarball/17.0 | tar -xzC /tmp/oca-repos/ --one-top-level="web" --strip-components 1 &&\
-#        mv /tmp/oca-repos/web/web_chatter_position \
         mv /tmp/oca-repos/web/web_environment_ribbon \
            /tmp/oca-repos/web/web_refresher \
            /tmp/oca-repos/web/web_responsive \