diff --git a/.github/workflows/test-quickstart.yml b/.github/workflows/test-quickstart.yml
index f1fa38699..bb622b378 100644
--- a/.github/workflows/test-quickstart.yml
+++ b/.github/workflows/test-quickstart.yml
@@ -30,6 +30,11 @@ jobs:
         shell: bash
         run: sudo apt-get update && sudo apt-get install --yes zsh
 
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.22.x'
+
       - name: Build and run a quickstart container image
         shell: bash
         run: ./quickstart/test/compose-test.zsh
diff --git a/dist/docker-images/cross-build/Dockerfile b/dist/docker-images/cross-build/Dockerfile
index 9507d7d80..6c5195907 100644
--- a/dist/docker-images/cross-build/Dockerfile
+++ b/dist/docker-images/cross-build/Dockerfile
@@ -5,7 +5,7 @@ FROM debian:bullseye-slim
 #
 
 ARG TARGETARCH
-ARG golang_version=1.21.5
+ARG golang_version=1.22.1
 ARG go_distribution_file=go${golang_version}.linux-${TARGETARCH}.tar.gz
 ARG go_path=/usr/share/go
 ARG go_root=/usr/local/go
diff --git a/quickstart/docker/all-in-one/README.md b/quickstart/docker/all-in-one/README.md
index 78f430c9d..c39a05ecb 100644
--- a/quickstart/docker/all-in-one/README.md
+++ b/quickstart/docker/all-in-one/README.md
@@ -101,7 +101,7 @@ Change `Dockerfile` like this, and run `ZITI_QUICK_TAG=local docker compose up -
 checked-out source tree and run the quickstart with the build.
 
 ```dockerfile
-FROM golang:1.21-bookworm AS builder
+FROM golang:1.22-bookworm AS builder
 ARG ARTIFACTS_DIR=./build
 WORKDIR /app
 COPY go.mod go.sum ./
diff --git a/quickstart/docker/createLocalImage.sh b/quickstart/docker/createLocalImage.sh
index e349c60b3..101e8db3c 100755
--- a/quickstart/docker/createLocalImage.sh
+++ b/quickstart/docker/createLocalImage.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
-set -euo pipefail
+
+set -o errexit
+set -o nounset
+set -o pipefail
+# set -o xtrace
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 ZITI_BIN="${SCRIPT_DIR}/image/ziti-bin"