diff --git a/config.yml b/config.yml
index a7bc5e6e6c95b8a36c60a8fbcb410da5ea39123e..1ba9fa1d190d1f69e25ae2b45d586f3475475aaf 100644
--- a/config.yml
+++ b/config.yml
@@ -1,13 +1,13 @@
 images:
-  almaLinux:
-    name: AlmaLinux 8 - GARR
-    url: https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-latest.x86_64.qcow2
+  centos8stream:
+    name: CentOS Stream 8 - GARR
+    url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220125.1.x86_64.qcow2
     disk_format: qcow2
     extraargs:
     - "min_disk=5"
     - "min_ram=1024"
     tags:
-    - "os_distro=almalinux"
+    - "os_distro=centos"
     - "os_type=linux"
     - "os_version=8"
     - "architecture=amd64"
@@ -16,9 +16,9 @@ images:
     - "hw_vif_multiqueue_enabled=true"
     - "hw_rng_model=virtio"
 
-  centos8stream:
-    name: CentOS Stream 8 - GARR
-    url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220125.1.x86_64.qcow2
+  centos9stream:
+    name: CentOS Stream 9 - GARR
+    url: https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20210830.0.x86_64.qcow2
     disk_format: qcow2
     extraargs:
     - "min_disk=5"
@@ -26,14 +26,14 @@ images:
     tags:
     - "os_distro=centos"
     - "os_type=linux"
-    - "os_version=8"
+    - "os_version=9"
     - "architecture=amd64"
     - "os_require_quiesce=yes"
     - "hw_qemu_guest_agent=yes"
     - "hw_vif_multiqueue_enabled=true"
     - "hw_rng_model=virtio"
-    
-  rockylinux:
+
+  rockylinux8:
     name: RockyLinux-8 - GARR
     url: https://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
     disk_format: qcow2
@@ -50,15 +50,15 @@ images:
     - "hw_vif_multiqueue_enabled=true"
     - "hw_rng_model=virtio"
 
-  debian9:
-    name: Debian 9 - GARR
-    url: https://cdimage.debian.org/cdimage/openstack/current-9/debian-9-openstack-amd64.qcow2
+  rockylinux9:
+    name: RockyLinux-9 - GARR
+    url: https://download.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
     disk_format: qcow2
     extraargs:
     - "min_disk=5"
     - "min_ram=1024"
     tags:
-    - "os_distro=debian"
+    - "os_distro=rockylinux"
     - "os_type=linux"
     - "os_version=9"
     - "architecture=amd64"
@@ -101,9 +101,9 @@ images:
     - "hw_vif_multiqueue_enabled=true"
     - "hw_rng_model=virtio"
 
-  fedora34:
-    name: Fedora 34 - GARR
-    url: http://fedora.mirror.garr.it/fedora/linux/releases/34/Cloud/x86_64/images/Fedora-Cloud-Base-34-1.2.x86_64.qcow2
+  fedora36:
+    name: Fedora 36 - GARR
+    url: http://fedora.mirror.garr.it/fedora/linux/releases/36/Cloud/aarch64/images/Fedora-Cloud-Base-36-1.5.aarch64.qcow2
     disk_format: qcow2
     extraargs:
     - "min_disk=5"
@@ -111,16 +111,16 @@ images:
     tags:
     - "os_distro=fedora"
     - "os_type=linux"
-    - "os_version=34"
+    - "os_version=36"
     - "architecture=x86_64"
     - "os_require_quiesce=yes"
     - "hw_qemu_guest_agent=yes"
     - "hw_vif_multiqueue_enabled=true"
     - "hw_rng_model=virtio"
   
-  fedora35:
-    name: Fedora 35 - GARR
-    url: https://fedora.mirror.garr.it/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2
+  fedora37:
+    name: Fedora 37 - GARR
+    url: http://fedora.mirror.garr.it/fedora/linux/releases/37/Cloud/aarch64/images/Fedora-Cloud-Base-37-1.7.aarch64.qcow2
     disk_format: qcow2
     extraargs:
     - "min_disk=5"
@@ -128,45 +128,13 @@ images:
     tags:
     - "os_distro=fedora"
     - "os_type=linux"
-    - "os_version=35"
+    - "os_version=37"
     - "architecture=x86_64"
     - "os_require_quiesce=yes"
     - "hw_qemu_guest_agent=yes"
     - "hw_vif_multiqueue_enabled=true"
     - "hw_rng_model=virtio"
 
-  centos7:
-    name: CentOS 7 - GARR
-    url: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2
-    disk_format: qcow2
-    extraargs:
-    - "min_disk=5"
-    - "min_ram=1024"
-    tags:
-    - "os_distro=centos"
-    - "os_type=linux"
-    - "os_version=7.X"
-    - "architecture=x86_64"
-    - "os_require_quiesce=yes"
-    - "hw_qemu_guest_agent=yes"
-    - "hw_vif_multiqueue_enabled=true"
-  
-  centos8:
-    name: CentOS 8 - GARR
-    url: https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2
-    disk_format: qcow2
-    extraargs:
-    - "min_disk=5"
-    - "min_ram=1024"
-    tags:
-    - "os_distro=centos"
-    - "os_type=linux"
-    - "os_version=8.X"
-    - "architecture=x86_64"
-    - "os_require_quiesce=yes"
-    - "hw_qemu_guest_agent=yes"
-    - "hw_vif_multiqueue_enabled=true"
-
   ubuntu-18.04:
     name: Ubuntu 18.04 - GARR
     url: http://cloud-images.ubuntu.com/releases/18.04/release/ubuntu-18.04-server-cloudimg-amd64.img