diff --git a/templates/odoo.conf.j2 b/templates/odoo.conf.j2
index 633abc8f8facea8b9dc8117d26403f7f03ff6159..5d400df20c328a8c80be00067c2b2c0c9c122b0d 100644
--- a/templates/odoo.conf.j2
+++ b/templates/odoo.conf.j2
@@ -31,15 +31,25 @@ limit_time_real = {{ odoo_limit_time_real | default(600) }}
 ; logfile = None
 ; longpolling_port = 8072
 ; max_cron_threads = 2
+{% if odoo_version == '12.0' %}
+modules_auto_install_disabled = account_facturx,mail_bot,web_unsplash{% if odoo_modules_auto_install_disabled is defined %},{{ odoo_modules_auto_install_disabled }}{% endif %}
+
+modules_auto_install_enabled = disable_odoo_online,mail_debrand,partner_disable_gravatar,partner_firstname,password_security,remove_odoo_enterprise,web_responsive,web_no_bubble{% if odoo_modules_auto_install_enabled is defined %},{{ odoo_modules_auto_install_enabled }}{% endif %}
+
+{% endif %}
+{% if odoo_version == '14.0' %}
 modules_auto_install_disabled = account_edi,mail_bot,web_unsplash{% if odoo_modules_auto_install_disabled is defined %},{{ odoo_modules_auto_install_disabled }}{% endif %}
 
 modules_auto_install_enabled = account_move_name_sequence,account_reconcile_show_boolean,account_reconciliation_widget,disable_odoo_online,mail_debrand,partner_disable_gravatar,partner_firstname,password_security,remove_login_links,remove_odoo_enterprise,web_responsive,web_no_bubble{% if odoo_modules_auto_install_enabled is defined %},{{ odoo_modules_auto_install_enabled }}{% endif %}
 
+{% endif %}
 ; osv_memory_age_limit = 1.0
 ; osv_memory_count_limit = False
 proxy_mode = True
+{% if odoo_version == '12.0' or odoo_version == '14.0' %}
 server_wide_modules = web,module_change_auto_install{% if odoo_server_wide_modules is defined %},{{ odoo_server_wide_modules }}{% endif %}
 
+{% endif %}
 ; smtp_password = False
 {% if mailname is defined %}
 ; smtp_port = 25