diff --git a/ci/roles/image/tasks/main.yml b/ci/roles/image/tasks/main.yml
index 419bab9c..886d495c 100644
--- a/ci/roles/image/tasks/main.yml
+++ b/ci/roles/image/tasks/main.yml
@@ -318,6 +318,15 @@
          name: ansible_project
          domain: default
 
+    - name: Delete mock kernel and ramdisk images
+      openstack.cloud.image:
+         cloud: "{{ cloud }}"
+         state: absent
+         name: "{{ item }}"
+      loop:
+        - cirros-vmlinuz
+        - cirros-initrd
+
     - name: Delete test image file
       file:
          name: "{{ tmp_file.path }}"
diff --git a/ci/roles/server_volume/tasks/main.yml b/ci/roles/server_volume/tasks/main.yml
index 742dafc7..fcec3237 100644
--- a/ci/roles/server_volume/tasks/main.yml
+++ b/ci/roles/server_volume/tasks/main.yml
@@ -1,9 +1,21 @@
+---
+- name: List all images
+  openstack.cloud.image_info:
+    cloud: "{{ cloud }}"
+  register: images
+
+- name: Identify CirrOS image name
+  set_fact:
+    image_name: "{{ images.images|community.general.json_query(query)|first }}"
+  vars:
+    query: "[?starts_with(name, 'cirros')].name"
+
 - name: Create server
   openstack.cloud.server:
     cloud: "{{ cloud }}"
     state: present
     name: "{{ server_name }}"
-    image: "cirros-0.5.2-x86_64-disk"
+    image: "{{ image_name }}"
     flavor: "{{ flavor_name }}"
     network: "{{ server_network }}"
     auto_ip: false