diff --git a/defaults/main.yml b/defaults/main.yml
index 1afebdf168b414ea1b073ba439efcaaa2d7e0cc4..7fc29175600b2e29e4e53ae57090625dd1de7823 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -10,6 +10,9 @@ sophos_install_opts: "--update-free --acceptlicence --autostart=true --enableOnB
 sophos_install_extra_opts: ""
 
 # PSS vars
+pss_nas_ssh_allowusers:
+  - csi@172.16.50.11
+  - csi@pss-bastion-01.tn.esss.lu.se
 pss_nas_software_repo_url: https://artifactory.esss.lu.se/artifactory/list/PSS-Softwares/
 pss_nas_software_files:
   - test.zip
diff --git a/templates/sshd_config.j2 b/templates/sshd_config.j2
index cc3098628c1e0078527d7a8168e29ec0113ad886..dea1a892fb330958a4f81b1f9e9cf9296183c383 100644
--- a/templates/sshd_config.j2
+++ b/templates/sshd_config.j2
@@ -16,4 +16,4 @@ AcceptEnv XMODIFIERS
 Subsystem sftp  /usr/libexec/openssh/sftp-server
 Match User csi
     PasswordAuthentication no
-AllowUsers  csi@172.16.50.11 csi@pss-bastion-01.tn.esss.lu.se
+AllowUsers {% for user in  pss_nas_ssh_allowusers %} {{user}} {% endfor  %}