diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index ad38055ad9..3c4484c710 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-a6712eddcac669dc248c4b9522d07575c9c6bdb5
+04630fe1705e7b18a0df0e620a08e5310dd9892b
diff --git a/common/scripts/kind_provisioner.sh b/common/scripts/kind_provisioner.sh
index 53ef360be4..9f53e65985 100644
--- a/common/scripts/kind_provisioner.sh
+++ b/common/scripts/kind_provisioner.sh
@@ -367,7 +367,7 @@ function install_metallb() {
   kubectl apply --kubeconfig="$KUBECONFIG" -f "${COMMON_SCRIPTS}/metallb.yaml"
   kubectl create --kubeconfig="$KUBECONFIG" secret generic -n metallb-system memberlist --from-literal=secretkey="$(openssl rand -base64 128)"
 
-  if [ -z "${METALLB_IPS4[*]}" ]; then
+  if [ -z "${METALLB_IPS4+x}" ]; then
     # Take IPs from the end of the docker kind network subnet to use for MetalLB IPs
     DOCKER_KIND_SUBNET="$(docker inspect kind | jq '.[0].IPAM.Config[0].Subnet' -r)"
     METALLB_IPS4=()
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 1b8e173fbf..5b0d670c38 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -73,7 +73,7 @@ fi
 
 # Build image to use
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-90202090a85fc6a345d57d99cb93b10c8bffa4f1
+  IMAGE_VERSION=master-814d918e5ddef9b6c11213252055e9d8da0a40dd
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools