diff --git a/18.0.Dockerfile b/18.0.Dockerfile
index 795081399cfe8dde081c11a3c4eba13782f02ec6..c128e18f425c2cacce7616b974479434f3800b7b 100644
--- a/18.0.Dockerfile
+++ b/18.0.Dockerfile
@@ -87,33 +87,28 @@ COPY --chown=root:root --chmod=755 ./get_addons /usr/local/bin
 ARG SAVE_COMMITS_FILENAME='default_addons'
 RUN set -x; \
   get_addons 'https://github.com/OCA/account-financial-tools' '18.0' 'additional_addons' \
-#    account_lock_date_update \
-#    account_move_name_sequence \
-    account_usability \
-  && get_addons 'https://github.com/DynAppsNV/account-financial-tools' '18.0-mig-account_move_name_sequence' 'additional_addons' \
+    account_lock_date_update \
     account_move_name_sequence \
-#  && get_addons 'https://github.com/OCA/account-invoicing' '18.0' 'additional_addons' \
+    account_usability \
+  && get_addons 'https://github.com/OCA/account-invoicing' '18.0' 'additional_addons' \
+    account_move_cancel_confirm \
 #    sale_timesheet_invoice_description \
   && get_addons 'https://github.com/OCA/account-reconcile' '18.0' 'additional_addons' \
     account_statement_base \
-#    account_reconcile_model_oca \
-#    account_reconcile_oca \
-  && get_addons 'https://github.com/xaviedoanhduy/account-reconcile' '18.0-mig-account_reconcile_model_oca' 'additional_addons' \
     account_reconcile_model_oca \
+#    account_reconcile_oca \
+  && get_addons 'https://github.com/ForgeFlow/account-reconcile' '18.0-mig-account_reconcile_oca' 'additional_addons' \
+    account_reconcile_oca \
   && get_addons 'https://github.com/OCA/bank-statement-import' '18.0' 'additional_addons' \
     account_statement_import_base \
     account_statement_import_file \
 #    account_statement_import_file_reconcile_oca \
-#    account_statement_import_ofx \
-#  && get_addons 'https://github.com/OCA/crm' '18.0' 'additional_addons' \
-#    crm_stage_probability \
-  && get_addons 'https://github.com/APSL/crm' '18.0-mig-crm_stage_probability' 'additional_addons' \
+    account_statement_import_ofx \
+  && get_addons 'https://github.com/OCA/crm' '18.0' 'additional_addons' \
     crm_stage_probability \
-#  && get_addons 'https://github.com/OCA/l10n-france' '18.0' 'additional_addons' \
-#    l10n_fr_siret \
-#    l10n_fr_siret_lookup \
   && get_addons 'https://github.com/OCA/l10n-france' '18.0' 'additional_addons' \
     l10n_fr_siret \
+#    l10n_fr_siret_lookup \
     l10n_fr_siret_account \
   && get_addons 'https://github.com/apikcloud/l10n-france' '18.0-mig-l10n_fr_siret_lookup' 'additional_addons' \
     l10n_fr_siret_lookup \
@@ -121,13 +116,12 @@ RUN set -x; \
     mail_debrand \
     mail_tracking \
   && get_addons 'https://github.com/OCA/partner-contact' '18.0' 'additional_addons' \
-#    partner_disable_gravatar \
+    partner_disable_gravatar \
     partner_firstname \
-#  && get_addons 'https://github.com/OCA/project' '18.0' 'additional_addons' \
-#    project_task_default_stage \
-  && get_addons 'https://github.com/Borruso/project' '18.0-mig-project_task_default_stage' 'additional_addons' \
+  && get_addons 'https://github.com/OCA/project' '18.0' 'additional_addons' \
     project_task_default_stage \
-#    project_template \
+  && get_addons 'https://github.com/StefanRijnhart/project' '18.0-mig-project_template' 'additional_addons' \
+    project_template \
   && get_addons 'https://github.com/OCA/server-brand' '18.0' 'additional_addons' \
     disable_odoo_online \
     portal_odoo_debranding \
@@ -135,9 +129,8 @@ RUN set -x; \
   && get_addons 'https://github.com/OCA/server-tools' '18.0' 'additional_addons' \
     base_view_inheritance_extension \
     module_change_auto_install \
-#  && get_addons 'https://github.com/OCA/server-ux' '18.0' 'additional_addons' \
-#    server_action_mass_edit \
-  && get_addons 'https://github.com/trisdoan/server-ux' '18.0-mig-server_action_mass_edit' 'additional_addons' \
+  && get_addons 'https://github.com/OCA/server-ux' '18.0' 'additional_addons' \
+    base_cancel_confirm \
     server_action_mass_edit \
   && get_addons 'https://github.com/OCA/web' '18.0' 'additional_addons' \
     web_environment_ribbon \
@@ -149,6 +142,8 @@ RUN set -x; \
     web_refresher \
   && get_addons 'https://github.com/kobros-tech/web' '18.0-mig-web_responsive' 'additional_addons' \
     web_responsive \
+  && get_addons 'https://github.com/widadelbekkouri-odoo/web' '18.0-mig-web_theme_classic' 'additional_addons' \
+    web_theme_classic \
   && find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete \
   # Install Le Filament default addons.
 #  && get_addons 'https://sources.le-filament.com/lefilament/remove_login_links.git' '18.0' 'private_addons/remove_login_links' \