diff --git a/README.md b/README.md
index a11314cb..911e9397 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ known to work on many, many platforms since its creation in 2010.
  * Debian 10
  * Debian 11
  * Debian 12
+ * Debian 13
  * EL 7
  * EL 8
  * EL 9
diff --git a/data/os/Debian/11.yaml b/data/os/Debian.yaml
similarity index 91%
rename from data/os/Debian/11.yaml
rename to data/os/Debian.yaml
index 48c2c904..19ede368 100644
--- a/data/os/Debian/11.yaml
+++ b/data/os/Debian.yaml
@@ -1,5 +1,5 @@
 ---
-# Debian 11 defaults in alphabetical order per class
+# Debian defaults in alphabetical order per class
 ssh::gss_api_authentication: 'yes'
 ssh::hash_known_hosts: 'yes'
 ssh::host: '*'
@@ -9,7 +9,6 @@ ssh::packages:
 ssh::send_env:
   - 'LANG'
   - 'LC_*'
-
 ssh::server::accept_env:
   - 'LANG'
   - 'LC_*'
diff --git a/data/os/Debian/12.yaml b/data/os/Debian/12.yaml
deleted file mode 100644
index fe35a16a..00000000
--- a/data/os/Debian/12.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Debian 12 defaults in alphabetical order per class
-ssh::gss_api_authentication: 'yes'
-ssh::hash_known_hosts: 'yes'
-ssh::host: '*'
-ssh::include: '/etc/ssh/ssh_config.d/*.conf'
-ssh::packages:
-  - 'openssh-client'
-ssh::send_env:
-  - 'LANG'
-  - 'LC_*'
-
-ssh::server::accept_env:
-  - 'LANG'
-  - 'LC_*'
-ssh::server::kbd_interactive_authentication: 'no'
-ssh::server::include: '/etc/ssh/sshd_config.d/*.conf'
-ssh::server::packages:
-  - 'openssh-server'
-ssh::server::print_motd: 'no'
-ssh::server::service_name: 'ssh'
-ssh::server::subsystem: 'sftp /usr/lib/openssh/sftp-server'
-ssh::server::use_pam: 'yes'
-ssh::server::x11_forwarding: 'yes'
diff --git a/data/os/Ubuntu/24.04.yaml b/data/os/Ubuntu.yaml
similarity index 99%
rename from data/os/Ubuntu/24.04.yaml
rename to data/os/Ubuntu.yaml
index 82f023f3..21c68408 100644
--- a/data/os/Ubuntu/24.04.yaml
+++ b/data/os/Ubuntu.yaml
@@ -9,7 +9,6 @@ ssh::packages:
 ssh::send_env:
   - 'LANG'
   - 'LC_*'
-
 ssh::server::accept_env:
   - 'LANG'
   - 'LC_*'
diff --git a/data/os/Ubuntu/20.04.yaml b/data/os/Ubuntu/20.04.yaml
index bd170cb2..e92c4f87 100644
--- a/data/os/Ubuntu/20.04.yaml
+++ b/data/os/Ubuntu/20.04.yaml
@@ -1,12 +1,6 @@
 ---
 # Ubuntu 20.04 defaults in alphabetical order per class
 ssh::forward_x11_trusted: 'yes'
-ssh::gss_api_authentication: 'yes'
-ssh::hash_known_hosts: 'yes'
-ssh::host: '*'
-ssh::include: '/etc/ssh/ssh_config.d/*.conf'
-ssh::packages:
-  - 'openssh-client'
 ssh::send_env:
   - 'LANG'
   - 'LANGUAGE'
@@ -50,20 +44,11 @@ ssh::server::gss_api_cleanup_credentials: 'yes'
 ssh::server::hostbased_authentication: 'no'
 ssh::server::ignore_rhosts: 'yes'
 ssh::server::ignore_user_known_hosts: 'no'
-ssh::server::include: '/etc/ssh/sshd_config.d/*.conf'
 ssh::server::login_grace_time: 120
-ssh::server::packages:
-  - 'openssh-server'
-ssh::server::password_authentication: 'yes'
 ssh::server::permit_root_login: 'yes'
 ssh::server::port:
   - 22
-ssh::server::print_motd: 'no'
 ssh::server::pubkey_authentication: 'yes'
-ssh::server::service_name: 'ssh'
-ssh::server::subsystem: 'sftp /usr/lib/openssh/sftp-server'
 ssh::server::syslog_facility: 'AUTH'
 ssh::server::use_dns: 'yes'
-ssh::server::use_pam: 'yes'
-ssh::server::x11_forwarding: 'yes'
 ssh::server::x11_use_localhost: 'yes'
diff --git a/data/os/Ubuntu/22.04.yaml b/data/os/Ubuntu/22.04.yaml
deleted file mode 100644
index a7b57dbe..00000000
--- a/data/os/Ubuntu/22.04.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-# Ubuntu 22.04 defaults in alphabetical order per class
-ssh::gss_api_authentication: 'yes'
-ssh::hash_known_hosts: 'yes'
-ssh::host: '*'
-ssh::include: '/etc/ssh/ssh_config.d/*.conf'
-ssh::packages:
-  - 'openssh-client'
-ssh::send_env:
-  - 'LANG'
-  - 'LC_*'
-
-ssh::server::accept_env:
-  - 'LANG'
-  - 'LC_*'
-ssh::server::kbd_interactive_authentication: 'no'
-ssh::server::include: '/etc/ssh/sshd_config.d/*.conf'
-ssh::server::packages:
-  - 'openssh-server'
-ssh::server::password_authentication: 'yes'
-ssh::server::print_motd: 'no'
-ssh::server::service_name: 'ssh'
-ssh::server::subsystem: 'sftp /usr/lib/openssh/sftp-server'
-ssh::server::use_pam: 'yes'
-ssh::server::x11_forwarding: 'yes'
diff --git a/metadata.json b/metadata.json
index 79623ff3..d852b7a3 100644
--- a/metadata.json
+++ b/metadata.json
@@ -44,7 +44,8 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "11",
-        "12"
+        "12",
+        "13"
       ]
     },
     {