diff --git a/aws/_modules/eks/vpc.tf b/aws/_modules/eks/vpc.tf
index b52c36e7..1d3dfde7 100644
--- a/aws/_modules/eks/vpc.tf
+++ b/aws/_modules/eks/vpc.tf
@@ -40,7 +40,7 @@ resource "aws_eip" "nat_gw" {
 
   tags = local.eks_metadata_tags
 
-  vpc = true
+  domain = "vpc"
 }
 
 resource "aws_nat_gateway" "current" {
diff --git a/azurerm/_modules/aks/service_principal.tf b/azurerm/_modules/aks/service_principal.tf
index 13429595..4dec3756 100644
--- a/azurerm/_modules/aks/service_principal.tf
+++ b/azurerm/_modules/aks/service_principal.tf
@@ -7,7 +7,7 @@ resource "azuread_application" "current" {
 resource "azuread_service_principal" "current" {
   count = var.disable_managed_identities == true ? 1 : 0
 
-  application_id = azuread_application.current[0].application_id
+  client_id = azuread_application.current[0].client_id
 }
 
 resource "azuread_service_principal_password" "current" {
diff --git a/google/_modules/gke/node_pool/main.tf b/google/_modules/gke/node_pool/main.tf
index ae2c6f47..33502341 100644
--- a/google/_modules/gke/node_pool/main.tf
+++ b/google/_modules/gke/node_pool/main.tf
@@ -49,7 +49,15 @@ resource "google_container_node_pool" "current" {
       }
     }
 
-    taint = var.taint
+    dynamic "taint" {
+      for_each = var.taints == null ? [] : var.taints
+
+      content {
+        key    = taint.key
+        value  = taint.value
+        effect = taint.effect
+      }
+    }
   }
 
   management {
diff --git a/google/_modules/gke/node_pool/variables.tf b/google/_modules/gke/node_pool/variables.tf
index 397ad6d0..154bee34 100644
--- a/google/_modules/gke/node_pool/variables.tf
+++ b/google/_modules/gke/node_pool/variables.tf
@@ -109,10 +109,14 @@ variable "node_workload_metadata_config" {
   type        = string
 }
 
-variable "taint" {
+variable "taints" {
+  type = set(object({
+    key    = string
+    value  = string
+    effect = string
+  }))
   description = "Taints to configure for the node pool."
-  type        = list(any)
-  default     = []
+  default     = null
 }
 
 variable "node_locations" {
diff --git a/google/cluster/node-pool/configuration.tf b/google/cluster/node-pool/configuration.tf
index 91f66c7a..c12077dc 100644
--- a/google/cluster/node-pool/configuration.tf
+++ b/google/cluster/node-pool/configuration.tf
@@ -30,7 +30,7 @@ locals {
   auto_repair  = local.cfg["auto_repair"] != null ? local.cfg["auto_repair"] : true
   auto_upgrade = local.cfg["auto_upgrade"] != null ? local.cfg["auto_upgrade"] : true
 
-  taint = local.cfg["taint"]
+  taints = local.cfg["taints"]
 
   extra_oauth_scopes = local.cfg["extra_oauth_scopes"] != null ? local.cfg["extra_oauth_scopes"] : []
 
diff --git a/google/cluster/node-pool/main.tf b/google/cluster/node-pool/main.tf
index 8d13f06d..399eb1f1 100644
--- a/google/cluster/node-pool/main.tf
+++ b/google/cluster/node-pool/main.tf
@@ -30,7 +30,7 @@ module "node_pool" {
 
   node_workload_metadata_config = local.node_workload_metadata_config
 
-  taint = local.taint
+  taints = local.taints
 
   service_account_email                 = local.service_account_email
   disable_per_node_pool_service_account = local.service_account_email == null ? false : true
diff --git a/google/cluster/node-pool/variables.tf b/google/cluster/node-pool/variables.tf
index 68ec579d..2dc62dea 100644
--- a/google/cluster/node-pool/variables.tf
+++ b/google/cluster/node-pool/variables.tf
@@ -21,7 +21,7 @@ variable "configuration" {
     auto_repair  = optional(bool)
     auto_upgrade = optional(bool)
 
-    taint = optional(set(object({
+    taints = optional(set(object({
       key    = string
       value  = string
       effect = string