diff --git a/control_plane/cleanup.sh b/control_plane/cleanup.sh
index d560b46..9418b04 100644
--- a/control_plane/cleanup.sh
+++ b/control_plane/cleanup.sh
@@ -2,11 +2,14 @@
 cluster_name="$1"
 echo "Starting cleanup for cluster: $cluster_name"
 
+sudo chown -R $(id -u):$(id -g) $(HOME)/.talos
+sudo chown -R $(id -u):$(id -g) $(HOME)/.kube
+
 sudo --preserve-env=HOME talosctl cluster destroy \
     --provisioner=qemu \
     --name $cluster_name || true
 
-sudo ifconfig bridge0 destroy || true
+sudo pkill -9 -f qemu-system
 
 # Remove kubeconfig entries
 kubectl config delete-context "$cluster_name" || true
diff --git a/control_plane/main.tf b/control_plane/main.tf
index 83d141d..5991e37 100644
--- a/control_plane/main.tf
+++ b/control_plane/main.tf
@@ -84,8 +84,8 @@ resource "null_resource" "talos_cluster" {
         --cpus ${self.triggers.vcpu_count}
 
       # Change ownership of the generated files in ~/.talos and ~/.kube
-      sudo chown -R $(whoami):admin $(HOME)/.talos
-      sudo chown -R $(whoami):admin $(HOME)/.kube
+      sudo chown -R $(id -u):$(id -g) $(HOME)/.talos
+      sudo chown -R $(id -u):$(id -g) $(HOME)/.kube
     EOT
   }