diff --git a/.terraform_commits b/.terraform_commits
new file mode 100644
index 0000000..ac8b9a1
--- /dev/null
+++ b/.terraform_commits
@@ -0,0 +1,38 @@
+[
+  {
+    "commit_hash": "4103f97c8464e786fafafcdab1f662391b5453f1",
+    "commit_message": "Refactor default.auto.tfvars and main.tf",
+    "author": "arnol377",
+    "timestamp": "2025-03-19T20:41:35.149386"
+  },
+  {
+    "commit_hash": "4103f97c8464e786fafafcdab1f662391b5453f1",
+    "commit_message": "Refactor default.auto.tfvars and main.tf",
+    "author": "arnol377",
+    "timestamp": "2025-03-20T17:24:21.832799"
+  },
+  {
+    "commit_hash": "4103f97c8464e786fafafcdab1f662391b5453f1",
+    "commit_message": "Refactor default.auto.tfvars and main.tf",
+    "author": "arnol377",
+    "timestamp": "2025-03-20T19:24:43.494765"
+  },
+  {
+    "commit_hash": "4103f97c8464e786fafafcdab1f662391b5453f1",
+    "commit_message": "Refactor default.auto.tfvars and main.tf",
+    "author": "arnol377",
+    "timestamp": "2025-03-27T14:27:43.832274"
+  },
+  {
+    "commit_hash": "4103f97c8464e786fafafcdab1f662391b5453f1",
+    "commit_message": "Refactor default.auto.tfvars and main.tf",
+    "author": "arnol377",
+    "timestamp": "2025-03-27T15:46:34.927126"
+  },
+  {
+    "commit_hash": "4103f97c8464e786fafafcdab1f662391b5453f1",
+    "commit_message": "Refactor default.auto.tfvars and main.tf",
+    "author": "arnol377",
+    "timestamp": "2025-03-27T16:21:05.154328"
+  }
+]
\ No newline at end of file
diff --git a/.vscode-server-insiders b/.vscode-server-insiders
new file mode 120000
index 0000000..bd90381
--- /dev/null
+++ b/.vscode-server-insiders
@@ -0,0 +1 @@
+/apps/terraform/workspaces/arnol377/.vscode-server-insiders/
\ No newline at end of file
diff --git a/default.auto.tfvars b/default.auto.tfvars
index 59bfda7..05e0979 100644
--- a/default.auto.tfvars
+++ b/default.auto.tfvars
@@ -1,6 +1,6 @@
 # The name of the ECS cluster
 image_name          = "github-runner"
-image_version       = "1.65.0"
+image_version       = "1.67.0"
 server_url          = "https://github.e.it.census.gov"
 create_vpc_endpoint = false
 create_ecs_cluster  = true
@@ -21,8 +21,9 @@ security_groups = [
 ]
 
 certs = {
-  bucket = "image-pipeline-assets"
+  bucket = "csvd-dev-ew-github-actions"
   key    = "katello-server-ca.pem"
 }
 
 aws_account = "csvd-dev-ew"
+repo_org    = "SCT-Engineering"
diff --git a/main.tf b/main.tf
index 6e4fca0..4b70aef 100644
--- a/main.tf
+++ b/main.tf
@@ -1,16 +1,16 @@
-data "aws_ecs_cluster" "github-runner" {
-  count        = var.create_ecs_cluster ? 0 : 1
-  cluster_name = "${var.ecs_cluster_name}-${data.aws_region.current.name}"
-}
-
-resource "aws_ecs_cluster" "github-runner" {
-  count = var.create_ecs_cluster ? 1 : 0
-  name  = "${var.ecs_cluster_name}-${data.aws_region.current.name}"
-}
-
-locals {
-  ecs_cluster = var.create_ecs_cluster ? one(aws_ecs_cluster.github-runner).name : one(data.aws_ecs_cluster.github-runner).cluster_name
-}
+# data "aws_ecs_cluster" "github-runner" {
+#   count        = var.create_ecs_cluster ? 0 : 1
+#   cluster_name = "${var.ecs_cluster_name}-${data.aws_region.current.name}"
+# }
+
+# resource "aws_ecs_cluster" "github-runner" {
+#   count = var.create_ecs_cluster ? 1 : 0
+#   name  = "${var.ecs_cluster_name}-${data.aws_region.current.name}"
+# }
+
+# locals {
+#   ecs_cluster = var.create_ecs_cluster ? one(aws_ecs_cluster.github-runner).name : one(data.aws_ecs_cluster.github-runner).cluster_name
+# }
 
 data "aws_ip_ranges" "ip_ranges" {
   regions  = ["us-gov-west-1", "us-gov-east-1"]
diff --git a/providers.tf b/providers.tf
index c27aad4..5657994 100644
--- a/providers.tf
+++ b/providers.tf
@@ -1,4 +1,24 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.70.0"
+    }
+  }
+}
+
 provider "github" {
   owner    = var.repo_org
   base_url = var.base_url
 }
+
+provider "aws" {
+  default_tags {
+    tags = {
+      finops_project_name   = "csvd_github_actions"
+      finops_project_number = "fs0000000078"
+      finops_project_role   = "csvd_github_actions"
+      organization         = "census:ocio:csvd"
+    }
+  }
+}
\ No newline at end of file
diff --git a/varfiles/csvd.tfvars b/varfiles/csvd.tfvars
index 6d75b89..dcb5f98 100644
--- a/varfiles/csvd.tfvars
+++ b/varfiles/csvd.tfvars
@@ -1,11 +1,18 @@
 namespace     = "csvd-ghe-runner"
 repo_org      = "CSVD"
-desired_count = 1
+desired_count = 3
 aws_account   = "cvsd-dev-ew"
 
 
 certs = {
-  bucket = "github-actions-assets-us-gov-west-1-229685449397"
+  bucket = "csvd-dev-ew-github-actions"
   key    = "katello-server-ca.pem"
 }
 
+# vpc_id = "vpc-0db4980aedac7ece5"
+# subnets = [
+#   "subnet-067d8fcf9da532c32"
+# ]
+# security_groups = [
+#   "sg-03cbf2a626ed55c7e"
+# ]
\ No newline at end of file
diff --git a/versions.tf b/versions.tf
deleted file mode 100644
index d17d3e9..0000000
--- a/versions.tf
+++ /dev/null
@@ -1,8 +0,0 @@
-terraform {
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "~> 5.70.0"
-    }
-  }
-}