diff --git a/api/v1/databaseclaim_types.go b/api/v1/databaseclaim_types.go
index 7e752b79..f94f3b9f 100644
--- a/api/v1/databaseclaim_types.go
+++ b/api/v1/databaseclaim_types.go
@@ -139,6 +139,10 @@ type DatabaseClaimSpec struct {
 	// In most cases the AppID will match the database name. In some cases, however, we will need to provide an optional override.
 	DBNameOverride string `json:"dbNameOverride,omitempty"`
 
+	// If provided, marks auto storage scalling to true for postgres DBinstance. The value represents the maximum allowed storage to scale upto.
+	// For auroraDB instance, this value is ignored.
+	MaxStorageGB int64 `json:"maxStorageGB,omitempty"`
+
 	// The name of the secret to use for storing the ConnectionInfo.  Must follow a naming convention that ensures it is unique.
 	SecretName string `json:"secretName,omitempty"`
 
@@ -266,6 +270,10 @@ type Status struct {
 	// The optional MinStorageGB value requests the minimum database host storage capacity in GBytes
 	MinStorageGB int `json:"minStorageGB,omitempty"`
 
+	// If provided, marks auto storage scalling to true for postgres DBinstance. The value represents the maximum allowed storage to scale upto.
+	// For auroraDB instance, this value is ignored.
+	MaxStorageGB int64 `json:"maxStorageGB,omitempty"`
+
 	// Specifies the type of database to provision. Only postgres is supported.
 	Type DatabaseType `json:"type,omitempty"`
 
diff --git a/config/crd/bases/persistance.atlas.infoblox.com_databaseclaims.yaml b/config/crd/bases/persistance.atlas.infoblox.com_databaseclaims.yaml
index 7f41fcc3..3f13662b 100644
--- a/config/crd/bases/persistance.atlas.infoblox.com_databaseclaims.yaml
+++ b/config/crd/bases/persistance.atlas.infoblox.com_databaseclaims.yaml
@@ -101,6 +101,12 @@ spec:
                 description: The matching fragment key name of the database instance
                   that will host the database.
                 type: string
+              maxStorageGB:
+                description: If provided, marks auto storage scalling to true for
+                  postgres DBinstance. The value represents the maximum allowed storage
+                  to scale upto. For auroraDB instance, this value is ignored.
+                format: int64
+                type: integer
               minStorageGB:
                 description: The optional MinStorageGB value requests the minimum
                   database host storage capacity in GBytes
@@ -272,6 +278,13 @@ spec:
                     description: The name of the label that was successfully matched
                       against the fragment key names in the db-controller configMap
                     type: string
+                  maxStorageGB:
+                    description: If provided, marks auto storage scalling to true
+                      for postgres DBinstance. The value represents the maximum allowed
+                      storage to scale upto. For auroraDB instance, this value is
+                      ignored.
+                    format: int64
+                    type: integer
                   minStorageGB:
                     description: The optional MinStorageGB value requests the minimum
                       database host storage capacity in GBytes
@@ -409,6 +422,13 @@ spec:
                     description: The name of the label that was successfully matched
                       against the fragment key names in the db-controller configMap
                     type: string
+                  maxStorageGB:
+                    description: If provided, marks auto storage scalling to true
+                      for postgres DBinstance. The value represents the maximum allowed
+                      storage to scale upto. For auroraDB instance, this value is
+                      ignored.
+                    format: int64
+                    type: integer
                   minStorageGB:
                     description: The optional MinStorageGB value requests the minimum
                       database host storage capacity in GBytes
diff --git a/helm/db-controller-crds/crd/persistance.atlas.infoblox.com_databaseclaims.yaml b/helm/db-controller-crds/crd/persistance.atlas.infoblox.com_databaseclaims.yaml
index 7f41fcc3..fd50709e 100644
--- a/helm/db-controller-crds/crd/persistance.atlas.infoblox.com_databaseclaims.yaml
+++ b/helm/db-controller-crds/crd/persistance.atlas.infoblox.com_databaseclaims.yaml
@@ -101,6 +101,12 @@ spec:
                 description: The matching fragment key name of the database instance
                   that will host the database.
                 type: string
+              maxStorageGB:
+                description: If provided, marks auto storage scalling to true for
+                  postgres DBinstance. The value represents the maximum allowed storage
+                  to scale upto. For auroraDB instance, this value is ignored.
+                format: int64
+                type: integer
               minStorageGB:
                 description: The optional MinStorageGB value requests the minimum
                   database host storage capacity in GBytes
@@ -272,6 +278,13 @@ spec:
                     description: The name of the label that was successfully matched
                       against the fragment key names in the db-controller configMap
                     type: string
+                  maxStorageGB:
+                    description: If provided, marks auto storage scalling to true
+                      for postgres DBinstance. The value represents the maximum allowed
+                      storage to scale upto. For auroraDB instance, this value is
+                      ignored.
+                    format: int64
+                    type: integer
                   minStorageGB:
                     description: The optional MinStorageGB value requests the minimum
                       database host storage capacity in GBytes
@@ -409,6 +422,13 @@ spec:
                     description: The name of the label that was successfully matched
                       against the fragment key names in the db-controller configMap
                     type: string
+                  maxStorageGB:
+                    description: If provided, marks auto storage scalling to true
+                      for postgres DBinstance. The value represents the maximum allowed
+                      storage to scale upto. For auroraDB instance, this value is
+                      ignored.
+                    format: int64
+                    type: integer
                   minStorageGB:
                     description: The optional MinStorageGB value requests the minimum
                       database host storage capacity in GBytes
@@ -550,4 +570,4 @@ spec:
     served: true
     storage: true
     subresources:
-      status: {}
+      status: {}
\ No newline at end of file