diff --git a/etc/openstack_deploy/conf.d/ceph.yml.aio b/etc/openstack_deploy/conf.d/ceph.yml.aio
index 8695b4d0dc..5cca162139 100644
--- a/etc/openstack_deploy/conf.d/ceph.yml.aio
+++ b/etc/openstack_deploy/conf.d/ceph.yml.aio
@@ -8,11 +8,14 @@ ceph-osd_hosts:
   aio1:
     ip: 172.29.236.100
 
+{% if 'manila' not in bootstrap_host_scenarios_expanded %}
 # The nodes that the Ceph RadosGW object gateways will be running on
 ceph-rgw_hosts:
   aio1:
     ip: 172.29.236.100
+{% endif %}
 
+{% if 'manila' in bootstrap_host_scenarios_expanded %}
 ceph-mds_hosts:
   aio1:
     ip: 172.29.236.100
@@ -20,3 +23,4 @@ ceph-mds_hosts:
 ceph-nfs_hosts:
   aio1:
     ip: 172.29.236.100
+{% endif %}
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 2b346e71c0..caeeb66c7d 100644
--- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
@@ -79,6 +79,7 @@ placement_wsgi_buffer_size: 16384
 manila_wsgi_processes_max: 2
 manila_wsgi_processes: 2
 manila_wsgi_threads: 1
+manila_osapi_share_workers: 2
 manila_wsgi_buffer_size: 65535
 
 ## Nova
diff --git a/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2
index 8a3c2611ff..13440593a8 100644
--- a/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2
@@ -28,8 +28,8 @@ tempest_flavors:
     vcpus: 1
   - name: manila-service-flavor
     id: 100
-    ram: 256
-    disk: 3
+    ram: 320
+    disk: 5
     vcpus: 1
 
 tempest_test_includelist:
@@ -63,6 +63,8 @@ tempest_images:
     format: "qcow2"
     name: "manila-service-image"
 
+nova_console_type: disabled
+
 manila_backends:
   cephfsnfs1:
     cephfs_auth_id: manila