diff --git a/trident/Dockerfile b/trident/Dockerfile
index bc3065fa..628475a4 100644
--- a/trident/Dockerfile
+++ b/trident/Dockerfile
@@ -1,6 +1,6 @@
 FROM fedora
 
-ENV TRIDENT_VERSION='24.02.0'
+ENV TRIDENT_VERSION='24.06.1'
 
 RUN \
   curl -L https://github.com/NetApp/trident/releases/download/v${TRIDENT_VERSION}/trident-installer-${TRIDENT_VERSION}.tar.gz -o trident-installer.tar.gz \
diff --git a/trident/cluster/trident-controller-clusterrole.yaml b/trident/cluster/trident-controller-clusterrole.yaml
index 5bb67dd7..1789d084 100644
--- a/trident/cluster/trident-controller-clusterrole.yaml
+++ b/trident/cluster/trident-controller-clusterrole.yaml
@@ -14,7 +14,7 @@ rules:
     verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
-    verbs: ["get", "list", "watch", "create", "update", "patch"]
+    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims/status"]
     verbs: ["update", "patch"]
diff --git a/trident/cluster/trident-crds.yaml b/trident/cluster/trident-crds.yaml
index 660c9dc9..ccf92769 100644
--- a/trident/cluster/trident-crds.yaml
+++ b/trident/cluster/trident-crds.yaml
@@ -664,3 +664,58 @@ spec:
     categories:
     - trident
     - trident-external
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: tridentconfigurators.trident.netapp.io
+spec:
+  group: trident.netapp.io
+  versions:
+    - name: v1
+      served: true
+      storage: true
+      schema:
+          openAPIV3Schema:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+      subresources:
+        status: {}
+      additionalPrinterColumns:
+      - name: Phase
+        type: string
+        description: The backend config phase
+        priority: 0
+        jsonPath: .status.phase
+      - name: Status
+        type: string
+        description: The result of the last operation
+        priority: 0
+        jsonPath: .status.lastOperationStatus
+      - name: Cloud Provider
+        type: string
+        description: The name of cloud provider
+        priority: 0
+        jsonPath: .status.cloudProvider
+      - name: Storage Driver
+        type: string
+        description: The storage driver type
+        priority: 1
+        jsonPath: .spec.storageDriverName
+      - name: Deletion Policy
+        type: string
+        description: The deletion policy
+        priority: 1
+        jsonPath: .status.deletionPolicy
+  scope: Cluster
+  names:
+    plural: tridentconfigurators
+    singular: tridentconfigurator
+    kind: TridentConfigurator
+    shortNames:
+    - tconf
+    - tconfigurator
+    categories:
+    - trident
+    - trident-internal
+    - trident-external
diff --git a/trident/namespaced/trident-controller-serviceaccount.yaml b/trident/namespaced/trident-controller-serviceaccount.yaml
index 6e110410..e5ded4db 100644
--- a/trident/namespaced/trident-controller-serviceaccount.yaml
+++ b/trident/namespaced/trident-controller-serviceaccount.yaml
@@ -3,5 +3,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: trident-controller
+  
   labels:
     app: controller.csi.trident.netapp.io
diff --git a/trident/namespaced/trident-daemonset.yaml b/trident/namespaced/trident-daemonset.yaml
index f83c3b65..00d35154 100644
--- a/trident/namespaced/trident-daemonset.yaml
+++ b/trident/namespaced/trident-daemonset.yaml
@@ -14,6 +14,8 @@ spec:
     metadata:
       labels:
         app: node.csi.trident.netapp.io
+      annotations:
+        openshift.io/required-scc: trident-node-linux
     spec:
       serviceAccount: trident-node-linux
       hostNetwork: true
@@ -31,7 +33,7 @@ spec:
             - all
             add:
             - SYS_ADMIN
-        image: netapp/trident:24.02.0
+        image: netapp/trident:24.06.1
         imagePullPolicy: IfNotPresent
         command:
         - /trident_orchestrator
diff --git a/trident/namespaced/trident-deployment.yaml b/trident/namespaced/trident-deployment.yaml
index d843f867..4b27b1af 100644
--- a/trident/namespaced/trident-deployment.yaml
+++ b/trident/namespaced/trident-deployment.yaml
@@ -17,11 +17,14 @@ spec:
     metadata:
       labels:
         app: controller.csi.trident.netapp.io
+        
+      annotations:
+        openshift.io/required-scc: trident-controller
     spec:
       serviceAccount: trident-controller
       containers:
       - name: trident-main
-        image: netapp/trident:24.02.0
+        image: netapp/trident:24.06.1
         imagePullPolicy: IfNotPresent
         securityContext:
           runAsNonRoot: false
@@ -69,6 +72,10 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
         - name: CSI_ENDPOINT
           value: unix://plugin/csi.sock
         - name: TRIDENT_SERVER
@@ -82,7 +89,7 @@ spec:
           readOnly: true
         
       - name: trident-autosupport
-        image: docker.io/netapp/trident-autosupport:24.02
+        image: docker.io/netapp/trident-autosupport:24.06
         imagePullPolicy: IfNotPresent
         securityContext:
           capabilities:
@@ -108,7 +115,7 @@ spec:
         - name: asup-dir
           mountPath: /asup
       - name: csi-provisioner
-        image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
+        image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.1
         imagePullPolicy: IfNotPresent
         securityContext:
           capabilities:
@@ -128,7 +135,7 @@ spec:
         - name: socket-dir
           mountPath: /var/lib/csi/sockets/pluginproxy/
       - name: csi-attacher
-        image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
+        image: registry.k8s.io/sig-storage/csi-attacher:v4.6.0
         imagePullPolicy: IfNotPresent
         securityContext:
           capabilities:
@@ -146,7 +153,7 @@ spec:
         - name: socket-dir
           mountPath: /var/lib/csi/sockets/pluginproxy/
       - name: csi-resizer
-        image: registry.k8s.io/sig-storage/csi-resizer:v1.9.3
+        image: registry.k8s.io/sig-storage/csi-resizer:v1.11.0
         imagePullPolicy: IfNotPresent
         args:
         - "--v=2"
@@ -159,7 +166,7 @@ spec:
         - name: socket-dir
           mountPath: /var/lib/csi/sockets/pluginproxy/
       - name: csi-snapshotter
-        image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.3
+        image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.2
         imagePullPolicy: IfNotPresent
         securityContext:
           capabilities:
diff --git a/trident/namespaced/trident-node-linux-serviceaccount.yaml b/trident/namespaced/trident-node-linux-serviceaccount.yaml
index 269f1a62..defd9671 100644
--- a/trident/namespaced/trident-node-linux-serviceaccount.yaml
+++ b/trident/namespaced/trident-node-linux-serviceaccount.yaml
@@ -3,5 +3,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: trident-node-linux
+  
   labels:
     app: node.csi.trident.netapp.io