diff --git a/main.tf b/main.tf
index b76b850..c6a2c2b 100644
--- a/main.tf
+++ b/main.tf
@@ -88,7 +88,7 @@ module "github-runner" {
   source      = "HappyPathway/github-runner/ecs"
   ecs_cluster = local.ecs_cluster.name
   hostname    = var.repo_org
-  image       = "229685449397.dkr.ecr.us-gov-west-1.amazonaws.com/github-runners/${var.image_name}:${var.image_version}"
+  image       = "${data.aws_caller_identity.current.account_id}.dkr.ecr.${data.aws_region.current.name}.amazonaws.com/github-runners/${var.image_name}:${var.image_version}"
   repo_org    = var.repo_org
   # repo_name    = each.value
   namespace = "${lower(var.repo_org)}-${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}"
diff --git a/varfiles/csvd-common-ew.tfvars b/varfiles/csvd-common-ew.tfvars
index 9939e6c..5fc9686 100644
--- a/varfiles/csvd-common-ew.tfvars
+++ b/varfiles/csvd-common-ew.tfvars
@@ -2,20 +2,22 @@ namespace = "csvd-common-ew"
 repo_org  = "CSVD"
 desired_count = 1
 create_ecs_cluster  = true
+# create_vpc_endpoint = false
+aws_account = "csvd-common-ew"
 
 ecs_cluster_name = "ecs-ghe-runners"
-vpc_id           = "vpc-0dac762f63574b185"
+vpc_id           = "vpc-0da08a2244f23b246"
 
 subnets = [
-  "subnet-0d22f390a0a024831"
+  "subnet-00b7920342b4c41f3"
 ]
 
 security_groups = [
-  # "sg-0d828d223df9834a6"
-  "sg-03da51877fddcd8f8"
+  "sg-00329ba6018f916b2"
 ]
 
 certs = {
-  bucket = "image-pipeline-assets-220615867784"
+  bucket = "image-pipeline-assets-220615867784-us-gov-west-1"
   key    = "katello-server-ca.pem"
 }
+