diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index bb972c456fb..c5eef404bf3 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -120,10 +120,9 @@ EOF
 	# historical "nvd" driver.
 	echo 'hw.nvme.use_nvd="0"' >> ${DESTDIR}/boot/loader.conf
 
-	# Disable ChallengeResponseAuthentication according to EC2
-	# requirements.
+	# Disable KbdInteractiveAuthentication according to EC2 requirements.
 	sed -i '' -e \
-		's/^#ChallengeResponseAuthentication yes/ChallengeResponseAuthentication no/' \
+		's/^#KbdInteractiveAuthentication yes/KbdInteractiveAuthentication no/' \
 		${DESTDIR}/etc/ssh/sshd_config
 
 	# Use FreeBSD Update and Portsnap mirrors hosted in AWS
diff --git a/release/tools/gce.conf b/release/tools/gce.conf
index 113784a7643..903f1e07306 100644
--- a/release/tools/gce.conf
+++ b/release/tools/gce.conf
@@ -69,7 +69,7 @@ EOF
 EOF
 
 	cat << EOF >> ${DESTDIR}/etc/ssh/sshd_config
-ChallengeResponseAuthentication no
+KbdInteractiveAuthentication no
 X11Forwarding no
 AcceptEnv LANG
 AllowAgentForwarding no