diff --git a/lib/beaker/platform.rb b/lib/beaker/platform.rb
index 4cb90626f..85232b05a 100644
--- a/lib/beaker/platform.rb
+++ b/lib/beaker/platform.rb
@@ -17,7 +17,8 @@ class Platform < String
                      "jessie" => "8",
                      "wheezy" => "7",
                      "squeeze" => "6", },
-        :ubuntu => { "jammy" => "2204",
+        :ubuntu => { "noble" => "2404",
+                     "jammy" => "2204",
                      "focal" => "2004",
                      "eoan" => "1910",
                      "disco" => "1904",
diff --git a/spec/beaker/platform_spec.rb b/spec/beaker/platform_spec.rb
index 6e731b936..2db01c0bf 100644
--- a/spec/beaker/platform_spec.rb
+++ b/spec/beaker/platform_spec.rb
@@ -88,6 +88,11 @@ module Beaker
         expect(platform.with_version_codename).to be === 'debian-squeeze-xxx'
       end
 
+      it "can convert ubuntu-2404-xxx to ubuntu-noble-xxx" do
+        @name = 'ubuntu-2404-xxx'
+        expect(platform.with_version_codename).to be === 'ubuntu-noble-xxx'
+      end
+
       it "can convert ubuntu-2204-xxx to ubuntu-jammy-xxx" do
         @name = 'ubuntu-2204-xxx'
         expect(platform.with_version_codename).to be === 'ubuntu-jammy-xxx'