diff --git a/magnum.tf b/magnum.tf
index 8e7405e..e7b68bb 100644
--- a/magnum.tf
+++ b/magnum.tf
@@ -2,7 +2,7 @@ variable "worker_flavor" {
   type = map(any)
   default = {
     "codfw1dev" = "g3.cores1.ram2.disk20"
-    "eqiad1"    = "g3.cores8.ram32.disk20"
+    "eqiad1"    = "g3.cores1.ram2.disk20"
   }
 }
 variable "control_flavor" {
@@ -43,14 +43,14 @@ variable "image_name" {
 
 # T333874
 resource "openstack_containerinfra_cluster_v1" "k8s_123" {
-  name                = "testlabs-123"
+  name                = "tf-infra-test-123"
   cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_123.id
   master_count        = 1
   node_count          = 1
 }
 
 resource "openstack_containerinfra_clustertemplate_v1" "template_123" {
-  name                  = "testlabs-123"
+  name                  = "tf-infra-test-123"
   coe                   = "kubernetes"
   dns_nameserver        = "8.8.8.8"
   docker_storage_driver = "overlay2"
diff --git a/main.tf b/main.tf
index 0532742..b74f983 100644
--- a/main.tf
+++ b/main.tf
@@ -15,14 +15,14 @@ terraform {
 
 provider "openstack" {
   auth_url                      = var.auth-url[var.datacenter]
-  tenant_id                     = "testlabs"
+  tenant_id                     = "tf-infra-test"
   application_credential_id     = var.application_credential_id[var.datacenter]
   application_credential_secret = var.application_credential_secret[var.datacenter]
 }
 
 provider "cloudvps" {
   os_auth_url                      = var.auth-url[var.datacenter]
-  os_project_id                    = "testlabs"
+  os_project_id                    = "tf-infra-test"
   os_application_credential_id     = var.application_credential_id[var.datacenter]
   os_application_credential_secret = var.application_credential_secret[var.datacenter]
 }
diff --git a/secrets.tf b/secrets.tf
index 1e17eb7..f00fd54 100644
Binary files a/secrets.tf and b/secrets.tf differ
diff --git a/trove.tf b/trove.tf
index 001ed03..9d2d4d3 100644
--- a/trove.tf
+++ b/trove.tf
@@ -38,7 +38,7 @@ resource "openstack_db_instance_v1" "postgresql" {
   }
 
   user {
-    name      = "testlabs"
+    name      = "infra"
     host      = "%"
     password  = "notapassword"
     databases = ["tf-postgresql"]
@@ -65,7 +65,7 @@ resource "openstack_db_instance_v1" "mysql" {
   }
 
   user {
-    name      = "testlabs"
+    name      = "infra"
     host      = "%"
     password  = "notapassword"
     databases = ["tf-mysql"]
@@ -92,7 +92,7 @@ resource "openstack_db_instance_v1" "mariadb" {
   }
 
   user {
-    name      = "testlabs"
+    name      = "infra"
     host      = "%"
     password  = "notapassword"
     databases = ["tf-mariadb"]
diff --git a/vars.tf b/vars.tf
index 0306e3d..08424ea 100644
--- a/vars.tf
+++ b/vars.tf
@@ -15,6 +15,6 @@ variable "application_credential_id" {
   type = map(any)
   default = {
     "codfw1dev" = "<needed>"
-    "eqiad1"    = "ab79da04abd64da3ae563926eee7e66b"
+    "eqiad1"    = "53e844d312eb40fb9c837d9bcc469b27"
   }
 }
diff --git a/vm.tf b/vm.tf
index 92440b1..ee2dcfe 100644
--- a/vm.tf
+++ b/vm.tf
@@ -4,7 +4,7 @@ data "openstack_images_image_v2" "debian" {
 }
 
 resource "openstack_compute_instance_v2" "vm" {
-  name            = "testlabs-tf"
+  name            = "tf-infra-test"
   image_id        = data.openstack_images_image_v2.debian.id
   flavor_id       = "bb8bee7e-d8f9-460b-8344-74f745c139b9" # update to lookup?
   security_groups = ["${openstack_compute_secgroup_v2.secgroup.name}"]
diff --git a/web-proxy.tf b/web-proxy.tf
index 7c47245..946e3ef 100644
--- a/web-proxy.tf
+++ b/web-proxy.tf
@@ -1,4 +1,4 @@
 resource "cloudvps_web_proxy" "web_proxy" {
-  hostname = "testlabs-tf"
+  hostname = "tf-infra-test"
   backends = ["http://${resource.openstack_compute_instance_v2.vm.access_ip_v4}:8888"]
 }