diff --git a/scripts/cmp_check.sh b/scripts/cmp_check.sh
index 53df0dd..af85717 100644
--- a/scripts/cmp_check.sh
+++ b/scripts/cmp_check.sh
@@ -125,7 +125,7 @@
 
 function vm_create() {
    [ ! "$silent" = true ] && set -x
-   openstack server create --nic net-id=${fixed_net_left_id} --image ${cirros51_id} --flavor ${flavor_tiny_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
+   openstack server create --nic net-id=${fixed_net_left_id} --image ${cirros61_id} --flavor ${flavor_tiny_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
    #openstack server create --nic net-id=${fixed_net_left_id} --image ${ubuntu16_id} --flavor ${flavor_high_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
    #openstack server create --nic net-id=${fixed_net_right_id} --image ${ubuntu16_id} --flavor ${flavor_high_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
    #openstack server create --nic net-id=${fixed_net_left_id} --image ${ubuntu20_id} --flavor ${flavor_high_id} --key-name ${keypair_id} --security-group ${secgroup_all_id} --availability-zone ${zone}:${1} ${2} 2>${tmp_out} >/dev/null
diff --git a/scripts/manual_create_signed_images.sh b/scripts/manual_create_signed_images.sh
index ee596b5..269c977 100644
--- a/scripts/manual_create_signed_images.sh
+++ b/scripts/manual_create_signed_images.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "Preparing certs"
 openssl genrsa -out image_key.pem 1024
 openssl rsa -pubout -in image_key.pem -out image_key.pem.pub
@@ -16,31 +15,29 @@
 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.cirros.51 /var/tmp/cvp.cirros.51.raw
-qemu-img convert -f qcow2 -O raw -p cvp.cirros.52 /var/tmp/cvp.cirros.52.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.51.raw.signature /var/tmp/cvp.cirros.51.raw
-openssl dgst -sha256 -sign image_key.pem -sigopt rsa_padding_mode:pss -out cvp.cirros.52.raw.signature /var/tmp/cvp.cirros.52.raw
+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.2004.raw.signature /var/tmp/cvp.ubuntu.2004.raw
-
 echo "Generating base64 equivalents"
-base64 -w 0 cvp.cirros.51.raw.signature >cvp.cirros.51.raw.signature.b64
-base64 -w 0 cvp.cirros.52.raw.signature >cvp.cirros.52.raw.signature.b64
+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.2004.raw.signature >cvp.ubuntu.2004.raw.signature.b64
-
 echo "Exporting vars"
-export cirros51_sign=$(cat cvp.cirros.51.raw.signature.b64)
-export cirros52_sign=$(cat cvp.cirros.52.raw.signature.b64)
+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 ubuntu2004_sign=$(cat cvp.ubuntu.2004.raw.signature.b64)
 ​
-echo "Uploading 'cvp.cirros.51.raw.signed''"
-glance image-create --name cvp.cirros.51.raw.signed --container-format bare --disk-format raw --property img_signature="$cirros51_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.51.raw
-echo "Uploading 'cvp.cirros.52.raw.signed''"
-glance image-create --name cvp.cirros.52.raw.signed --container-format bare --disk-format raw --property img_signature="$cirros52_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.52.raw
+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.2004.raw.signed''"
diff --git a/scripts/prepare.sh b/scripts/prepare.sh
index 2a34583..bc43263 100644
--- a/scripts/prepare.sh
+++ b/scripts/prepare.sh
@@ -38,16 +38,14 @@
 # Router
 router=${name_prefix}.router
 
-# Images: cirros (3.5, 4.0), ubuntu (16.04)
-cirros51=${name_prefix}.cirros.51
-cirros52=${name_prefix}.cirros.52
+# Images: cirros (6.0, 6.2), ubuntu (16.04, 20.04)
+cirros61=${name_prefix}.cirros.61
+cirros62=${name_prefix}.cirros.62
 ubuntu16=${name_prefix}.ubuntu.1604
 ubuntu20=${name_prefix}.ubuntu.2004
 
-#cirros3_link=http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
-#cirros4_link=http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-aarch64-disk.img
-cirros51_link=https://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img
-cirros52_link=https://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img
+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
 
@@ -147,10 +145,10 @@
     put volume_id $(ol1 volume ${volume})
 
     # images
-    put cirros51_name ${cirros51}
-    put cirros51_id $(ol1 image ${cirros51})
-    put cirros52_name ${cirros52}
-    put cirros52_id $(ol1 image ${cirros52})
+    put cirros61_name ${cirros61}
+    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}
@@ -403,8 +401,8 @@
 create_fixed_nets
 
 # images
-create_image cirros51
-create_image cirros52
+create_image cirros61
+create_image cirros62
 create_image ubuntu16
 create_image ubuntu20