diff --git a/build/terraform b/build/terraform
index fa2c58ad4ed9..6f553a06931c 160000
--- a/build/terraform
+++ b/build/terraform
@@ -1 +1 @@
-Subproject commit fa2c58ad4ed9dcff4f9f1c14699b975891af18e4
+Subproject commit 6f553a06931cac11ad93964b97d015b74e8b4c30
diff --git a/build/terraform-beta b/build/terraform-beta
index fa1c85d4725b..cfe4642eeaba 160000
--- a/build/terraform-beta
+++ b/build/terraform-beta
@@ -1 +1 @@
-Subproject commit fa1c85d4725be7ec1bfe793aa85e070a65aec554
+Subproject commit cfe4642eeabac9c686dbaf69c5f577e4e812b81e
diff --git a/third_party/terraform/utils/node_config.go.erb b/third_party/terraform/utils/node_config.go.erb
index 5e6825a28a7d..cdfc4b214e4e 100644
--- a/third_party/terraform/utils/node_config.go.erb
+++ b/third_party/terraform/utils/node_config.go.erb
@@ -328,7 +328,9 @@ func expandNodeConfig(v interface{}) *containerBeta.NodeConfig {
 		tagsList := v.([]interface{})
 		tags := []string{}
 		for _, v := range tagsList {
-			tags = append(tags, v.(string))
+			if v != nil {
+				tags = append(tags, v.(string))
+			}
 		}
 		nc.Tags = tags
 	}