diff --git a/deploy/infrastructure/modules/terraform-aws-dss/TFVARS.gen.md b/deploy/infrastructure/modules/terraform-aws-dss/TFVARS.gen.md
index 5cf3efd50..8aa85af5a 100644
--- a/deploy/infrastructure/modules/terraform-aws-dss/TFVARS.gen.md
+++ b/deploy/infrastructure/modules/terraform-aws-dss/TFVARS.gen.md
@@ -82,9 +82,8 @@ See https://aws.amazon.com/ec2/instance-types/ for available options.</p>
 See https://docs.aws.amazon.com/eks/latest/userguide/storage-classes.html for more details and
 available options.</p>
 <p>Depending on your use case, performance may be significantly improved with higher-tier storage classes, though this should be balanced against the associated costs.</p>
-<p>Both CockroachDB and YugabyteDB recommend at least <code>gp3</code> for production workloads. Use <code>gp2</code> for testing only, or consider <code>io2</code> for high-throughput scenarios.</p>
+<p>Both CockroachDB and YugabyteDB recommend at least <code>gp3</code> for production workloads. Consider <code>io2</code> for high-throughput scenarios.</p>
 <p>See https://www.cockroachlabs.com/docs/v24.1/recommended-production-settings#aws and https://docs.yugabyte.com/stable/deploy/checklist/#amazon-web-services-aws for database-specific recommendations.</p>
-<p>Example: <code>gp3</code> for production and <code>gp2</code> for development.</p>
 </td>
             </tr><tr>
                 <td>aws_region (<code>string</code>)</td>
diff --git a/deploy/infrastructure/modules/terraform-aws-dss/terraform.dev.example.tfvars b/deploy/infrastructure/modules/terraform-aws-dss/terraform.dev.example.tfvars
index 76b30a8f5..b0c3b37b3 100644
--- a/deploy/infrastructure/modules/terraform-aws-dss/terraform.dev.example.tfvars
+++ b/deploy/infrastructure/modules/terraform-aws-dss/terraform.dev.example.tfvars
@@ -16,7 +16,7 @@ cluster_name                 = "dss-dev-ew1"
 kubernetes_version           = 1.32
 node_count                   = 3
 aws_instance_type            = "t3.medium"
-aws_kubernetes_storage_class = "gp2"
+aws_kubernetes_storage_class = "gp3"
 
 # DSS configuration
 image = "docker.io/interuss/dss:latest"
diff --git a/deploy/infrastructure/modules/terraform-aws-dss/variables.gen.tf b/deploy/infrastructure/modules/terraform-aws-dss/variables.gen.tf
index 4b9a93b55..bafda58b1 100644
--- a/deploy/infrastructure/modules/terraform-aws-dss/variables.gen.tf
+++ b/deploy/infrastructure/modules/terraform-aws-dss/variables.gen.tf
@@ -153,11 +153,10 @@ variable "aws_kubernetes_storage_class" {
 
   Depending on your use case, performance may be significantly improved with higher-tier storage classes, though this should be balanced against the associated costs.
 
-  Both CockroachDB and YugabyteDB recommend at least `gp3` for production workloads. Use `gp2` for testing only, or consider `io2` for high-throughput scenarios.
+  Both CockroachDB and YugabyteDB recommend at least `gp3` for production workloads. Consider `io2` for high-throughput scenarios.
 
   See https://www.cockroachlabs.com/docs/v24.1/recommended-production-settings#aws and https://docs.yugabyte.com/stable/deploy/checklist/#amazon-web-services-aws for database-specific recommendations.
 
-  Example: `gp3` for production and `gp2` for development.
   EOT
 }
 
diff --git a/deploy/infrastructure/utils/definitions/aws_kubernetes_storage_class.tf b/deploy/infrastructure/utils/definitions/aws_kubernetes_storage_class.tf
index b92473115..098a2ed37 100644
--- a/deploy/infrastructure/utils/definitions/aws_kubernetes_storage_class.tf
+++ b/deploy/infrastructure/utils/definitions/aws_kubernetes_storage_class.tf
@@ -7,10 +7,9 @@ variable "aws_kubernetes_storage_class" {
 
   Depending on your use case, performance may be significantly improved with higher-tier storage classes, though this should be balanced against the associated costs.
 
-  Both CockroachDB and YugabyteDB recommend at least `gp3` for production workloads. Use `gp2` for testing only, or consider `io2` for high-throughput scenarios.
+  Both CockroachDB and YugabyteDB recommend at least `gp3` for production workloads. Consider `io2` for high-throughput scenarios.
 
   See https://www.cockroachlabs.com/docs/v24.1/recommended-production-settings#aws and https://docs.yugabyte.com/stable/deploy/checklist/#amazon-web-services-aws for database-specific recommendations.
 
-  Example: `gp3` for production and `gp2` for development.
   EOT
 }
diff --git a/deploy/operations/ci/aws-1/terraform.tfvars b/deploy/operations/ci/aws-1/terraform.tfvars
index fea06cc76..06f5cde1b 100644
--- a/deploy/operations/ci/aws-1/terraform.tfvars
+++ b/deploy/operations/ci/aws-1/terraform.tfvars
@@ -8,7 +8,7 @@ kubernetes_version           = 1.32
 cluster_name                 = "dss-ci-aws-ue1"
 node_count                   = 3
 aws_instance_type            = "t3.medium"
-aws_kubernetes_storage_class = "gp2"
+aws_kubernetes_storage_class = "gp3"
 
 # DSS configuration
 image               = "docker.io/interuss/dss:latest"
diff --git a/deploy/operations/ci/aws-1/variables.gen.tf b/deploy/operations/ci/aws-1/variables.gen.tf
index 4b9a93b55..bafda58b1 100644
--- a/deploy/operations/ci/aws-1/variables.gen.tf
+++ b/deploy/operations/ci/aws-1/variables.gen.tf
@@ -153,11 +153,10 @@ variable "aws_kubernetes_storage_class" {
 
   Depending on your use case, performance may be significantly improved with higher-tier storage classes, though this should be balanced against the associated costs.
 
-  Both CockroachDB and YugabyteDB recommend at least `gp3` for production workloads. Use `gp2` for testing only, or consider `io2` for high-throughput scenarios.
+  Both CockroachDB and YugabyteDB recommend at least `gp3` for production workloads. Consider `io2` for high-throughput scenarios.
 
   See https://www.cockroachlabs.com/docs/v24.1/recommended-production-settings#aws and https://docs.yugabyte.com/stable/deploy/checklist/#amazon-web-services-aws for database-specific recommendations.
 
-  Example: `gp3` for production and `gp2` for development.
   EOT
 }
 
diff --git a/docs/infrastructure/google-manual.md b/docs/infrastructure/google-manual.md
index 782e7efbe..cb69d55c2 100644
--- a/docs/infrastructure/google-manual.md
+++ b/docs/infrastructure/google-manual.md
@@ -326,7 +326,7 @@ your chosen provider.
         provider has some default storage classes that should work:
           - Google Cloud: `standard`
           - Azure: `default`
-          - AWS: `gp2`
+          - AWS: `gp3`
 
     1.  `VAR_INGRESS_NAME`: If using Google Kubernetes Engine, set this to the
         the name of the core-service static IP address created above (e.g.,
diff --git a/release/infrastructure/release-aws-dss-crdb.tfvars b/release/infrastructure/release-aws-dss-crdb.tfvars
index b0078cd09..528b01ba0 100644
--- a/release/infrastructure/release-aws-dss-crdb.tfvars
+++ b/release/infrastructure/release-aws-dss-crdb.tfvars
@@ -13,7 +13,7 @@ cluster_name                 = "dss-r-crdb"
 kubernetes_version           = 1.35
 node_count                   = 3
 aws_instance_type            = "m5.xlarge"
-aws_kubernetes_storage_class = "gp2"
+aws_kubernetes_storage_class = "gp3"
 
 # DSS configuration
 image = "${IMAGE}"
diff --git a/release/infrastructure/release-aws-dss-ybdb.tfvars b/release/infrastructure/release-aws-dss-ybdb.tfvars
index 12aacbed6..9057b5593 100644
--- a/release/infrastructure/release-aws-dss-ybdb.tfvars
+++ b/release/infrastructure/release-aws-dss-ybdb.tfvars
@@ -13,7 +13,7 @@ cluster_name                 = "dss-r-ybdb"
 kubernetes_version           = 1.35
 node_count                   = 3
 aws_instance_type            = "m5.xlarge"
-aws_kubernetes_storage_class = "gp2"
+aws_kubernetes_storage_class = "gp3"
 
 # DSS configuration
 image = "${IMAGE}"