diff --git a/charts/qovery/charts/q-storageclass-aws/templates/storageclass.yaml b/charts/qovery/charts/q-storageclass-aws/templates/storageclass.yaml
index 21893e1..a78c0c5 100644
--- a/charts/qovery/charts/q-storageclass-aws/templates/storageclass.yaml
+++ b/charts/qovery/charts/q-storageclass-aws/templates/storageclass.yaml
@@ -2,6 +2,10 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: aws-ebs-gp3-0
+  annotations:
+    {{- if eq "aws-ebs-gp3-0" .Values.defaultStorageClassName }}
+    "storageclass.kubernetes.io/is-default-class": "true"
+    {{- end }}
   labels:
     aws-type: "gp3"
     qovery-type: "ssd"
@@ -18,6 +22,10 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: aws-ebs-gp2-0
+  annotations:
+    {{- if eq "aws-ebs-gp2-0" .Values.defaultStorageClassName }}
+    storageclass.kubernetes.io/is-default-class: "true"
+    {{- end }}
   labels:
     aws-type: "gp2"
     qovery-type: "ssd"
@@ -34,6 +42,10 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: aws-ebs-io1-0
+  annotations:
+    {{- if eq "aws-ebs-io1-0" .Values.defaultStorageClassName }}
+    storageclass.kubernetes.io/is-default-class: "true"
+    {{- end }}
   labels:
     aws-type: "io1"
     qovery-type: "nvme"
@@ -51,6 +63,10 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: aws-ebs-st1-0
+  annotations:
+    {{- if eq "aws-ebs-st1-0" .Values.defaultStorageClassName }}
+    storageclass.kubernetes.io/is-default-class: "true"
+    {{- end }}
   labels:
     aws-type: "st1"
     qovery-type: "hdd"
@@ -67,6 +83,10 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: aws-ebs-sc1-0
+  annotations:
+    {{- if eq "aws-ebs-sc1-0" .Values.defaultStorageClassName }}
+    storageclass.kubernetes.io/is-default-class: "true"
+    {{- end }}
   labels:
     aws-type: "sc1"
     qovery-type: "cold"
diff --git a/charts/qovery/charts/q-storageclass-aws/values.yaml b/charts/qovery/charts/q-storageclass-aws/values.yaml
index e69de29..1891dc9 100644
--- a/charts/qovery/charts/q-storageclass-aws/values.yaml
+++ b/charts/qovery/charts/q-storageclass-aws/values.yaml
@@ -0,0 +1 @@
+defaultStorageClassName: ""
\ No newline at end of file
diff --git a/charts/qovery/charts/q-storageclass-gcp/templates/storageclass.yaml b/charts/qovery/charts/q-storageclass-gcp/templates/storageclass.yaml
index ffaa551..bccb3d7 100644
--- a/charts/qovery/charts/q-storageclass-gcp/templates/storageclass.yaml
+++ b/charts/qovery/charts/q-storageclass-gcp/templates/storageclass.yaml
@@ -26,6 +26,10 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: gcp-pd-balanced
+  annotations:
+    {{- if eq "gcp-pd-balanced" .Values.defaultStorageClassName }}
+    "storageclass.kubernetes.io/is-default-class": "true"
+    {{- end }}
   labels:
     qovery-type: "ssd"
 provisioner: pd.csi.storage.gke.io
diff --git a/charts/qovery/charts/q-storageclass-gcp/values.yaml b/charts/qovery/charts/q-storageclass-gcp/values.yaml
index e69de29..1891dc9 100644
--- a/charts/qovery/charts/q-storageclass-gcp/values.yaml
+++ b/charts/qovery/charts/q-storageclass-gcp/values.yaml
@@ -0,0 +1 @@
+defaultStorageClassName: ""
\ No newline at end of file
diff --git a/charts/qovery/charts/q-storageclass-scaleway/templates/storageclass.yaml b/charts/qovery/charts/q-storageclass-scaleway/templates/storageclass.yaml
index 5e1c0a9..41b9fd4 100644
--- a/charts/qovery/charts/q-storageclass-scaleway/templates/storageclass.yaml
+++ b/charts/qovery/charts/q-storageclass-scaleway/templates/storageclass.yaml
@@ -2,6 +2,10 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: scw-sbv-ssd-0
+  annotations:
+    {{- if eq "scw-sbv-ssd-0" .Values.defaultStorageClassName }}
+    "storageclass.kubernetes.io/is-default-class": "true"
+    {{- end }}
   labels:
     scw-type: "b_ssd"
     qovery-type: "ssd"
diff --git a/charts/qovery/charts/q-storageclass-scaleway/values.yaml b/charts/qovery/charts/q-storageclass-scaleway/values.yaml
index e69de29..1891dc9 100644
--- a/charts/qovery/charts/q-storageclass-scaleway/values.yaml
+++ b/charts/qovery/charts/q-storageclass-scaleway/values.yaml
@@ -0,0 +1 @@
+defaultStorageClassName: ""
\ No newline at end of file