diff --git a/control_plane/main.tf b/control_plane/main.tf
index fe8f8d7..c75b84c 100644
--- a/control_plane/main.tf
+++ b/control_plane/main.tf
@@ -42,6 +42,14 @@ locals {
 
 resource "random_id" "cluster_suffix" {
   byte_length = 4
+  keepers = {
+    # Regenerate when any of these values change
+    cluster_name  = var.cluster_name
+    memory_mb     = var.memory_mb
+    vcpu_count    = var.vcpu_count
+    talos_version = var.talos_version
+    cleanup_script_hash = filesha1("${path.module}/cleanup.sh")
+  }
 }
 
 resource "null_resource" "talos_cluster" {
@@ -88,8 +96,8 @@ resource "null_resource" "talos_cluster" {
         --cpus ${self.triggers.vcpu_count}
 
       # Change ownership of the generated files in ~/.talos and ~/.kube
-      sudo chown -R $(id -u):$(id -g) $(HOME)/.talos
-      sudo chown -R $(id -u):$(id -g) $(HOME)/.kube
+      sudo chown -R $(id -u):$(id -g) $HOME/.talos
+      sudo chown -R $(id -u):$(id -g) $HOME/.kube
     EOT
   }
 
diff --git a/control_plane/terraform.tfvars b/control_plane/terraform.tfvars
index 301dd27..c9ac209 100644
--- a/control_plane/terraform.tfvars
+++ b/control_plane/terraform.tfvars
@@ -1,5 +1,5 @@
 # You can customize these values
-cluster_name = "evo-npcs-infra"
+cluster_name = "evo-npcs-clust"
 memory_mb    = 2048
 vcpu_count   = 2
 talos_version = "v1.11.1"
\ No newline at end of file