diff --git a/input/software_config.json b/input/software_config.json
index 877ba0c3dc..6486ab79be 100644
--- a/input/software_config.json
+++ b/input/software_config.json
@@ -8,7 +8,7 @@
         {"name": "openldap", "arch": ["x86_64","aarch64"]},
         {"name": "service_k8s","version": "1.35.1", "arch": ["x86_64"]},
         {"name": "slurm_custom", "arch": ["x86_64","aarch64"]},
-        {"name": "csi_driver_powerscale", "version":"v2.16.0", "arch": ["x86_64"]},
+        {"name": "csi_driver_powerscale", "version":"v2.17.0", "arch": ["x86_64"]},
         {"name": "ldms", "arch": ["x86_64","aarch64"]},
         {"name": "additional_packages", "arch": ["x86_64","aarch64"]}
     ],
diff --git a/provision/roles/configure_ochami/templates/powerscale/deploy_powerscale_csi.sh.j2 b/provision/roles/configure_ochami/templates/powerscale/deploy_powerscale_csi.sh.j2
index c8f451dc89..84b0df4c53 100644
--- a/provision/roles/configure_ochami/templates/powerscale/deploy_powerscale_csi.sh.j2
+++ b/provision/roles/configure_ochami/templates/powerscale/deploy_powerscale_csi.sh.j2
@@ -122,6 +122,13 @@ else
         echo "Snapshot Controller deployment failed (expected). Continuing..."
       }
 
+      echo "Updating Snapshot Controller image to v8.5.0..."
+      kubectl set image deployment/snapshot-controller snapshot-controller=registry.k8s.io/sig-storage/snapshot-controller:v8.5.0 -n kube-system >/dev/null 2>&1 || true
+      echo "Waiting for Snapshot Controller rollout to finish (timeout: 5 minutes)..."
+      kubectl rollout status deployment/snapshot-controller -n kube-system --timeout=300s >/dev/null 2>&1 || {
+          echo "Snapshot Controller rollout did not complete in time."
+      }
+
       echo "Waiting for Snapshot Controller pods to reach Running state..."
       MAX_ATTEMPTS=60
       WAIT_TIME=5