diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py
index 7cdcc8641..c6ea3221a 100644
--- a/src/yunohost/tools.py
+++ b/src/yunohost/tools.py
@@ -368,7 +368,6 @@ def tools_postinstall(operation_logger, domain, password, ignore_dyndns=False,
     service_enable("yunohost-firewall")
     service_start("yunohost-firewall")
 
-    regen_conf(force=True)
     regen_conf(names=["ssh"], force=True)
 
     # Restore original ssh conf, as chosen by the
@@ -384,6 +383,8 @@ def tools_postinstall(operation_logger, domain, password, ignore_dyndns=False,
     if os.path.exists(original_sshd_conf):
         os.rename(original_sshd_conf, '/etc/ssh/sshd_config')
 
+    regen_conf(force=True)
+
     logger.success(m18n.n('yunohost_configured'))
 
     logger.warning(m18n.n('yunohost_postinstall_end_tip'))