diff --git a/kvm-install-vm b/kvm-install-vm
index 2504b89..d00366b 100755
--- a/kvm-install-vm
+++ b/kvm-install-vm
@@ -89,6 +89,7 @@ function usage_subcommand ()
             printf "    ubuntu1804      Ubuntu 18.04 LTS (Bionic Beaver)    ubuntu\n"
             printf "    ubuntu2004      Ubuntu 20.04 LTS (Focal Fossa)      ubuntu\n"
             printf "    ubuntu2204      Ubuntu 22.04 LTS (Jammy Jellyfish)  ubuntu\n"
+            printf "    ubuntu2404      Ubuntu 24.04 LTS (Noble Numbat)     ubuntu\n"
             printf "    rocky8.5         Rocky Linux                         rocky\n"
 	    printf "\n"
             printf "EXAMPLES\n"
@@ -448,6 +449,14 @@ function fetch_images ()
             DISK_FORMAT=qcow2
             LOGIN_USER=ubuntu
             ;;
+        ubuntu2404)
+            QCOW=ubuntu-24.04-server-cloudimg-amd64.img
+            OS_TYPE="linux"
+            OS_VARIANT="ubuntu24.04"
+            IMAGE_URL=https://cloud-images.ubuntu.com/releases/24.04/release
+            DISK_FORMAT=qcow2
+            LOGIN_USER=ubuntu
+            ;;
         opensuse15)
             QCOW=openSUSE-Leap-15.2-OpenStack.x86_64.qcow2
             OS_TYPE="linux"
diff --git a/tests/check_distributions.bats b/tests/check_distributions.bats
index fb6c68b..f77231e 100644
--- a/tests/check_distributions.bats
+++ b/tests/check_distributions.bats
@@ -120,6 +120,14 @@ function remove_test_vm ()
     remove_test_vm ubuntu2004
 }
 
+@test "Install VM (Ubuntu 24.04) - $VMNAME-ubuntu2404" {
+    create_test_vm ubuntu2404
+}
+
+@test "Delete VM (Ubuntu 24.04) - $VMNAME-ubuntu2404" {
+    remove_test_vm ubuntu2404
+}
+
 @test "Install VM (Debian 9) - $VMNAME-debian9" {
     create_test_vm debian9
 }