diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/openstack-compute.yml.src b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/openstack-compute.yml.src
new file mode 100644
index 0000000..aa19b19
--- /dev/null
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/openstack-compute.yml.src
@@ -0,0 +1,9 @@
+parameters:
+  cinder:
+    volume:
+      default_volume_type: lvm-driver
+      backend:
+        lvm-driver:
+          engine: lvm
+          type_name: lvm-driver
+          volume_group: cinder-vg
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 48ee357..adac9b5 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -261,6 +261,30 @@
               mode: UNCONFIGURED
               mac: "0c:c4:7a:1e:41:89"
               name: ten2
+          disk_layout:
+            type: custom
+            bootable_device: sda
+            disk:
+              sda:
+                type: physical
+              vgroot:
+                type: lvm
+                devices:
+                  - sda
+                volume:
+                  lvroot:
+                    size: 800G
+                    type: ext4
+                    mount: '/'
+              sdb:
+                type: physical
+              cinder-vg:
+                type: lvm
+                devices:
+                  - sdb
+                volume:
+                  cinder-volumes-pool:
+                    size: 800G
           power_parameters:
             power_address: "5.43.227.11"
             power_pass: ==IPMI_PASS==
@@ -290,6 +314,30 @@
               mode: UNCONFIGURED
               mac: "0c:c4:7a:1d:92:c9"
               name: ten2
+          disk_layout:
+            type: custom
+            bootable_device: sda
+            disk:
+              sda:
+                type: physical
+              vgroot:
+                type: lvm
+                devices:
+                  - sda
+                volume:
+                  lvroot:
+                    type: ext4
+                    mount: '/'
+                    size: 800G
+              sdb:
+                type: physical
+              cinder-vg:
+                type: lvm
+                devices:
+                  - sdb
+                volume:
+                  cinder-volumes-pool:
+                    size: 800G
           power_parameters:
             power_address: "5.43.227.19"
             power_pass: ==IPMI_PASS==
diff --git a/tcp_tests/templates/cookied-model-generator/salt_bm-e7-cicd-pike-ovs-maas.yaml b/tcp_tests/templates/cookied-model-generator/salt_bm-e7-cicd-pike-ovs-maas.yaml
index c0a4377..4cefd30 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_bm-e7-cicd-pike-ovs-maas.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_bm-e7-cicd-pike-ovs-maas.yaml
@@ -60,3 +60,20 @@
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
+
+- description: "Setting workarounds for non-ceph deployments"
+  cmd: |
+    set -e;
+    set -x;
+    . /root/venv-reclass-tools/bin/activate;
+    reclass-tools add-key --merge classes system.cinder.volume.single /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/compute/init.yml
+    reclass-tools add-key --merge classes system.cinder.volume.notification.messagingv2 /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/compute/init.yml
+    reclass-tools add-key parameters.cinder.volume.default_volume_type lvm-driver /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/compute/init.yml
+    reclass-tools add-key parameters.cinder.volume.backend.lvm-driver.engine lvm /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/compute/init.yml
+    reclass-tools add-key parameters.cinder.volume.backend.lvm-driver.type_name lvm-driver /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/compute/init.yml
+    reclass-tools add-key parameters.cinder.volume.backend.lvm-driver.volume_group cinder-vg /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/compute/init.yml
+    sed -i '/system.cinder.volume.single/d' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control.yml
+    sed -i '/system.cinder.volume.notification.messagingv2/d' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/control.yml
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false