diff --git a/.gitlab-ci/terraform.yml b/.gitlab-ci/terraform.yml
index 6810cfb6deff374da85b40ef99541cbcfeca2787..9f496d325ebbafc2273705d629ad6c13369b9de4 100644
--- a/.gitlab-ci/terraform.yml
+++ b/.gitlab-ci/terraform.yml
@@ -72,7 +72,7 @@ tf-packet-ubuntu16-default:
     TF_VAR_number_of_k8s_nodes: "1"
     TF_VAR_plan_k8s_masters: t1.small.x86
     TF_VAR_plan_k8s_nodes: t1.small.x86
-    TF_VAR_facility: "ewr1"
+    TF_VAR_facilities: '["ewr1"]'
     TF_VAR_public_key_path: ""
     TF_VAR_operating_system: ubuntu_16_04
 
@@ -87,7 +87,7 @@ tf-packet-ubuntu18-default:
     TF_VAR_number_of_k8s_nodes: "1"
     TF_VAR_plan_k8s_masters: t1.small.x86
     TF_VAR_plan_k8s_nodes: t1.small.x86
-    TF_VAR_facility: "ams1"
+    TF_VAR_facilities: '["ams1"]'
     TF_VAR_public_key_path: ""
     TF_VAR_operating_system: ubuntu_18_04
 
diff --git a/contrib/terraform/packet/kubespray.tf b/contrib/terraform/packet/kubespray.tf
index ac48f818a6908a7f3666e39e2bfd70c7d9a98ed4..75b58e927b1e46f0fcdf2ce69b84db35065df7ae 100644
--- a/contrib/terraform/packet/kubespray.tf
+++ b/contrib/terraform/packet/kubespray.tf
@@ -13,7 +13,7 @@ resource "packet_device" "k8s_master" {
   count            = "${var.number_of_k8s_masters}"
   hostname         = "${var.cluster_name}-k8s-master-${count.index+1}"
   plan             = "${var.plan_k8s_masters}"
-  facility         = "${var.facility}"
+  facilities       = "${var.facilities}"
   operating_system = "${var.operating_system}"
   billing_cycle    = "${var.billing_cycle}"
   project_id       = "${var.packet_project_id}"
@@ -26,7 +26,7 @@ resource "packet_device" "k8s_master_no_etcd" {
   count            = "${var.number_of_k8s_masters_no_etcd}"
   hostname         = "${var.cluster_name}-k8s-master-${count.index+1}"
   plan             = "${var.plan_k8s_masters_no_etcd}"
-  facility         = "${var.facility}"
+  facilities       = "${var.facilities}"
   operating_system = "${var.operating_system}"
   billing_cycle    = "${var.billing_cycle}"
   project_id       = "${var.packet_project_id}"
@@ -39,7 +39,7 @@ resource "packet_device" "k8s_etcd" {
   count            = "${var.number_of_etcd}"
   hostname         = "${var.cluster_name}-etcd-${count.index+1}"
   plan             = "${var.plan_etcd}"
-  facility         = "${var.facility}"
+  facilities       = "${var.facilities}"
   operating_system = "${var.operating_system}"
   billing_cycle    = "${var.billing_cycle}"
   project_id       = "${var.packet_project_id}"
@@ -52,7 +52,7 @@ resource "packet_device" "k8s_node" {
   count            = "${var.number_of_k8s_nodes}"
   hostname         = "${var.cluster_name}-k8s-node-${count.index+1}"
   plan             = "${var.plan_k8s_nodes}"
-  facility         = "${var.facility}"
+  facilities       = "${var.facilities}"
   operating_system = "${var.operating_system}"
   billing_cycle    = "${var.billing_cycle}"
   project_id       = "${var.packet_project_id}"
diff --git a/contrib/terraform/packet/sample-inventory/cluster.tf b/contrib/terraform/packet/sample-inventory/cluster.tf
index 2482194cff6801e48c78c1a43b7cb19215d608c3..a17b7a69627e5fea57bd0f48ca032f53aeb2bc99 100644
--- a/contrib/terraform/packet/sample-inventory/cluster.tf
+++ b/contrib/terraform/packet/sample-inventory/cluster.tf
@@ -10,7 +10,7 @@ packet_project_id = "Example-API-Token"
 public_key_path = "~/.ssh/id_rsa.pub"
 
 # cluster location
-facility = "ewr1"
+facilities = ["ewr1"]
 
 # standalone etcds
 number_of_etcd = 0
diff --git a/contrib/terraform/packet/variables.tf b/contrib/terraform/packet/variables.tf
index e71b78bbfa4c54c2657c6e19d6f84af652498d51..0d28fee31ffcbff0c5a2bd895ef973a822b1279b 100644
--- a/contrib/terraform/packet/variables.tf
+++ b/contrib/terraform/packet/variables.tf
@@ -19,8 +19,8 @@ variable "billing_cycle" {
   default = "hourly"
 }
 
-variable "facility" {
-  default = "dfw2"
+variable "facilities" {
+  default = ["dfw2"]
 }
 
 variable "plan_k8s_masters" {
diff --git a/contrib/terraform/terraform.py b/contrib/terraform/terraform.py
index 22f98a314f1104927ee9d396d2b6b7e9832b0cbd..c4899e9e16f95e6350b4b3088e0373a1f7a49d09 100755
--- a/contrib/terraform/terraform.py
+++ b/contrib/terraform/terraform.py
@@ -157,7 +157,7 @@ def packet_device(resource, tfvars=None):
 
     attrs = {
         'id': raw_attrs['id'],
-        'facility': raw_attrs['facility'],
+        'facilities': parse_list(raw_attrs, 'facilities']),
         'hostname': raw_attrs['hostname'],
         'operating_system': raw_attrs['operating_system'],
         'locked': parse_bool(raw_attrs['locked']),
@@ -178,7 +178,7 @@ def packet_device(resource, tfvars=None):
     }
 
     # add groups based on attrs
-    groups.append('packet_facility=' + attrs['facility'])
+    groups.append('packet_facilities=' + attrs['facilities'])
     groups.append('packet_operating_system=' + attrs['operating_system'])
     groups.append('packet_locked=%s' % attrs['locked'])
     groups.append('packet_state=' + attrs['state'])
diff --git a/roles/kubernetes-apps/policy_controller/calico/tasks/main.yml b/roles/kubernetes-apps/policy_controller/calico/tasks/main.yml
index 3dfbf0a3795ab95a654b48ad6b02fe27e4824ff0..1f262affa8fc4601c8abc7c603b33e346a6a4ebe 100644
--- a/roles/kubernetes-apps/policy_controller/calico/tasks/main.yml
+++ b/roles/kubernetes-apps/policy_controller/calico/tasks/main.yml
@@ -36,4 +36,4 @@
     - inventory_hostname == groups['kube-master'][0]
     - not item is skipped
   loop_control:
-    label: "{{ item.item.file }}"
\ No newline at end of file
+    label: "{{ item.item.file }}"
diff --git a/tests/files/gce_centos7-flannel-addons.yml b/tests/files/gce_centos7-flannel-addons.yml
index 7a2cfb640fdbf896c0cc9b409945bdcd97498579..d430d8436de5561969f3d9f668e5fc945e6f10a9 100644
--- a/tests/files/gce_centos7-flannel-addons.yml
+++ b/tests/files/gce_centos7-flannel-addons.yml
@@ -20,7 +20,8 @@ cloud_provider: gce
 kube_encrypt_secret_data: true
 # ingress_nginx_enabled: true
 cert_manager_enabled: true
-metrics_server_enabled: true
+# Disabled temporarily
+metrics_server_enabled: false
 kube_token_auth: true
 kube_basic_auth: true
 enable_nodelocaldns: false
diff --git a/tests/files/packet_centos7-flannel-addons.yml b/tests/files/packet_centos7-flannel-addons.yml
index fd75df3daa3f4d4ee4324646f7029e96e5fd4b85..451f414e8ea1995c6f02920dbf8a90989499427d 100644
--- a/tests/files/packet_centos7-flannel-addons.yml
+++ b/tests/files/packet_centos7-flannel-addons.yml
@@ -17,7 +17,8 @@ dns_min_replicas: 1
 kube_encrypt_secret_data: true
 ingress_nginx_enabled: true
 cert_manager_enabled: true
-metrics_server_enabled: true
+# Disabled temporarily
+metrics_server_enabled: false
 kube_token_auth: true
 kube_basic_auth: true
 enable_nodelocaldns: false