diff --git a/components/image-builder-bob/leeway.Dockerfile b/components/image-builder-bob/leeway.Dockerfile
index 777be782fb0e1b..964b9e8a15a802 100644
--- a/components/image-builder-bob/leeway.Dockerfile
+++ b/components/image-builder-bob/leeway.Dockerfile
@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License.AGPL.txt in the project root for license information.
 
-FROM eu.gcr.io/gitpod-core-dev/build/buildkit:v0.12.2-gitpod.1
+FROM eu.gcr.io/gitpod-core-dev/build/buildkit:v0.12.5-gitpod.0
 
 USER root
 RUN apk --no-cache add sudo bash \
diff --git a/dev/preview/infrastructure/scripts/bootstrap-k3s.sh b/dev/preview/infrastructure/scripts/bootstrap-k3s.sh
index 6da84ea55b08e2..3ad6a110d707ee 100755
--- a/dev/preview/infrastructure/scripts/bootstrap-k3s.sh
+++ b/dev/preview/infrastructure/scripts/bootstrap-k3s.sh
@@ -26,6 +26,8 @@ export INSTALL_K3S_SKIP_DOWNLOAD=true
 # failing occasionally. Sleeping for a bit solves it.
 sleep 10
 
+# shellcheck disable=SC2154
+# shellcheck disable=SC2086
 kubectl label nodes ${vm_name} \
   gitpod.io/workload_meta=true \
   gitpod.io/workload_ide=true \
@@ -39,10 +41,13 @@ kubectl label nodes ${vm_name} \
 
 # apply fix from https://github.com/k3s-io/klipper-lb/issues/6 so we can use the klipper servicelb
 # this can be removed if https://github.com/gitpod-io/gitpod-packer-gcp-image/pull/20 gets merged
+# shellcheck disable=SC2002
+# shellcheck disable=SC1001
 cat /var/lib/gitpod/manifests/calico.yaml | sed s/__KUBERNETES_NODE_NAME__\"\,/__KUBERNETES_NODE_NAME__\",\ \"container_settings\"\:\ \{\ \"allow_ip_forwarding\"\:\ true\ \}\,/ >/var/lib/gitpod/manifests/calico2.yaml
 
 sed -i 's/docker.io/quay.io/g' /var/lib/gitpod/manifests/calico2.yaml
 sed -i 's/interface=ens/interface=en/g' /var/lib/gitpod/manifests/calico2.yaml
+# shellcheck disable=SC2016
 sed -i 's/\$CLUSTER_IP_RANGE/10.20.0.0\/16/g' /var/lib/gitpod/manifests/calico2.yaml
 
 kubectl apply -f /var/lib/gitpod/manifests/calico2.yaml