diff --git a/charts/airbyte/templates/airbyte-db.yaml b/charts/airbyte/templates/airbyte-db.yaml
index 91cbd65892..0d6e8bf916 100644
--- a/charts/airbyte/templates/airbyte-db.yaml
+++ b/charts/airbyte/templates/airbyte-db.yaml
@@ -81,5 +81,8 @@ spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
-          storage: 500Mi
+          storage: {{ .Values.postgresql.storage.volumeClaimValue }}
+      {{- with .Values.postgresql.storage.storageClassName }}
+      storageClassName: {{ . }}
+      {{- end }}
 {{- end }}
diff --git a/charts/airbyte/templates/minio.yaml b/charts/airbyte/templates/minio.yaml
index 4c6bd8cbe3..0b0b826c4f 100644
--- a/charts/airbyte/templates/minio.yaml
+++ b/charts/airbyte/templates/minio.yaml
@@ -22,6 +22,9 @@ spec:
           resources:
             requests:
               storage: {{ .Values.minio.storage.volumeClaimValue  }}
+          {{- with .Values.minio.storage.storageClassName }}
+          storageClassName: {{ . }}
+          {{- end }}
   template:
     metadata:
       labels:
diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml
index 1f20859a51..2998817e36 100644
--- a/charts/airbyte/values.yaml
+++ b/charts/airbyte/values.yaml
@@ -1705,6 +1705,9 @@ postgresql:
   # -- Affinity and anti-affinity for postgresql pod assignment, see
   # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
   affinity: {}
+  storage:
+    volumeClaimValue: 500Mi
+    storageClassName: ""
 
 # External PostgreSQL configuration, All of these values are only used when postgresql.enabled is set to false
 externalDatabase:
@@ -1738,6 +1741,7 @@ minio:
 
   storage:
     volumeClaimValue: 500Mi
+    storageClassName: ""
 
   # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/
   ##
diff --git a/charts/v2/airbyte/templates/airbyte-db.yaml b/charts/v2/airbyte/templates/airbyte-db.yaml
index 91cbd65892..0d6e8bf916 100644
--- a/charts/v2/airbyte/templates/airbyte-db.yaml
+++ b/charts/v2/airbyte/templates/airbyte-db.yaml
@@ -81,5 +81,8 @@ spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
-          storage: 500Mi
+          storage: {{ .Values.postgresql.storage.volumeClaimValue }}
+      {{- with .Values.postgresql.storage.storageClassName }}
+      storageClassName: {{ . }}
+      {{- end }}
 {{- end }}
diff --git a/charts/v2/airbyte/templates/minio.yaml b/charts/v2/airbyte/templates/minio.yaml
index 0f9e9835ae..4087d29cca 100644
--- a/charts/v2/airbyte/templates/minio.yaml
+++ b/charts/v2/airbyte/templates/minio.yaml
@@ -21,7 +21,10 @@ spec:
           accessModes: [ "ReadWriteOnce" ]
           resources:
             requests:
-              storage: {{ .Values.minio.storage.volumeClaimValue  }}
+              storage: {{ .Values.minio.storage.volumeClaimValue }}
+          {{- with .Values.minio.storage.storageClassName }}
+          storageClassName: {{ . }}
+          {{- end }}
   template:
     metadata:
       labels:
diff --git a/charts/v2/airbyte/values.yaml b/charts/v2/airbyte/values.yaml
index 3a0a174d47..9ab68fb167 100644
--- a/charts/v2/airbyte/values.yaml
+++ b/charts/v2/airbyte/values.yaml
@@ -2024,6 +2024,9 @@ postgresql:
   # -- Affinity and anti-affinity for postgresql pod assignment, see
   # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
   affinity: {}
+  storage:
+    volumeClaimValue: 500Mi
+    storageClassName: ""
 
 minio:
   secretName: ""
@@ -2043,6 +2046,7 @@ minio:
 
   storage:
     volumeClaimValue: 500Mi
+    storageClassName: ""
 
   # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/
   ##