diff --git a/riocli/apply/manifests/device.yaml b/riocli/apply/manifests/device.yaml
index 7e57b8b0..18a48dcc 100644
--- a/riocli/apply/manifests/device.yaml
+++ b/riocli/apply/manifests/device.yaml
@@ -67,7 +67,7 @@ spec:
     product: "sootballs" # Required Options: ["sootballs", "flaptter", "oks", "platform"]
     arch: "amd64" # Options: ["amd64" (default), "arm64" ]
     os: "ubuntu" # Options: ["ubuntu" (default), "debian" ]
-    codename: "focal" # Options: ["bionic", "focal" (default), "jammy", "bullseye"]
+    codename: "focal" # Options: ["bionic", "focal" (default), "jammy", "noble", "bullseye"]
     highperf: False # Optional [True, False (default)]
     wait: True # Optional [True, False (default)] Wait until the device is ready.
   docker:
diff --git a/riocli/hwil/create.py b/riocli/hwil/create.py
index ab369862..90f06922 100644
--- a/riocli/hwil/create.py
+++ b/riocli/hwil/create.py
@@ -46,7 +46,7 @@
     "--codename",
     "codename",
     help="Code name of the OS",
-    type=click.Choice(["bionic", "focal", "jammy", "bullseye"]),
+    type=click.Choice(["bionic", "focal", "jammy", "noble", "bullseye"]),
     default="focal",
 )
 @click.argument("device-name", type=str)
diff --git a/riocli/hwilclient/client.py b/riocli/hwilclient/client.py
index eba5982e..f4806ff4 100644
--- a/riocli/hwilclient/client.py
+++ b/riocli/hwilclient/client.py
@@ -63,14 +63,15 @@ class Client(object):
     ARCH_OS_DICT = {
         "amd64": {
             "ubuntu": {
-                "bionic": "ubuntu-bionic-ros-melodic-py3",
-                "focal": "ubuntu-focal-ros-noetic-py3",
-                "jammy": "ubuntu-jammy-plain-py3",
+                "bionic": "bionic",
+                "focal": "focal",
+                "jammy": "jammy",
+                "noble": "noble",
             }
         },
         "arm64": {
-            "ubuntu": {"focal": "ubuntu-focal-ros-noetic-py3"},
-            "debian": {"bullseye": "debian-bullseye-docker"},
+            "ubuntu": {"focal": "focal"},
+            "debian": {"bullseye": "bullseye"},
         },
     }