diff --git a/.rspec b/.rspec
index 72cf692f..43ae2036 100644
--- a/.rspec
+++ b/.rspec
@@ -1,3 +1,3 @@
 --color
 --require spec_helper
---format progress
+--format documentation
diff --git a/lib/kitchen/driver/aws/standard_platform/debian.rb b/lib/kitchen/driver/aws/standard_platform/debian.rb
index d40e885c..f3249f0b 100644
--- a/lib/kitchen/driver/aws/standard_platform/debian.rb
+++ b/lib/kitchen/driver/aws/standard_platform/debian.rb
@@ -26,12 +26,13 @@ class Debian < StandardPlatform
           # 10/11 are listed last since we default to the first item in the hash
           # and 10/11 are not released yet. When they're released move them up
           DEBIAN_CODENAMES = {
+            10 => "buster",
             9 => "stretch",
             8 => "jessie",
             7 => "wheezy",
             6 => "squeeze",
             11 => "bullseye",
-            10 => "buster",
+            12 => "bookworm",
           }.freeze
 
           # default username for this platform's ami
diff --git a/spec/kitchen/driver/aws/image_selection_spec.rb b/spec/kitchen/driver/aws/image_selection_spec.rb
index beda706c..6a3b4f2a 100644
--- a/spec/kitchen/driver/aws/image_selection_spec.rb
+++ b/spec/kitchen/driver/aws/image_selection_spec.rb
@@ -112,7 +112,11 @@ def new_instance(platform_name: "blarghle")
 
     "debian" => [
       { name: "owner-id", values: %w{379101102735} },
-      { name: "name", values: %w{debian-stretch-*} },
+      { name: "name", values: %w{debian-buster-*} },
+    ],
+    "debian-10" => [
+      { name: "owner-id", values: %w{379101102735} },
+      { name: "name", values: %w{debian-buster-*} },
     ],
     "debian-9" => [
       { name: "owner-id", values: %w{379101102735} },
@@ -136,7 +140,7 @@ def new_instance(platform_name: "blarghle")
     ],
     "debian-x86_64" => [
       { name: "owner-id", values: %w{379101102735} },
-      { name: "name", values: %w{debian-stretch-*} },
+      { name: "name", values: %w{debian-buster-*} },
       { name: "architecture", values: %w{x86_64} },
     ],
     "debian-6-x86_64" => [