diff --git a/source/orchestrationLogic/HEAT/fileserver.sh b/source/orchestrationLogic/HEAT/fileserver.sh
index f1bb7f4f10c0b43988236125c4914529985daa59..a366d74cbf844b5ac21dba433fe29ceae6f60291 100644
--- a/source/orchestrationLogic/HEAT/fileserver.sh
+++ b/source/orchestrationLogic/HEAT/fileserver.sh
@@ -35,7 +35,6 @@ addgroup --system sftponly
 adduser --disabled-password --gecos "" --home /home/project_owner <owner>
 
 # owner can have access to /opt/shared to upload and download files
-#chown nobody:nogroup /opt/data/shared
 chown ubuntu /opt/data/shared
 
 mkdir /home/project_owner/.ssh/
@@ -51,7 +50,7 @@ adduser ubuntu allowssh
 
 echo 'PermitRootLogin no
 PubkeyAuthentication no
-PasswordAuthentication yes
+PasswordAuthentication no
 ChallengeResponseAuthentication no
 UsePAM yes
 X11Forwarding yes
@@ -70,8 +69,8 @@ Match Group allowssh
 Match Group sftponly
     ChrootDirectory /opt/data
     DisableForwarding yes
-    ForceCommand internal-sftp' > /etc/ssh/sshd_config
-    PasswordAuthentication no
+    ForceCommand internal-
+    sftp' > /etc/ssh/sshd_config
 
 
 # restart ssh to apply changes