diff --git a/config.yml b/config.yml
index ba58ef25030e6e971666e241356d35e6c68c0225..3c2377174233ffb9ce3c5f4935193f5bfede64cc 100644
--- a/config.yml
+++ b/config.yml
@@ -28,7 +28,8 @@ images:
     - "os_require_quiesce=yes"
     - "hw_qemu_guest_agent=yes"
     - "hw_vif_multiqueue_enabled=true"
-  fedora28q:
+    - "hw_rng_model=virtio"
+  fedora28:
     name: Fedora 28 - GARR
     url: https://download.fedoraproject.org/pub/fedora/linux/releases/28/Cloud/x86_64/images/Fedora-Cloud-Base-28-1.1.x86_64.qcow2
     disk_format: qcow2
@@ -43,6 +44,7 @@ images:
     - "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
@@ -101,3 +103,20 @@ images:
     - "os_require_quiesce=yes"
     - "hw_qemu_guest_agent=yes"
     - "hw_vif_multiqueue_enabled=true"
+    - "hw_rng_model=virtio"
+  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
+    disk_format: qcow2
+    extraargs:
+    - "min_disk=5"
+    - "min_ram=1024"
+    tags:
+    - "os_distro=ubuntu"
+    - "os_type=linux"
+    - "os_version=18.04"
+    - "architecture=amd64"
+    - "os_require_quiesce=yes"
+    - "hw_qemu_guest_agent=yes"
+    - "hw_vif_multiqueue_enabled=true"
+    - "hw_rng_model=virtio"