diff --git a/etc/openstack_deploy/conf.d/cinder.yml.aio b/etc/openstack_deploy/conf.d/cinder.yml.aio
index da2ce9a89f..68f38bc702 100644
--- a/etc/openstack_deploy/conf.d/cinder.yml.aio
+++ b/etc/openstack_deploy/conf.d/cinder.yml.aio
@@ -29,16 +29,3 @@ storage-infra_hosts:
 storage_hosts:
   aio1:
     ip: 172.29.236.100
-    container_vars:
-      cinder_backends:
-        limit_container_types: cinder_volume
-        lvm:
-          volume_group: cinder-volumes
-          volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver
-          volume_backend_name: LVM_iSCSI
-          iscsi_ip_address: "172.29.236.100"
-          lvm_type: "thin"
-          extra_volume_types:
-            - low-iops
-            - high-iops
-            - ultra-high-iops
diff --git a/tests/roles/bootstrap-host/tasks/prepare_ceph.yml b/tests/roles/bootstrap-host/tasks/prepare_ceph.yml
index 7f999bbf7a..2ccdb6c4c2 100644
--- a/tests/roles/bootstrap-host/tasks/prepare_ceph.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_ceph.yml
@@ -91,15 +91,20 @@
           data: lv-{{ d | basename }}
       {% endfor %}
       cinder_backends:
-        "rbd_volumes":
+        aio_ceph:
           volume_driver: cinder.volume.drivers.rbd.RBDDriver
           rbd_pool: volumes
           rbd_ceph_conf: /etc/ceph/ceph.conf
           rbd_store_chunk_size: 8
+          rbd_exclusive_cinder_pool: true
           volume_backend_name: rbddriver
-          rbd_user: cinder
+          rbd_user: "{% raw %}{{ cinder_ceph_client }}{% endraw %}"
           rbd_secret_uuid: "{% raw %}{{ cinder_ceph_client_uuid }}{% endraw %}"
           report_discard_supported: true
+          extra_volume_types:
+            - low-iops
+            - high-iops
+            - ultra-high-iops
     dest: /etc/openstack_deploy/user_ceph_aio.yml
     force: no
   become: false
diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
index 9278c9b366..535c0b2fe9 100644
--- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
@@ -287,3 +287,16 @@ deployment_environment_variables:
 lxc_container_networks: {}
 {% endif %}
 
+{% if 'ceph' not in bootstrap_host_scenarios_expanded %}
+cinder_backends:
+  lvm:
+    volume_group: cinder-volumes
+    volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver
+    volume_backend_name: LVM_iSCSI
+    iscsi_ip_address: "172.29.236.100"
+    lvm_type: "thin"
+    extra_volume_types:
+      - low-iops
+      - high-iops
+      - ultra-high-iops
+{% endif %}
diff --git a/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2
index 5d5d514501..2cbfdd1fb6 100644
--- a/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2
@@ -24,12 +24,11 @@ ceph_conf_overrides_custom:
   global:
     mon_max_pg_per_osd: 500
 openstack_config: true # Ceph ansible automatically creates pools & keys
-cinder_ceph_client: cinder
-cinder_default_volume_type: rbd_volumes
+cinder_default_volume_type: aio_ceph
 glance_ceph_client: glance
 glance_default_store: rbd
 glance_rbd_store_pool: images
 nova_libvirt_images_rbd_pool: vms
 # NOTE(noonedeadpunk): ceph bug to track the issue https://tracker.ceph.com/issues/46295
-tempest_test_excludelist:
-    - tempest.scenario.test_object_storage_basic_ops.TestObjectStorageBasicOps.test_swift_acl_anonymous_download
+tempest_test_includelist:
+    - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern