diff --git a/ansible/playbooks/sap-hana-preconfigure.yaml b/ansible/playbooks/sap-hana-preconfigure.yaml
index 1bb6cc12..5ee2bd59 100644
--- a/ansible/playbooks/sap-hana-preconfigure.yaml
+++ b/ansible/playbooks/sap-hana-preconfigure.yaml
@@ -38,6 +38,10 @@
       community.general.zypper:
         name: "{{ item }}"
         state: present
+      environment:
+        ZYPP_LOCK_TIMEOUT: '120'
+      retries: 5
+      delay: 30
       loop:
         - 'iscsiuio'
         - 'open-iscsi'
diff --git a/ansible/playbooks/sap-hana-storage.yaml b/ansible/playbooks/sap-hana-storage.yaml
index 4e36793d..339b529d 100644
--- a/ansible/playbooks/sap-hana-storage.yaml
+++ b/ansible/playbooks/sap-hana-storage.yaml
@@ -25,9 +25,26 @@
       ansible.builtin.include_vars: ./vars/gcp_hana_storage_profile.yaml
       when: cloud_platform_is_gcp
 
+    - name: Load HANA vars
+      ansible.builtin.include_vars: ./vars/hana_vars.yaml
+
+    - name: Load HANA storage vars
+      ansible.builtin.include_vars: ./vars/azure_hana_storage_setup_profile.yaml
+
+    - name: Set host type
+      ansible.builtin.set_fact:
+        sap_storage_setup_host_type: >-
+          {% if 'hana01' in inventory_hostname %} ["hana_primary"]
+          {% elif 'hana02' in inventory_hostname %} ["hana_secondary"]
+          {% else %} ["hana_primary"]
+          {% endif %}
+
     - name: HANA storage preparation
       vars:
         qe_sap_storage_cloud_type: 'generic'
         qe_sap_storage_action: 'prepare'
+        sap_storage_setup_sid: "{{ sap_hana_install_sid }}"
+
       ansible.builtin.include_role:
-        name: qe_sap_storage
+        # name: qe_sap_storage
+        name: community.sap_install.sap_storage_setup
diff --git a/ansible/playbooks/tasks/iscsi-server-sbd-prep.yaml b/ansible/playbooks/tasks/iscsi-server-sbd-prep.yaml
index 6bddeab7..8a549162 100644
--- a/ansible/playbooks/tasks/iscsi-server-sbd-prep.yaml
+++ b/ansible/playbooks/tasks/iscsi-server-sbd-prep.yaml
@@ -47,7 +47,6 @@
   ansible.builtin.include_vars: ./vars/aws_r4_iscsi_storage_profile.yaml
   when: cloud_platform_is_aws and aws_machine_type_is_r4
 
-
 - name: Load Azure disk configuration
   ansible.builtin.include_vars: ./vars/azure_iscsi_storage_profile.yaml
   when: cloud_platform_is_azure
@@ -56,12 +55,29 @@
   ansible.builtin.include_vars: ./vars/gcp_iscsi_storage_profile.yaml
   when: cloud_platform_is_gcp
 
+- name: Load HANA vars
+  ansible.builtin.include_vars: ./vars/hana_vars.yaml
+
+- name: Load HANA storage vars
+  ansible.builtin.include_vars: ./vars/azure_hana_storage_setup_profile.yaml
+
+- name: Set host type
+  ansible.builtin.set_fact:
+    sap_storage_setup_host_type: >-
+      {% if 'hana01' in inventory_hostname %} ["hana_primary"]
+      {% elif 'hana02' in inventory_hostname %} ["hana_secondary"]
+      {% else %} ["hana_primary"]
+      {% endif %}
+
 - name: Prepare iscsi disks
   vars:
     qe_sap_storage_cloud_type: 'generic'
     qe_sap_storage_action: 'prepare'
+    sap_storage_setup_sid: "{{ sap_hana_install_sid }}"
+
   ansible.builtin.include_role:
-    name: qe_sap_storage
+    # name: qe_sap_storage
+    name: community.sap_install.sap_storage_setup
 
 - name: Configure HANA SBD target
   ansible.builtin.command:
diff --git a/ansible/playbooks/vars/azure_hana_storage_setup_profile.yaml b/ansible/playbooks/vars/azure_hana_storage_setup_profile.yaml
new file mode 100644
index 00000000..8f625408
--- /dev/null
+++ b/ansible/playbooks/vars/azure_hana_storage_setup_profile.yaml
@@ -0,0 +1,32 @@
+---
+sap_storage_setup_definition:
+  - name: 'hanadata'
+    mountpoint: '/hana/data'
+    lvm_vg_name: 'hanadatavg'
+    lvm_lv_name: 'hanadatalv'
+    lvm_lv_stripes: 4
+    lvm_lv_stripe_size: "128k"
+    disk_size: 512
+    filesystem_type: "xfs"
+
+  - name: 'hanalog'
+    mountpoint: '/hana/log'
+    lvm_vg_name: 'hanalogvg'
+    lvm_lv_name: 'hanaloglv'
+    lvm_lv_stripe_size: "64k"
+    disk_size: 256
+    filesystem_type: "xfs"
+
+  - name: 'hanashared'
+    mountpoint: '/hana/shared'
+    lvm_vg_name: 'hanasharedvg'
+    lvm_lv_name: 'hanasharedlv'
+    disk_size: 512
+    filesystem_type: "xfs"
+
+  - name: 'usrsap'
+    mountpoint: '/usr/sap'
+    lvm_vg_name: 'usrsapvg'
+    lvm_lv_name: 'usrsaplv'
+    disk_size: 50
+    filesystem_type: "xfs"