diff --git a/tf/environments/dev/main.tf b/tf/environments/dev/main.tf
index 84de383f..5d1f9e64 100644
--- a/tf/environments/dev/main.tf
+++ b/tf/environments/dev/main.tf
@@ -159,8 +159,8 @@ module "oonipg" {
   # With 1GiB of ram you get ~112 connections:
   # 1074000000 / 9531392 = 112.68
   db_instance_class        = "db.t4g.micro" # 2GiB => ~224 max_connections
-  db_storage_type          = "standard"
-  db_allocated_storage     = "5"
+  db_storage_type          = "gp3"
+  db_allocated_storage     = "20"
   db_max_allocated_storage = null
 
   allow_cidr_blocks = [
diff --git a/tf/modules/postgresql/variables.tf b/tf/modules/postgresql/variables.tf
index 7637d517..2bc52a3f 100644
--- a/tf/modules/postgresql/variables.tf
+++ b/tf/modules/postgresql/variables.tf
@@ -40,7 +40,7 @@ variable "db_allocated_storage" {
 }
 
 variable "db_storage_type" {
-  default = "standard"
+  default = "gp3"
 }
 
 variable "db_max_allocated_storage" {
@@ -48,7 +48,7 @@ variable "db_max_allocated_storage" {
 }
 
 variable "db_engine_version" {
-  default = "16.8"
+  default = "16.13"
 }
 
 variable "db_parameter_group" {