diff --git a/gitlab.rb.tmpl b/gitlab.rb.tmpl
index 2633aa7..f48bf13 100644
--- a/gitlab.rb.tmpl
+++ b/gitlab.rb.tmpl
@@ -678,9 +678,13 @@ gitlab_rails['omniauth_providers'] = [
 # high_availability['mountpoint'] = ["/var/opt/gitlab/git-data", "/var/opt/gitlab/gitlab-rails/shared"]
 
 ### GitLab Shell settings for GitLab
-gitlab_rails['gitlab_shell_ssh_port'] = 2222
+# gitlab_rails['gitlab_shell_ssh_port'] = 22
 # gitlab_rails['gitlab_shell_git_timeout'] = 800
 
+### Enable gitlab-sshd on a different port than OpenSSH
+gitlab_sshd['enable'] = true
+gitlab_sshd['listen_address'] = '[::]:2222' # Adjust the port accordingly
+
 ### Extra customization
 # gitlab_rails['extra_google_analytics_id'] = '_your_tracking_id'
 # gitlab_rails['extra_google_tag_manager_id'] = '_your_tracking_id'