diff --git a/Makefile b/Makefile
index de744c1..a05fa02 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,10 @@ enable-debian-12:
 enable-ubuntu-2204:
 	touch flags/ubuntu-2204
 
-enable-all: enable-alma-8 enable-alma-9 enable-debian-12 enable-ubuntu-2204
+enable-ubuntu-2404:
+	touch flags/ubuntu-2404
+
+enable-all: enable-alma-8 enable-alma-9 enable-debian-12 enable-ubuntu-2204 enable-ubuntu-2404
 
 cleanup-flags:
 	rm -fv flags/*
@@ -35,5 +38,8 @@ destroy-alma-9:
 destroy-ubuntu2204:
 	qm destroy 9003
 
-destroy-all: destroy-debian-12 destroy-alma-8 destroy-alma-9 destroy-ubuntu2204
+destroy-ubuntu2404:
+	qm destroy 9005
+
+destroy-all: destroy-debian-12 destroy-alma-8 destroy-alma-9 destroy-ubuntu2204 destroy-ubuntu2404
 
diff --git a/create-proxmox-cloudinit-images.sh b/create-proxmox-cloudinit-images.sh
index 45b4089..1008e71 100755
--- a/create-proxmox-cloudinit-images.sh
+++ b/create-proxmox-cloudinit-images.sh
@@ -51,7 +51,7 @@ function createImage() {
     qm create ${IMAGE_ID} --name "${IMAGE_NAME}" --memory ${IMAGE_RAM} --cores ${IMAGE_CORES} \
 	--net0 virtio,bridge=vmbr0
     qm importdisk ${IMAGE_ID} ${IMAGE_FILE} ${IMAGE_STORE} --format qcow2
-    qm set ${IMAGE_ID} --cpu cputype=x86-64-v2
+    qm set ${IMAGE_ID} --cpu cputype=x86-64-v2-AES
     qm set ${IMAGE_ID} --scsihw virtio-scsi-pci --scsi0 ${IMAGE_STORE}:vm-${IMAGE_ID}-disk-0
 #    qm resize ${IMAGE_ID} virtio0 +15G
     qm set ${IMAGE_ID} --boot c --bootdisk scsi0
@@ -199,3 +199,26 @@ createImage "${UBUNTU_2204_IMAGE_URL}" "${UBUNTU_2204_TEMPLATE_ID}" \
         "${UBUNTU_2204_TEMPLATE_RAM}" "${UBUNTU_2204_TEMPLATE_CORES}" "${UBUNTU_2204_TEMPLATE_STORE}" "alma"
 fi
 
+
+## Ubuntu 24.04
+UBUNTU_2404_IMAGE_URL="https://cloud-images.ubuntu.com/releases/24.04/release/ubuntu-24.04-server-cloudimg-amd64.img"
+UBUNTU_2404_LOCAL_IMAGE_URL="https://www.ngtech.co.il/static/cloud-images/ubuntu-24.04-server-cloudimg-amd64.img"
+UBUNTU_2404_TEMPLATE_ID="9004"
+UBUNTU_2404_IMAGE_FILENAME="ubuntu-2404.qcow2"
+UBUNTU_2404_TEMPLATE_NAME="ubuntu-2404-cloudinit-template"
+UBUNTU_2404_TEMPLATE_RAM="2048"
+UBUNTU_2404_TEMPLATE_CORES="2"
+UBUNTU_2404_TEMPLATE_STORE="${LOCAL_STORE}"
+
+if [ "${USE_LOCAL_IMAGES}" -eq "1" ]
+then
+    UBUNTU_2404_IMAGE_URL="${UBUNTU_2404_LOCAL_IMAGE_URL}"
+fi
+
+if [ -f "flags/ubuntu-2404" ]
+then
+createImage "${UBUNTU_2404_IMAGE_URL}" "${UBUNTU_2404_TEMPLATE_ID}" \
+        "${UBUNTU_2404_IMAGE_FILENAME}" "${UBUNTU_2404_TEMPLATE_NAME}" \
+        "${UBUNTU_2404_TEMPLATE_RAM}" "${UBUNTU_2404_TEMPLATE_CORES}" "${UBUNTU_2404_TEMPLATE_STORE}" "alma"
+fi
+