diff --git a/autoscale/readme.txt b/autoscale/readme.txt
index c7c2782..28a189f 100644
--- a/autoscale/readme.txt
+++ b/autoscale/readme.txt
@@ -2,7 +2,7 @@
 
 Network and image must be created prior to run this template
     network: cvp.net.1
-    image: cvp.ubuntu.1604
+    image: cvp.ubuntu.2204
 
 To auto create them, run cvp resource creation script from ../scripts
 Path is relative to this folder: <repo>/autoscale
diff --git a/autoscale/server.yaml b/autoscale/server.yaml
index 1c5aa96..2442c9b 100644
--- a/autoscale/server.yaml
+++ b/autoscale/server.yaml
@@ -25,5 +25,5 @@
   volume:
     type: OS::Cinder::Volume
     properties:
-      image: 'cvp.ubuntu.1604'
+      image: 'cvp.ubuntu.2204'
       size: 20
diff --git a/k8s/docker-mos-toolset-full b/k8s/docker-mos-toolset-full
index b29659d..e04f58b 100644
--- a/k8s/docker-mos-toolset-full
+++ b/k8s/docker-mos-toolset-full
@@ -35,7 +35,7 @@
 
 RUN pip3 install --no-cache-dir pyghmi tempestparser
 
-RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration -b 24.3-antelope /opt/res-files && \
+RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration -b 25.1-caracal /opt/res-files && \
     cd /opt/cfg-checker && \
     python3 -m venv .checkervenv && \
     . .checkervenv/bin/activate && \
@@ -76,7 +76,7 @@
     cp /opt/res-files/scripts/prepare-refapp.sh /opt/density/openstack-refapp/ && \
     cp /opt/res-files/scripts/run-refapp-density.sh /opt/density/openstack-refapp/
 
-RUN printf "LABELS:\n  IMAGE_TAG: 24.3-antelope" > /dockerimage_metadata
+RUN printf "LABELS:\n  IMAGE_TAG: 25.1-caracal" > /dockerimage_metadata
 
 ENTRYPOINT ["sleep infinite"]
 
diff --git a/k8s/src/mos-checker.tgz b/k8s/src/mos-checker.tgz
index a87b8b6..ed4cd36 100644
--- a/k8s/src/mos-checker.tgz
+++ b/k8s/src/mos-checker.tgz
Binary files differ
diff --git a/k8s/src/mos-spt.tgz b/k8s/src/mos-spt.tgz
index facc942..c5a5f7a 100644
--- a/k8s/src/mos-spt.tgz
+++ b/k8s/src/mos-spt.tgz
Binary files differ
diff --git a/k8s/src/si-tests.tgz b/k8s/src/si-tests.tgz
index ece0c4e..b82be0c 100644
--- a/k8s/src/si-tests.tgz
+++ b/k8s/src/si-tests.tgz
Binary files differ
diff --git a/k8s/yamls/qa-toolset-bare.yaml b/k8s/yamls/qa-toolset-bare.yaml
index 3fe1826..c46cd31 100644
--- a/k8s/yamls/qa-toolset-bare.yaml
+++ b/k8s/yamls/qa-toolset-bare.yaml
@@ -10,7 +10,7 @@
     - infinity
     imagePullPolicy: IfNotPresent
     name: toolset
-    image: registry.mirantis.com/professional-services-qa/toolset:24.3-antelope
+    image: registry.mirantis.com/professional-services-qa/toolset:25.1-caracal
   dnsPolicy: ClusterFirst
   volumes:
   - emptyDir: {}
diff --git a/k8s/yamls/qa-toolset.yaml b/k8s/yamls/qa-toolset.yaml
index 4d7999d..c49385d 100644
--- a/k8s/yamls/qa-toolset.yaml
+++ b/k8s/yamls/qa-toolset.yaml
@@ -67,7 +67,7 @@
       value: /etc/ssl/certs/openstack-ca-bundle.pem
     imagePullPolicy: IfNotPresent
     name: toolset
-    image: registry.mirantis.com/professional-services-qa/toolset:24.3-antelope
+    image: registry.mirantis.com/professional-services-qa/toolset:25.1-caracal
     volumeMounts:
     - mountPath: /artifacts
       name: qa-pv-a
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