diff --git a/java/google/registry/proxy/terraform/modules/gke/cluster.tf b/java/google/registry/proxy/terraform/modules/gke/cluster.tf
index fa91ba6db..19f53ef86 100644
--- a/java/google/registry/proxy/terraform/modules/gke/cluster.tf
+++ b/java/google/registry/proxy/terraform/modules/gke/cluster.tf
@@ -33,8 +33,8 @@ resource "google_container_cluster" "proxy_cluster" {
     }
 
     management {
-      auto_repair  = true
-      auto_upgrade = true
+      auto_repair  = "true"
+      auto_upgrade = "true"
     }
   }
 }
diff --git a/java/google/registry/proxy/terraform/modules/gke/input.tf b/java/google/registry/proxy/terraform/modules/gke/variables.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/gke/input.tf
rename to java/google/registry/proxy/terraform/modules/gke/variables.tf
diff --git a/java/google/registry/proxy/terraform/modules/networking/input.tf b/java/google/registry/proxy/terraform/modules/networking/variables.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/networking/input.tf
rename to java/google/registry/proxy/terraform/modules/networking/variables.tf
diff --git a/java/google/registry/proxy/terraform/modules/input.tf b/java/google/registry/proxy/terraform/modules/variables.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/input.tf
rename to java/google/registry/proxy/terraform/modules/variables.tf
diff --git a/java/google/registry/proxy/terraform/update_named_ports.sh b/java/google/registry/proxy/terraform/update_named_ports.sh
index 238417e37..f24e869cb 100755
--- a/java/google/registry/proxy/terraform/update_named_ports.sh
+++ b/java/google/registry/proxy/terraform/update_named_ports.sh
@@ -25,6 +25,6 @@ CANARY_PORTS="whois-canary:31001,epp-canary:31002,"\
 while read line
 do
   gcloud compute instance-groups set-named-ports --named-ports \
-    ${PROD_PORTS},${CANARY_PORTS} $line
+    "${PROD_PORTS}","${CANARY_PORTS}" "$line"
 done < <(terraform output proxy_instance_groups | awk '{print $3}' | \
   awk -F '/' '{print "--project", $7, "--zone", $9, $11}')