diff --git a/data/hooks/conf_regen/03-ssh b/data/hooks/conf_regen/03-ssh
index 54b7c55b7..1f057aa35 100755
--- a/data/hooks/conf_regen/03-ssh
+++ b/data/hooks/conf_regen/03-ssh
@@ -26,6 +26,8 @@ do_pre_regen() {
     # Support different strategy for security configurations
     export compatibility="$(yunohost settings get 'security.ssh.compatibility')"
 
+    export port="$(yunohost settings get 'security.ssh.port')"
+
     export ssh_keys
     export ipv6_enabled
     ynh_render_template "sshd_config" "${pending_dir}/etc/ssh/sshd_config"
diff --git a/data/templates/ssh/sshd_config b/data/templates/ssh/sshd_config
index 84f06d4e5..0ffde09c6 100644
--- a/data/templates/ssh/sshd_config
+++ b/data/templates/ssh/sshd_config
@@ -2,7 +2,7 @@
 # by YunoHost
 
 Protocol 2
-Port 22
+Port {{ port }}
 
 {% if ipv6_enabled == "true" %}ListenAddress ::{% endif %}
 ListenAddress 0.0.0.0
diff --git a/src/yunohost/settings.py b/src/yunohost/settings.py
index e252316bd..f44178f07 100644
--- a/src/yunohost/settings.py
+++ b/src/yunohost/settings.py
@@ -71,6 +71,10 @@ DEFAULTS = OrderedDict(
                 "choices": ["intermediate", "modern"],
             },
         ),
+        (
+            "security.ssh.port",
+            {"type": "int", "default": 22},
+        ),
         (
             "security.nginx.compatibility",
             {
@@ -383,6 +387,7 @@ def reconfigure_nginx(setting_name, old_value, new_value):
         regen_conf(names=["nginx"])
 
 
+@post_change_hook("security.ssh.port")
 @post_change_hook("security.ssh.compatibility")
 def reconfigure_ssh(setting_name, old_value, new_value):
     if old_value != new_value: