diff --git a/deployment/inventory/sample/config.yaml b/deployment/inventory/sample/config.yaml
index 5be34d858..5d479bb4f 100644
--- a/deployment/inventory/sample/config.yaml
+++ b/deployment/inventory/sample/config.yaml
@@ -37,7 +37,6 @@ ontap_data_lif: ""                    # ONTAP data LIF IP address
 ontap_svm: ""                         # Storage Virtual Machine (SVM) name
 ontap_username: ""                    # ONTAP username with admin privileges
 ontap_password: ""                    # ONTAP password
-ontap_aggregate: ""                   # ONTAP aggregate name for volume creation
 
 huggingToken: "" # Huggingface token is required for gated/private models
 
diff --git a/deployment/roles/infrastructure/netapp_trident_csi_setup/defaults/main.yaml b/deployment/roles/infrastructure/netapp_trident_csi_setup/defaults/main.yaml
index 99c80dcd5..7ba71684a 100644
--- a/deployment/roles/infrastructure/netapp_trident_csi_setup/defaults/main.yaml
+++ b/deployment/roles/infrastructure/netapp_trident_csi_setup/defaults/main.yaml
@@ -10,4 +10,3 @@ ontap_data_lif: ""
 ontap_svm: ""
 ontap_username: ""
 ontap_password: ""
-ontap_aggregate: ""
diff --git a/deployment/roles/infrastructure/netapp_trident_csi_setup/netapp_trident_integration.md b/deployment/roles/infrastructure/netapp_trident_csi_setup/netapp_trident_integration.md
index 838432dc6..acb77bb70 100644
--- a/deployment/roles/infrastructure/netapp_trident_csi_setup/netapp_trident_integration.md
+++ b/deployment/roles/infrastructure/netapp_trident_csi_setup/netapp_trident_integration.md
@@ -161,7 +161,6 @@ ontap_data_lif: ""
 ontap_svm: ""
 ontap_username: ""
 ontap_password: ""
-ontap_aggregate: ""
 ```
 
 ## New Ansible Role Created
@@ -216,7 +215,6 @@ spec:
   svm: {{ ontap_svm }}
   username: {{ ontap_username }}
   password: {{ ontap_password }}
-  aggregate: {{ ontap_aggregate }}
 ```
 
 [**trident-storageclass.yaml.j2**](https://github.com/sushma-m1/Enterprise-RAG/blob/main/deployment/roles/infrastructure/netapp_trident_csi_setup/templates/trident-storageclass.yaml.j2): Kubernetes StorageClass
@@ -263,7 +261,6 @@ ontap_data_lif: "192.168.1.101"          # ONTAP data interface IP
 ontap_svm: "svm_ai"                       # Storage Virtual Machine name
 ontap_username: "admin"                   # ONTAP admin username
 ontap_password: "password123"             # ONTAP admin password
-ontap_aggregate: "aggr1"                  # Target aggregate for volumes
 ```
 
 ## Deployment Process
diff --git a/deployment/roles/infrastructure/netapp_trident_csi_setup/tasks/main.yaml b/deployment/roles/infrastructure/netapp_trident_csi_setup/tasks/main.yaml
index 434565103..1959c7297 100644
--- a/deployment/roles/infrastructure/netapp_trident_csi_setup/tasks/main.yaml
+++ b/deployment/roles/infrastructure/netapp_trident_csi_setup/tasks/main.yaml
@@ -27,6 +27,8 @@
     release_namespace: "{{ trident_namespace }}"
     create_namespace: true
     chart_version: "100.{{ trident_operator_version }}"
+    update_repo_cache: true
+    wait: true
   tags:
     - install
     - post-install
diff --git a/deployment/roles/infrastructure/netapp_trident_csi_setup/templates/trident-backend.yaml.j2 b/deployment/roles/infrastructure/netapp_trident_csi_setup/templates/trident-backend.yaml.j2
index 0ff69bc22..9fae57e53 100644
--- a/deployment/roles/infrastructure/netapp_trident_csi_setup/templates/trident-backend.yaml.j2
+++ b/deployment/roles/infrastructure/netapp_trident_csi_setup/templates/trident-backend.yaml.j2
@@ -10,6 +10,5 @@ spec:
   managementLIF: {{ ontap_management_lif }}
   dataLIF: {{ ontap_data_lif }}
   svm: {{ ontap_svm }}
-  aggregate: {{ ontap_aggregate }}
   credentials:
     name: {{ trident_backend_name }}-secret