diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 00d6f30..a5efa5b 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -215,6 +215,28 @@ function print_ruby_args() {
     printf -- "--build-arg RUBY_DOWNLOAD_SHA256=%s " "$RUBY_DOWNLOAD_SHA256"
 }
 
+function print_gcloud_args() {
+    case "$1" in
+        383)
+            BAZELISK_VERSION=383.0.1
+            ;;
+        *) echo "Unknown gcloud version $1"; exit 1;
+    esac
+
+    printf -- "--build-arg GCLOUD_VERSION=%s " "$GCLOUD_VERSION"
+}
+
+function print_kubectl_args() {
+    case "$1" in
+        1.23)
+            BAZELISK_VERSION=1.23.0
+            ;;
+        *) echo "Unknown gcloud version $1"; exit 1;
+    esac
+
+    printf -- "--build-arg KUBECTL_VERSION=%s " "$KUBECTL_VERSION"
+}
+
 function parse_arguments() {
     printf -- "-f Dockerfile.custom "
 
@@ -239,6 +261,8 @@ function parse_arguments() {
                 GRAPHICSMAGICK) print_graphicsmagick_args $version ;;
                 PGBOUNCER) print_pgbouncer_args $version ;;
                 BAZELISK) print_bazelisk_args $version ;;
+                GCLOUD) print_gcloud_args $version ;;
+                KUBECTL) print_kubectl_args $version ;;
                 *) echo "unknown tool $tool"; exit 1;;
             esac
         fi