diff --git a/scripts/manual_create_signed_images.sh b/scripts/manual_create_signed_images.sh
index 55e4ace..ddd3f6d 100644
--- a/scripts/manual_create_signed_images.sh
+++ b/scripts/manual_create_signed_images.sh
@@ -15,33 +15,33 @@
 ​
 echo "Converting images to Raw"
 qemu-img convert -f qcow2 -O raw -p cvp.ubuntu.2004 /var/tmp/cvp.ubuntu.2004.raw
-qemu-img convert -f qcow2 -O raw -p cvp.ubuntu.1604 /var/tmp/cvp.ubuntu.1604.raw
+qemu-img convert -f qcow2 -O raw -p cvp.ubuntu.2204 /var/tmp/cvp.ubuntu.2204.raw
 qemu-img convert -f qcow2 -O raw -p cvp.cirros.61 /var/tmp/cvp.cirros.61.raw
 qemu-img convert -f qcow2 -O raw -p cvp.cirros.62 /var/tmp/cvp.cirros.62.raw
 ​
 echo "Signing images"
 openssl dgst -sha256 -sign image_key.pem -sigopt rsa_padding_mode:pss -out cvp.cirros.61.raw.signature /var/tmp/cvp.cirros.61.raw
 openssl dgst -sha256 -sign image_key.pem -sigopt rsa_padding_mode:pss -out cvp.cirros.62.raw.signature /var/tmp/cvp.cirros.62.raw
-openssl dgst -sha256 -sign image_key.pem -sigopt rsa_padding_mode:pss -out cvp.ubuntu.1604.raw.signature /var/tmp/cvp.ubuntu.1604.raw
+openssl dgst -sha256 -sign image_key.pem -sigopt rsa_padding_mode:pss -out cvp.ubuntu.2204.raw.signature /var/tmp/cvp.ubuntu.2204.raw
 openssl dgst -sha256 -sign image_key.pem -sigopt rsa_padding_mode:pss -out cvp.ubuntu.2004.raw.signature /var/tmp/cvp.ubuntu.2004.raw
 
 echo "Generating base64 equivalents"
 base64 -w 0 cvp.cirros.61.raw.signature >cvp.cirros.61.raw.signature.b64
 base64 -w 0 cvp.cirros.62.raw.signature >cvp.cirros.62.raw.signature.b64
-base64 -w 0 cvp.ubuntu.1604.raw.signature >cvp.ubuntu.1604.raw.signature.b64
+base64 -w 0 cvp.ubuntu.2204.raw.signature >cvp.ubuntu.2204.raw.signature.b64
 base64 -w 0 cvp.ubuntu.2004.raw.signature >cvp.ubuntu.2004.raw.signature.b64
 
 echo "Exporting vars"
 export cirros61_sign=$(cat cvp.cirros.61.raw.signature.b64)
 export cirros62_sign=$(cat cvp.cirros.62.raw.signature.b64)
-export ubuntu1604_sign=$(cat cvp.ubuntu.1604.raw.signature.b64)
+export ubuntu2204_sign=$(cat cvp.ubuntu.2204.raw.signature.b64)
 export ubuntu2004_sign=$(cat cvp.ubuntu.2004.raw.signature.b64)
 ​
 echo "Uploading 'cvp.cirros.61.raw.signed''"
 glance image-create --name cvp.cirros.61.raw.signed --container-format bare --disk-format raw --property img_signature="$cirros61_sign" --property img_signature_certificate_uuid="$s_uuid" --property img_signature_hash_method='SHA-256' --property img_signature_key_type='RSA-PSS' < /var/tmp/cvp.cirros.61.raw
 echo "Uploading 'cvp.cirros.62.raw.signed''"
 glance image-create --name cvp.cirros.62.raw.signed --container-format bare --disk-format raw --property img_signature="$cirros62_sign" --property img_signature_certificate_uuid="$s_uuid" --property img_signature_hash_method='SHA-256' --property img_signature_key_type='RSA-PSS' < /var/tmp/cvp.cirros.62.raw
-echo "Uploading 'cvp.ubuntu.1604.raw.signed''"
-glance image-create --name cvp.ubuntu.1604.raw.signed --container-format bare --disk-format raw --property img_signature="$ubuntu1604_sign" --property img_signature_certificate_uuid="$s_uuid" --property img_signature_hash_method='SHA-256' --property img_signature_key_type='RSA-PSS' < /var/tmp/cvp.ubuntu.1604.raw
+echo "Uploading 'cvp.ubuntu.2204.raw.signed''"
+glance image-create --name cvp.ubuntu.2204.raw.signed --container-format bare --disk-format raw --property img_signature="$ubuntu2204_sign" --property img_signature_certificate_uuid="$s_uuid" --property img_signature_hash_method='SHA-256' --property img_signature_key_type='RSA-PSS' < /var/tmp/cvp.ubuntu.2204.raw
 echo "Uploading 'cvp.ubuntu.2004.raw.signed''"
 glance image-create --name cvp.ubuntu.2004.raw.signed --container-format bare --disk-format raw --property img_signature="$ubuntu2004_sign" --property img_signature_certificate_uuid="$s_uuid" --property img_signature_hash_method='SHA-256' --property img_signature_key_type='RSA-PSS' < /var/tmp/cvp.ubuntu.2004.raw
diff --git a/scripts/prepare.sh b/scripts/prepare.sh
index 226f0c3..0170630 100644
--- a/scripts/prepare.sh
+++ b/scripts/prepare.sh
@@ -48,16 +48,16 @@
 # Router
 router=${name_prefix}.router
 
-# Images: cirros (6.0, 6.2), ubuntu (16.04, 20.04)
+# Images: cirros (6.1, 6.2), ubuntu (20.04, 22.04)
 cirros61=${name_prefix}.cirros.61
 cirros62=${name_prefix}.cirros.62
-ubuntu16=${name_prefix}.ubuntu.1604
 ubuntu20=${name_prefix}.ubuntu.2004
+ubuntu22=${name_prefix}.ubuntu.2204
 
 cirros61_link=https://download.cirros-cloud.net/0.6.1/cirros-0.6.1-x86_64-disk.img
 cirros62_link=https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img
-ubuntu16_link=https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
 ubuntu20_link=https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
+ubuntu22_link=https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
 
 # Volume (2GB)
 volume=${name_prefix}.volume
@@ -167,10 +167,10 @@
     put cirros61_id $(ol1 image ${cirros61})
     put cirros62_name ${cirros62}
     put cirros62_id $(ol1 image ${cirros62})
-    put ubuntu16_name ${ubuntu16}
-    put ubuntu16_id $(ol1 image ${ubuntu16})
     put ubuntu20_name ${ubuntu20}
     put ubuntu20_id $(ol1 image ${ubuntu20})
+    put ubuntu22_name ${ubuntu22}
+    put ubuntu22_id $(ol1 image ${ubuntu22})
 }
 
 # create rc file out of current ENV vars
@@ -455,8 +455,8 @@
 # images
 create_image cirros61
 create_image cirros62
-create_image ubuntu16
 create_image ubuntu20
+create_image ubuntu22
 
 ### Manifest and fall back to original rc
 print_manifest