diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml
index fcc6581b7..18884ca6c 100644
--- a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml
+++ b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml
@@ -44,18 +44,6 @@ spec:
             - "--v=5"
             - "--csi-address=/csi/{{ .Values.pluginSocketFile }}"
             - "--kubelet-registration-path={{ .Values.socketDir }}/{{ .Values.pluginSocketFile }}"
-          lifecycle:
-            preStop:
-              exec:
-                {{- /*
-                NOTE(wilmardo): The replace functions ensures there are no spaces in the string.
-                To avoid `rm -rf /registration/driver name`
-                */}}
-                command: [
-                  "/bin/sh", "-c",
-                  "rm -rf /registration/{{ .Values.driverName | replace " " "" }} \
-                  /registration/{{ .Values.driverName | replace " " "" }}-reg.sock"
-                ]
           env:
             - name: KUBE_NODE_NAME
               valueFrom:
diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
index eb31759d3..484b53eb1 100644
--- a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
+++ b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
@@ -45,18 +45,6 @@ spec:
             - "--v=5"
             - "--csi-address=/csi/{{ .Values.pluginSocketFile }}"
             - "--kubelet-registration-path={{ .Values.socketDir }}/{{ .Values.pluginSocketFile }}"
-          lifecycle:
-            preStop:
-              exec:
-                {{- /*
-                NOTE(wilmardo): The replace functions ensures there are no spaces in the string.
-                To avoid `rm -rf /registration/driver name`
-                */}}
-                command: [
-                  "/bin/sh", "-c",
-                  "rm -rf /registration/{{ .Values.driverName | replace " " "" }} \
-                  /registration/{{ .Values.driverName | replace " " "" }}-reg.sock"
-                ]
           env:
             - name: KUBE_NODE_NAME
               valueFrom:
diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
index d62ca9d8b..8d54c3097 100644
--- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
+++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
@@ -29,14 +29,6 @@ spec:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
             - "--kubelet-registration-path=/var/lib/kubelet/plugins/cephfs.csi.ceph.com/csi.sock"
-          lifecycle:
-            preStop:
-              exec:
-                command: [
-                  "/bin/sh", "-c",
-                  "rm -rf /registration/cephfs.csi.ceph.com \
-                  /registration/cephfs.csi.ceph.com-reg.sock"
-                ]
           env:
             - name: KUBE_NODE_NAME
               valueFrom:
diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml
index de6736155..25f2d020c 100644
--- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml
+++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml
@@ -30,14 +30,6 @@ spec:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
             - "--kubelet-registration-path=/var/lib/kubelet/plugins/rbd.csi.ceph.com/csi.sock"
-          lifecycle:
-            preStop:
-              exec:
-                command: [
-                  "/bin/sh", "-c",
-                  "rm -rf /registration/rbd.csi.ceph.com \
-                  /registration/rbd.csi.ceph.com-reg.sock"
-                ]
           env:
             - name: KUBE_NODE_NAME
               valueFrom: