diff --git a/debian/Dockerfile b/debian/Dockerfile
index 233ff8b1..b30eca42 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -96,7 +96,10 @@ RUN sed -i /etc/ssh/sshd_config \
         -e 's/#PasswordAuthentication.*/PasswordAuthentication no/' \
         -e 's/#SyslogFacility.*/SyslogFacility AUTH/' \
         -e 's/#LogLevel.*/LogLevel INFO/' && \
-    mkdir /var/run/sshd
+    mkdir /var/run/sshd && \
+    sed -i /etc/pam.d/sshd \
+        -e 's/\(session\s*\)required\(\s*pam_loginuid.so\)/\1optional\2/' \
+        -e '/pam_motd/s/^/#/'
 
 # VOLUME directive must happen after setting up permissions and content
 VOLUME "${AGENT_WORKDIR}" "${JENKINS_AGENT_HOME}"/.jenkins "/tmp" "/run" "/var/run"