diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
index a6a5d2d..bcb6b77 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
@@ -29,6 +29,7 @@
 - system.keystone.client.service.barbican
 - system.gnocchi.client
 - system.gnocchi.client.v1.archive_policy.default
+- system.manila.client
 - system.reclass.storage.system.openstack_dns_cluster
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
@@ -48,6 +49,12 @@
     single_address: 172.16.10.100
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
+    manila_share_type_default_extra_specs:
+      driver_handles_share_servers: False
+      snapshot_support: True
+      create_share_from_snapshot_support : True
+      mount_snapshot_support : True
+      revert_to_snapshot_support : True
   linux:
     network:
       interface:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/share.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/share.yml
index 13b4194..b613bb2 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/share.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/share.yml
@@ -22,3 +22,20 @@
         port: ${_param:rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
+    share:
+      enabled_share_backends:
+        lvm: # Explicitly redefine default 'lvm' element from reclass-system
+          name: lvm
+          type: lvm
+          enabled: true
+          dhss: false
+          share_driver: manila.share.drivers.lvm.LVMShareDriver
+        lvm1: # Second backend is needed only to test multibeckend scenario
+          name: lvm1
+          type: lvm
+          enabled: true
+          lvm_share_export_ips:
+            - "${_param:manila_share_address}"
+          dhss: false
+          share_driver: manila.share.drivers.lvm.LVMShareDriver
+          lvm_share_volume_group: manila-volume
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
index 34fd9b2..cba3b5c 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -26,6 +26,7 @@
 - system.keystone.client.service.gnocchi
 - system.gnocchi.client
 - system.gnocchi.client.v1.archive_policy.default
+- system.manila.client
 - system.reclass.storage.system.openstack_dns_cluster
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
@@ -45,6 +46,12 @@
     single_address: 172.16.10.100
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
+    manila_share_type_default_extra_specs:
+      driver_handles_share_servers: False
+      snapshot_support: True
+      create_share_from_snapshot_support : True
+      mount_snapshot_support : True
+      revert_to_snapshot_support : True
   linux:
     network:
       interface:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/share.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/share.yml
index 26a0a51..c76294d 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/share.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/share.yml
@@ -31,3 +31,20 @@
         port: ${_param:rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
+    share:
+      enabled_share_backends:
+        lvm: # Explicitly redefine default 'lvm' element from reclass-system
+          name: lvm
+          type: lvm
+          enabled: true
+          dhss: false
+          share_driver: manila.share.drivers.lvm.LVMShareDriver
+        lvm1: # Second backend is needed only to test multibeckend scenario
+          name: lvm1
+          type: lvm
+          enabled: true
+          lvm_share_export_ips:
+            - "${_param:manila_share_address}"
+          dhss: false
+          share_driver: manila.share.drivers.lvm.LVMShareDriver
+          lvm_share_volume_group: manila-volume
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index b400c32..4f54445 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -27,6 +27,7 @@
 - system.keystone.client.service.gnocchi
 - system.gnocchi.client
 - system.gnocchi.client.v1.archive_policy.default
+- system.manila.client
 - system.reclass.storage.system.openstack_dns_cluster
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
@@ -48,6 +49,12 @@
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
+    manila_share_type_default_extra_specs:
+      driver_handles_share_servers: False
+      snapshot_support: True
+      create_share_from_snapshot_support : True
+      mount_snapshot_support : True
+      revert_to_snapshot_support : True
   linux:
     network:
       interface:
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
index 8cef3ce..b8f8abe 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
@@ -22,3 +22,20 @@
   manila:
     common:
       default_share_type: default
+    share:
+      enabled_share_backends:
+        lvm: # Explicitly redefine default 'lvm' element from reclass-system
+          name: lvm
+          type: lvm
+          enabled: true
+          dhss: false
+          share_driver: manila.share.drivers.lvm.LVMShareDriver
+        lvm1: # Second backend is needed only to test multibeckend scenario
+          name: lvm1
+          type: lvm
+          enabled: true
+          lvm_share_export_ips:
+            - "${_param:manila_share_address}"
+          dhss: false
+          share_driver: manila.share.drivers.lvm.LVMShareDriver
+          lvm_share_volume_group: manila-volume
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
index 3152758..bd9f2ff 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
@@ -27,6 +27,7 @@
 - system.keystone.client.service.gnocchi
 - system.gnocchi.client
 - system.gnocchi.client.v1.archive_policy.default
+- system.manila.client
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
@@ -47,6 +48,12 @@
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+    manila_share_type_default_extra_specs:
+      driver_handles_share_servers: False
+      snapshot_support: True
+      create_share_from_snapshot_support : True
+      mount_snapshot_support : True
+      revert_to_snapshot_support : True
   linux:
     network:
       interface:
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml
index 2ced095..a2198ad 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml
@@ -22,3 +22,20 @@
   manila:
     common:
       default_share_type: default
+    share:
+      enabled_share_backends:
+        lvm: # Explicitly redefine default 'lvm' element from reclass-system
+          name: lvm
+          type: lvm
+          enabled: true
+          dhss: false
+          share_driver: manila.share.drivers.lvm.LVMShareDriver
+        lvm1: # Second backend is needed only to test multibeckend scenario
+          name: lvm1
+          type: lvm
+          enabled: true
+          lvm_share_export_ips:
+            - "${_param:manila_share_address}"
+          dhss: false
+          share_driver: manila.share.drivers.lvm.LVMShareDriver
+          lvm_share_volume_group: manila-volume
diff --git a/classes/cluster/virtual-offline-ssl/infra/config.yml b/classes/cluster/virtual-offline-ssl/infra/config.yml
index fe328c1..da9d6e3 100644
--- a/classes/cluster/virtual-offline-ssl/infra/config.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/config.yml
@@ -26,6 +26,7 @@
 - system.keystone.client.service.panko
 - system.keystone.client.service.gnocchi
 - system.keystone.client.service.barbican
+- system.manila.client
 - system.reclass.storage.system.openstack_dns_cluster
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
@@ -45,6 +46,12 @@
     single_address: 172.16.10.100
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
+    manila_share_type_default_extra_specs:
+      driver_handles_share_servers: False
+      snapshot_support: True
+      create_share_from_snapshot_support : True
+      mount_snapshot_support : True
+      revert_to_snapshot_support : True
   linux:
     network:
       interface:
diff --git a/classes/cluster/virtual-offline-ssl/openstack/share.yml b/classes/cluster/virtual-offline-ssl/openstack/share.yml
index 9a2d765..1d083f3 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/share.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/share.yml
@@ -17,4 +17,21 @@
     common:
       identity:
          protocol: https
-      default_share_type: default
\ No newline at end of file
+      default_share_type: default
+    share:
+      enabled_share_backends:
+        lvm: # Explicitly redefine default 'lvm' element from reclass-system
+          name: lvm
+          type: lvm
+          enabled: true
+          dhss: false
+          share_driver: manila.share.drivers.lvm.LVMShareDriver
+        lvm1: # Second backend is needed only to test multibeckend scenario
+          name: lvm1
+          type: lvm
+          enabled: true
+          lvm_share_export_ips:
+            - "${_param:manila_share_address}"
+          dhss: false
+          share_driver: manila.share.drivers.lvm.LVMShareDriver
+          lvm_share_volume_group: manila-volume