diff --git a/terraform/inputs.tf b/terraform/inputs.tf
index 4f977e9..cec5898 100644
--- a/terraform/inputs.tf
+++ b/terraform/inputs.tf
@@ -18,12 +18,12 @@ data "terraform_remote_state" "org" {
 #  }
 #}
 
-data "terraform_remote_state" "dns" {
+data "terraform_remote_state" "infra_aws" {
   backend = "remote"
   config = {
     organization = "wallet-connect"
     workspaces = {
-      name = "dns-delegation"
+      name = "infra-aws"
     }
   }
 }
diff --git a/terraform/res_application.tf b/terraform/res_application.tf
index 7483d47..286a767 100644
--- a/terraform/res_application.tf
+++ b/terraform/res_application.tf
@@ -1,5 +1,5 @@
 data "aws_s3_bucket" "geoip" {
-  bucket = "keyserver.${module.this.stage}.geoip.database.private.walletconnect"
+  bucket = data.terraform_remote_state.infra_aws.outputs.geoip_bucked_id
 }
 
 # ECS Cluster, Task, Service, and Load Balancer for our app
diff --git a/terraform/res_dns.tf b/terraform/res_dns.tf
index d157a10..73fcc12 100644
--- a/terraform/res_dns.tf
+++ b/terraform/res_dns.tf
@@ -1,5 +1,5 @@
 locals {
-  zones              = { for k, v in tomap(data.terraform_remote_state.dns.outputs.zones.keyserver[local.stage]) : v.id => v.name }
+  zones              = { for k, v in tomap(data.terraform_remote_state.infra_aws.outputs.zones.keyserver[local.stage]) : v.id => v.name }
   zones_certificates = { for k, v in module.dns_certificate : v.zone_id => v.certificate_arn }
 }