diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index b785c2ff20917d1dad9543daac3871b6f9f74262..9a0e877826c2aa6cc5686f6b3f61bce880eede98 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -469,8 +469,10 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 		echo "[options]" > /etc/e2fsck.conf
 		echo "broken_system_clock = true" >> /etc/e2fsck.conf
 
-		if [ -f /etc/systemd/systemd-journald.conf ] ; then
-			sed -i -e 's:#SystemMaxUse=:SystemMaxUse=8M:g' /etc/systemd/systemd-journald.conf
+		if [ ! "x${rts_ssh_banner}" = "x" ] || [ ! "x${rts_ssh_user_pass}" = "x" ] ; then
+			if [ -f /etc/ssh/sshd_config ] ; then
+				sed -i -e 's:#Banner:Banner:g' /etc/ssh/sshd_config
+			fi
 		fi
 	}
 
@@ -711,6 +713,10 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 	systemd_tweaks () {
 		#We have systemd, so lets use it..
 
+		if [ -f /etc/systemd/systemd-journald.conf ] ; then
+			sed -i -e 's:#SystemMaxUse=:SystemMaxUse=8M:g' /etc/systemd/systemd-journald.conf
+		fi
+
 		#systemd v215: systemd-timesyncd.service replaces ntpdate
 		#enabled by default in v216 (not in jessie)
 		if [ -f /lib/systemd/system/systemd-timesyncd.service ] ; then
diff --git a/target/chroot/beagleboard.org-4gb-next.sh b/target/chroot/beagleboard.org-4gb-next.sh
index 16040f42dffcb1cce829495698daaf43c4207a37..84d805208b16d2b325b9902e6d9030e762a77654 100755
--- a/target/chroot/beagleboard.org-4gb-next.sh
+++ b/target/chroot/beagleboard.org-4gb-next.sh
@@ -181,10 +181,6 @@ setup_desktop () {
 #		rm -f /usr/share/applications/gksu.desktop || true
 #	fi
 
-	if [ -f /etc/ssh/sshd_config ] ; then
-		sed -i -e 's:#Banner:Banner:g' /etc/ssh/sshd_config
-	fi
-
 #	#lxterminal doesnt reference .profile by default, so call via loginshell and start bash
 #	if [ -f /usr/bin/lxterminal ] ; then
 #		if [ -f /usr/share/applications/lxterminal.desktop ] ; then
diff --git a/target/chroot/beagleboard.org-4gb.sh b/target/chroot/beagleboard.org-4gb.sh
index 7b8630aa68654d7969cc87cae929435b21551c00..aa24fcd98d5059d536f2a11920e63da66c4f6f6a 100755
--- a/target/chroot/beagleboard.org-4gb.sh
+++ b/target/chroot/beagleboard.org-4gb.sh
@@ -177,10 +177,6 @@ setup_desktop () {
 		rm -f /usr/share/applications/gksu.desktop || true
 	fi
 
-	if [ -f /etc/ssh/sshd_config ] ; then
-		sed -i -e 's:#Banner:Banner:g' /etc/ssh/sshd_config
-	fi
-
 	#lxterminal doesnt reference .profile by default, so call via loginshell and start bash
 	if [ -f /usr/bin/lxterminal ] ; then
 		if [ -f /usr/share/applications/lxterminal.desktop ] ; then
diff --git a/target/chroot/beagleboard.org-console.sh b/target/chroot/beagleboard.org-console.sh
index fdea4930fd95924d18e76ea613b09262feefa1df..d858c074f5ecea57e1689bc8560b3000770282ce 100755
--- a/target/chroot/beagleboard.org-console.sh
+++ b/target/chroot/beagleboard.org-console.sh
@@ -177,10 +177,6 @@ setup_desktop () {
 		rm -f /usr/share/applications/gksu.desktop || true
 	fi
 
-	if [ -f /etc/ssh/sshd_config ] ; then
-		sed -i -e 's:#Banner:Banner:g' /etc/ssh/sshd_config
-	fi
-
 	#lxterminal doesnt reference .profile by default, so call via loginshell and start bash
 	if [ -f /usr/bin/lxterminal ] ; then
 		if [ -f /usr/share/applications/lxterminal.desktop ] ; then
diff --git a/target/chroot/beagleboard.org.sh b/target/chroot/beagleboard.org.sh
index 88921cdb3c37da602eec71a09d5e45683121a35d..9b3ec21757c4331fef379f473ed65aecc4a9a706 100755
--- a/target/chroot/beagleboard.org.sh
+++ b/target/chroot/beagleboard.org.sh
@@ -177,10 +177,6 @@ setup_desktop () {
 		rm -f /usr/share/applications/gksu.desktop || true
 	fi
 
-	if [ -f /etc/ssh/sshd_config ] ; then
-		sed -i -e 's:#Banner:Banner:g' /etc/ssh/sshd_config
-	fi
-
 	#lxterminal doesnt reference .profile by default, so call via loginshell and start bash
 	if [ -f /usr/bin/lxterminal ] ; then
 		if [ -f /usr/share/applications/lxterminal.desktop ] ; then