diff --git a/services/terraform/self-host/aws_db.tf b/services/terraform/self-host/aws_db.tf
--- a/services/terraform/self-host/aws_db.tf
+++ b/services/terraform/self-host/aws_db.tf
@@ -2,7 +2,7 @@
 resource "aws_security_group" "keyserver_mariadb_security_group" {
   name        = "keyserver-mariadb-sg"
   description = "Allow inbound traffic on port 3307 and all outbound traffic"
-  vpc_id      = aws_vpc.default.id
+  vpc_id      = data.aws_vpc.default.id
 
   # Inbound rules
   ingress {
@@ -21,7 +21,6 @@
   }
 }
 
-
 # MariaDB RDS Instance
 resource "aws_db_instance" "mariadb" {
   allocated_storage      = 100
@@ -32,7 +31,6 @@
   engine                 = "mariadb"
   engine_version         = "10.11"
   instance_class         = "db.m6g.large"
-  db_subnet_group_name   = aws_db_subnet_group.public_db_subnet_group.name
   vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id]
   username               = var.mariadb_username
   password               = var.mariadb_password
diff --git a/services/terraform/self-host/aws_vpc.tf b/services/terraform/self-host/aws_vpc.tf
--- a/services/terraform/self-host/aws_vpc.tf
+++ b/services/terraform/self-host/aws_vpc.tf
@@ -1,54 +1,49 @@
 # VPC
-resource "aws_vpc" "default" {
-  cidr_block           = "172.31.0.0/16"
-  enable_dns_support   = true
-  enable_dns_hostnames = true
+#
+data "aws_vpc" "default" {
+  default = true
 }
 
 # Public Subnets
-resource "aws_subnet" "public_1" {
-  vpc_id                  = aws_vpc.default.id
-  cidr_block              = "172.31.0.0/20"
-  availability_zone       = var.availability_zone_1
-  map_public_ip_on_launch = true
-}
-
-resource "aws_subnet" "public_2" {
-  vpc_id                  = aws_vpc.default.id
-  cidr_block              = "172.31.16.0/20"
-  availability_zone       = var.availability_zone_2
-  map_public_ip_on_launch = true
+data "aws_subnets" "default" {
+  filter {
+    name   = "vpc-id"
+    values = [data.aws_vpc.default.id]
+  }
 }
 
 # Internet Gateway
-resource "aws_internet_gateway" "default" {
-  vpc_id = aws_vpc.default.id
+data "aws_internet_gateway" "default" {
+  filter {
+    name   = "attachment.vpc-id"
+    values = [data.aws_vpc.default.id]
+  }
 }
 
 # Route Table for Internet Gateway
 resource "aws_route_table" "public_igw_route_table" {
-  vpc_id = aws_vpc.default.id
+  vpc_id = data.aws_vpc.default.id
 
   route {
     cidr_block = "${var.allowed_ip}/32"
-    gateway_id = aws_internet_gateway.default.id
+    gateway_id = data.aws_internet_gateway.default.id
   }
 }
 
 resource "aws_route_table_association" "public_1_igw_route_association" {
-  subnet_id      = aws_subnet.public_1.id
+  subnet_id      = data.aws_subnets.default.ids[0]
   route_table_id = aws_route_table.public_igw_route_table.id
 }
 
 resource "aws_route_table_association" "public_2_igw_route_association" {
-  subnet_id      = aws_subnet.public_2.id
+  subnet_id      = data.aws_subnets.default.ids[1]
   route_table_id = aws_route_table.public_igw_route_table.id
 }
 
 # DB Subnet Group
 resource "aws_db_subnet_group" "public_db_subnet_group" {
   name       = "public-db-subnet-group"
-  subnet_ids = [aws_subnet.public_1.id, aws_subnet.public_2.id]
+  subnet_ids = [data.aws_subnets.default.ids[0], data.aws_subnets.default.ids[1]]
 
   tags = {
     Name = "DB subnet group associated with private vpc subnet"
diff --git a/services/terraform/self-host/variables.tf b/services/terraform/self-host/variables.tf
--- a/services/terraform/self-host/variables.tf
+++ b/services/terraform/self-host/variables.tf
@@ -20,15 +20,3 @@
   description = "IP address"
   type        = string
 }
-
-variable "availability_zone_1" {
-  description = "First availability zone for vpc subnet"
-  type        = string
-  default     = "us-west-1b"
-}
-
-variable "availability_zone_2" {
-  description = "Second availability zone for vpc subnet"
-  type        = string
-  default     = "us-west-1c"
-}