diff --git a/terraform/modules/k8s-cluster/manager-node.tf b/terraform/modules/k8s-cluster/manager-node.tf
index d22958b..12f24fe 100644
--- a/terraform/modules/k8s-cluster/manager-node.tf
+++ b/terraform/modules/k8s-cluster/manager-node.tf
@@ -60,21 +60,26 @@ resource "hcloud_server" "manager" {
   allow_deprecated_images = false
   server_type             = var.server_type
   location                = element(var.locations.*.name, count.index)
+
   public_net {
     ipv4_enabled = var.create_loadbalancer ? false : true
     ipv4         = var.create_loadbalancer ? null : hcloud_primary_ip.ipv4_manager_address[count.index].id
     ipv6_enabled = true
     ipv6         = hcloud_primary_ip.ipv6_manager_address[count.index].id
   }
+
   ignore_remote_firewall_ids = false
   keep_disk                  = false
   placement_group_id         = data.hcloud_placement_group.default.id
+  firewall_ids               = [var.basic_firewall_id, var.k8s_firewall_id]
+  ssh_keys                   = [var.admin_ssh_key.id]
+  shutdown_before_deletion   = true
+
   labels = {
     "kubernetes" : "yes",
     "manager" : "yes"
   }
-  firewall_ids = [var.basic_firewall_id, var.k8s_firewall_id]
-  ssh_keys     = [var.admin_ssh_key.id]
+
   user_data = templatefile("${path.module}/templates/cloud-init-k8s.tftpl", {
     node_ip : var.private_node_ips[count.index],
     admin_public_ssh_key : format("%s %s", var.admin_ssh_key.public_key, var.admin_ssh_key.name),
@@ -86,7 +91,6 @@ resource "hcloud_server" "manager" {
       api_server_domain : local.kube_api_server_domain
     }))
   })
-  shutdown_before_deletion = true
 
   network {
     network_id = var.network_id
diff --git a/terraform/modules/k8s-cluster/worker-node.tf b/terraform/modules/k8s-cluster/worker-node.tf
index 133fb82..e5cc84f 100644
--- a/terraform/modules/k8s-cluster/worker-node.tf
+++ b/terraform/modules/k8s-cluster/worker-node.tf
@@ -50,12 +50,15 @@ resource "hcloud_server" "worker" {
   ignore_remote_firewall_ids = false
   keep_disk                  = false
   placement_group_id         = data.hcloud_placement_group.default.id
+  firewall_ids               = [var.basic_firewall_id, var.k8s_firewall_id]
+  ssh_keys                   = [var.admin_ssh_key.id]
+  shutdown_before_deletion   = true
+
   labels = {
     "kubernetes" : "yes",
     "worker" : "yes"
   }
-  firewall_ids = [var.basic_firewall_id, var.k8s_firewall_id]
-  ssh_keys     = [var.admin_ssh_key.id]
+
   user_data = templatefile("${path.module}/templates/cloud-init-k8s.tftpl", {
     node_ip : var.private_worker_node_ips[count.index],
     admin_public_ssh_key : format("%s %s", var.admin_ssh_key.public_key, var.admin_ssh_key.name),
@@ -67,7 +70,6 @@ resource "hcloud_server" "worker" {
       api_server_domain : local.kube_api_server_domain
     }))
   })
-  shutdown_before_deletion = true
 
   network {
     network_id = var.network_id