diff --git a/charts/scality-mountpoint-s3-csi-driver/templates/NOTES.txt b/charts/scality-mountpoint-s3-csi-driver/templates/NOTES.txt
new file mode 100644
index 000000000..9b544c3b7
--- /dev/null
+++ b/charts/scality-mountpoint-s3-csi-driver/templates/NOTES.txt
@@ -0,0 +1,8 @@
+Thank you for using Scality CSI Driver for S3 v{{ .Chart.Version }}.
+
+Learn more about the file system operations Mountpoint supports: https://github.com/awslabs/mountpoint-s3/blob/main/doc/SEMANTICS.md
+
+{{- if .Release.IsUpgrade }}
+
+While the CSI driver has been upgraded, existing Mountpoint Pods remain unchanged to avoid disrupting your active workloads. New Mountpoint Pods with the updated version are created only when workload pods are started or restarted. You can view which pods exist created by older V2 versions of the CSI driver using `kubectl get pods -n mount-s3 --label-columns="s3.csi.scality.com/mounted-by-csi-driver-version"`.
+{{- end }}
diff --git a/charts/scality-mountpoint-s3-csi-driver/templates/mount-s3-namespace.yaml b/charts/scality-mountpoint-s3-csi-driver/templates/mount-s3-namespace.yaml
index fa9394e4a..c7ce11348 100644
--- a/charts/scality-mountpoint-s3-csi-driver/templates/mount-s3-namespace.yaml
+++ b/charts/scality-mountpoint-s3-csi-driver/templates/mount-s3-namespace.yaml
@@ -1,3 +1,5 @@
+{{- if .Values.mountpointPod.createNamespace }}
+---
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -11,3 +13,4 @@ metadata:
     pod-security.kubernetes.io/warn: restricted
     # audit: Creates audit log entries for policy violations (for compliance tracking)
     pod-security.kubernetes.io/audit: restricted
+{{- end }}
diff --git a/charts/scality-mountpoint-s3-csi-driver/values.yaml b/charts/scality-mountpoint-s3-csi-driver/values.yaml
index a7c356131..67a0f26b3 100644
--- a/charts/scality-mountpoint-s3-csi-driver/values.yaml
+++ b/charts/scality-mountpoint-s3-csi-driver/values.yaml
@@ -129,6 +129,8 @@ controller:
 # Mountpoint pod configuration
 mountpointPod:
   namespace: mount-s3
+  # Set to false if you manage the namespace yourself (e.g., GitOps, pre-created namespaces)
+  createNamespace: true
   priorityClassName: mount-s3-critical
   # Priority class for pods that can preempt headroom pods
   preemptingPriorityClassName: mount-s3-preempting