diff --git a/data/Amazon.yaml b/data/Amazon.yaml
index a2042c3d..6acd85ac 100644
--- a/data/Amazon.yaml
+++ b/data/Amazon.yaml
@@ -9,3 +9,5 @@ ssh::client::ssh_config: '/etc/ssh/ssh_config'
 ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/libexec/openssh/sftp-server'
 ssh::server::host_priv_key_group: 0
+ssh::server::default_options:
+  ChallengeResponseAuthentication: 'no'
diff --git a/data/Archlinux.yaml b/data/Archlinux.yaml
index 3255fb6d..166ffeaf 100644
--- a/data/Archlinux.yaml
+++ b/data/Archlinux.yaml
@@ -8,3 +8,5 @@ ssh::client::ssh_config: '/etc/ssh/ssh_config'
 ssh::server::service_name: 'sshd.service'
 ssh::sftp_server_path: '/usr/lib/ssh/sftp-server'
 ssh::server::host_priv_key_group: 0
+ssh::server::default_options:
+  KbdInteractiveAuthentication: 'no'
diff --git a/data/Darwin.yaml b/data/Darwin.yaml
index 5a6a4610..09add2f5 100644
--- a/data/Darwin.yaml
+++ b/data/Darwin.yaml
@@ -5,3 +5,5 @@ ssh::client::ssh_config: '/etc/ssh/ssh_config'
 ssh::server::service_name: 'com.openssh.sshd'
 ssh::sftp_server_path: '/usr/libexec/sftp-server'
 ssh::server::host_priv_key_group: 0
+ssh::server::default_options:
+  ChallengeResponseAuthentication: 'no'
diff --git a/data/Debian_10.yaml b/data/Debian_10.yaml
new file mode 100644
index 00000000..59308de6
--- /dev/null
+++ b/data/Debian_10.yaml
@@ -0,0 +1,3 @@
+---
+ssh::server::default_options:
+  ChallengeResponseAuthentication: 'no'
diff --git a/data/Debian_11.yaml b/data/Debian_11.yaml
new file mode 100644
index 00000000..59308de6
--- /dev/null
+++ b/data/Debian_11.yaml
@@ -0,0 +1,3 @@
+---
+ssh::server::default_options:
+  ChallengeResponseAuthentication: 'no'
diff --git a/data/Debian_12.yaml b/data/Debian_12.yaml
new file mode 100644
index 00000000..84b7b896
--- /dev/null
+++ b/data/Debian_12.yaml
@@ -0,0 +1,3 @@
+---
+ssh::server::default_options:
+  KbdInteractiveAuthentication: 'no'
diff --git a/data/Debian_8.yaml b/data/Debian_8.yaml
new file mode 100644
index 00000000..59308de6
--- /dev/null
+++ b/data/Debian_8.yaml
@@ -0,0 +1,3 @@
+---
+ssh::server::default_options:
+  ChallengeResponseAuthentication: 'no'
diff --git a/data/Debian_9.yaml b/data/Debian_9.yaml
new file mode 100644
index 00000000..59308de6
--- /dev/null
+++ b/data/Debian_9.yaml
@@ -0,0 +1,3 @@
+---
+ssh::server::default_options:
+  ChallengeResponseAuthentication: 'no'
diff --git a/data/DragonFly.yaml b/data/DragonFly.yaml
index d7d94bc4..e0a07687 100644
--- a/data/DragonFly.yaml
+++ b/data/DragonFly.yaml
@@ -6,3 +6,5 @@ ssh::client::ssh_config: '/etc/ssh/ssh_config'
 ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/libexec/sftp-server'
 ssh::server::host_priv_key_group: 0
+ssh::server::default_options:
+  ChallengeResponseAuthentication: 'no'
diff --git a/data/Gentoo.yaml b/data/Gentoo.yaml
index 37014c39..ec003ca8 100644
--- a/data/Gentoo.yaml
+++ b/data/Gentoo.yaml
@@ -8,3 +8,5 @@ ssh::client::ssh_config: '/etc/ssh/ssh_config'
 ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/lib64/misc/sftp-server'
 ssh::server::host_priv_key_group: 0
+ssh::server::default_options:
+  KbdInteractiveAuthentication: 'no'
diff --git a/data/OpenBSD.yaml b/data/OpenBSD.yaml
index bc486174..89ab4121 100644
--- a/data/OpenBSD.yaml
+++ b/data/OpenBSD.yaml
@@ -7,7 +7,7 @@ ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/libexec/sftp-server'
 ssh::server::host_priv_key_group: 0
 ssh::server::default_options:
-  ChallengeResponseAuthentication: 'no'
+  KbdInteractiveAuthentication: 'no'
   X11Forwarding: 'yes'
   PrintMotd: 'no'
   AcceptEnv: 'LANG LC_*'
diff --git a/data/RedHat.yaml b/data/RedHat.yaml
index 81138ce0..fb728a7f 100644
--- a/data/RedHat.yaml
+++ b/data/RedHat.yaml
@@ -9,3 +9,5 @@ ssh::client::ssh_config: '/etc/ssh/ssh_config'
 ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/libexec/openssh/sftp-server'
 ssh::server::host_priv_key_group: 0
+ssh::server::default_options:
+  ChallengeResponseAuthentication: 'no'
diff --git a/data/SLES.yaml b/data/SLES.yaml
index 41400cef..eb3f05be 100644
--- a/data/SLES.yaml
+++ b/data/SLES.yaml
@@ -1,3 +1,5 @@
 ---
 ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/lib/ssh/sftp-server'
+ssh::server::default_options:
+  ChallengeResponseAuthentication: 'no'
diff --git a/data/SmartOS.yaml b/data/SmartOS.yaml
index d9625d4c..7c75fcfb 100644
--- a/data/SmartOS.yaml
+++ b/data/SmartOS.yaml
@@ -5,3 +5,5 @@ ssh::client::ssh_config: '/etc/ssh/ssh_config'
 ssh::server::service_name: 'svc:/network/ssh:default'
 ssh::sftp_server_path: 'internal-sftp'
 ssh::server::host_priv_key_group: 0
+ssh::server::default_options:
+  ChallengeResponseAuthentication: 'no'
diff --git a/data/Suse.yaml b/data/Suse.yaml
index 84b48b49..3c723160 100644
--- a/data/Suse.yaml
+++ b/data/Suse.yaml
@@ -8,3 +8,5 @@ ssh::server::sshd_environments_file: '/etc/sysconfig/ssh'
 ssh::server::service_name: 'sshd'
 ssh::client::ssh_config: '/etc/ssh/ssh_config'
 ssh::server::host_priv_key_group: 0
+ssh::server::default_options:
+  ChallengeResponseAuthentication: 'no'
diff --git a/data/common.yaml b/data/common.yaml
index 2c9556a4..5542600b 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -28,7 +28,6 @@ ssh::server::issue_net              : '/etc/issue.net'
 ssh::knownhosts::collect_enabled    : true
 
 ssh::server::default_options:
-  ChallengeResponseAuthentication: 'no'
   X11Forwarding: 'yes'
   PrintMotd: 'no'
   AcceptEnv: 'LANG LC_*'