diff --git a/terraform/main.tf b/terraform/main.tf
index 4f6a8c1..ee7ad06 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -5,7 +5,7 @@ resource "proxmox_vm_qemu" "k3master" {
   count       = var.k3master.count
   ciuser      = "administrator"
   vmid        = "20${var.k3master.ip[count.index]}"
-  name        = var.k3master.name[count.index]
+  name        = "${var.k3master.name[count.index]}-${var.environment}"
   target_node = var.k3master.node[count.index]
   clone       = var.k3master.template
   qemu_os     = "other"
diff --git a/terraform/terraform.tfvars b/terraform/terraform.tfvars
index fd3be1b..fd3447b 100644
--- a/terraform/terraform.tfvars
+++ b/terraform/terraform.tfvars
@@ -9,19 +9,17 @@ k3master = {
   memory   = "4096"
   drive    = "20G"
   storage  = "ssd-domains"
-  template = var.template
   node     = ["overlord"]
   ip       = ["10"]
 }
 
 k3server = {
-  count    = 2
-  name     = ["node01", "node02"]
+  count    = 3
+  name     = ["node01", "node02", "node03"]
   cores    = 4
   memory   = "4096"
   drive    = "60G"
   storage  = "ssd-domains"
-  template = var.template
   node     = ["mothership", "mothership"]
   ip       = ["20", "21"]
 }
diff --git a/terraform/variables.tf b/terraform/variables.tf
index f572e08..88786b3 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -24,6 +24,12 @@ variable "pm_user" {
   default     = "root@pam"
 }
 
+variable "template: {
+    description = "Default Template to clone from"
+    type        = string
+    default     = "Debian12-Template" 
+}
+
 variable "k3master" {
   description = "Defaults of master nodes in K3S"
   type = object({
@@ -33,7 +39,6 @@ variable "k3master" {
     memory   = number
     drive    = string
     storage  = string
-    template = string
     node     = list(string)
     ip       = list(number)
   })
@@ -48,7 +53,6 @@ variable "k3server" {
     memory   = number
     drive    = string
     storage  = string
-    template = string
     node     = list(string)
     ip       = list(number)
   })