diff --git a/build/Makefile b/build/Makefile
index 5bdcb43fa7..77039e79f9 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -64,7 +64,7 @@ KIND_PROFILE ?= agones
 KIND_CONTAINER_NAME=$(KIND_PROFILE)-control-plane
 
 # Game Server image to use while doing end-to-end tests
-GS_TEST_IMAGE ?= us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+GS_TEST_IMAGE ?= us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
 
 # Enable all beta feature gates. Keep in sync with `true` (beta) entries in pkg/util/runtime/features.go:featureDefaults
 BETA_FEATURE_GATES ?= "CountsAndLists=true&DisableResyncOnSDKServer=true"
diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile
index e1d1bdd6bd..1558478ffd 100644
--- a/build/build-image/Dockerfile
+++ b/build/build-image/Dockerfile
@@ -28,7 +28,7 @@ RUN gem install fpm && \
 
 # install go
 WORKDIR /usr/local
-ENV GO_VERSION=1.21.6
+ENV GO_VERSION=1.21.12
 ENV GOPATH /go
 ENV GO111MODULE=on
 RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \
diff --git a/build/build-sdk-images/go/Dockerfile b/build/build-sdk-images/go/Dockerfile
index aed9539450..09cf3d35fc 100644
--- a/build/build-sdk-images/go/Dockerfile
+++ b/build/build-sdk-images/go/Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get --allow-releaseinfo-change update && \
 
 # install go
 WORKDIR /usr/local
-ENV GO_VERSION=1.21.6
+ENV GO_VERSION=1.21.12
 ENV GO111MODULE=on
 ENV GOPATH /go
 RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \
diff --git a/build/build-sdk-images/restapi/Dockerfile b/build/build-sdk-images/restapi/Dockerfile
index 77a21665c3..d170933999 100644
--- a/build/build-sdk-images/restapi/Dockerfile
+++ b/build/build-sdk-images/restapi/Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get --allow-releaseinfo-change update && \
 
 # install go
 WORKDIR /usr/local
-ENV GO_VERSION=1.21.6
+ENV GO_VERSION=1.21.12
 ENV GO111MODULE=on
 ENV GOPATH /go
 RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \
diff --git a/build/e2e-image/Dockerfile b/build/e2e-image/Dockerfile
index 237dbd5fac..6f3bd5fa85 100644
--- a/build/e2e-image/Dockerfile
+++ b/build/e2e-image/Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update && \
 
 # install go
 WORKDIR /usr/local
-ENV GO_VERSION=1.21.6
+ENV GO_VERSION=1.21.12
 ENV GOPATH /go
 ENV GO111MODULE=on
 RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \
diff --git a/build/report/cloudbuild.yaml b/build/report/cloudbuild.yaml
index d92d7de16d..9bdaf91baf 100644
--- a/build/report/cloudbuild.yaml
+++ b/build/report/cloudbuild.yaml
@@ -19,7 +19,7 @@ steps:
     id: build-report
     script: |
       #!/usr/bin/env bash
-      export GO_VERSION=1.21.6
+      export GO_VERSION=1.21.12
       cd /usr/local
       curl -SsL https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz | tar -xzf-
       export PATH=/usr/local/go/bin:${PATH}
diff --git a/examples/allocation-endpoint/Makefile b/examples/allocation-endpoint/Makefile
index 8946a287a4..d9468f7e8b 100644
--- a/examples/allocation-endpoint/Makefile
+++ b/examples/allocation-endpoint/Makefile
@@ -30,7 +30,7 @@ PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
 root_path = $(realpath $(project_path)/../..)
-version := 0.8
+version := 0.9
 ifeq ($(REPOSITORY),)
 	server_tag := allocation-endpoint-proxy:$(version)
 else
diff --git a/examples/allocation-endpoint/server/Dockerfile b/examples/allocation-endpoint/server/Dockerfile
index 19e7b9a842..89e96f6e47 100644
--- a/examples/allocation-endpoint/server/Dockerfile
+++ b/examples/allocation-endpoint/server/Dockerfile
@@ -14,7 +14,7 @@
 
 # syntax=docker/dockerfile:1
 
-FROM golang:1.20-alpine
+FROM golang:1.21-alpine
 
 WORKDIR /app
 
diff --git a/examples/allocation-endpoint/terraform/variable.tf b/examples/allocation-endpoint/terraform/variable.tf
index ce4ba30033..5406cd2140 100644
--- a/examples/allocation-endpoint/terraform/variable.tf
+++ b/examples/allocation-endpoint/terraform/variable.tf
@@ -20,7 +20,7 @@ variable "project_id" {
 variable "ae_proxy_image" {
   type        = string
   description = "The docker image of the allocation proxy."
-  default     = "us-docker.pkg.dev/agones-images/examples/allocation-endpoint-proxy:0.8"
+  default     = "us-docker.pkg.dev/agones-images/examples/allocation-endpoint-proxy:0.9"
 }
 
 variable "region" {
diff --git a/examples/autoscaler-webhook/Dockerfile b/examples/autoscaler-webhook/Dockerfile
index bead2cf135..4c70d07b67 100644
--- a/examples/autoscaler-webhook/Dockerfile
+++ b/examples/autoscaler-webhook/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Gather dependencies and build the executable
-FROM golang:1.21.6 as builder
+FROM golang:1.21.12 as builder
 WORKDIR /go/src
 COPY . agones.dev/agones
 
diff --git a/examples/autoscaler-webhook/Makefile b/examples/autoscaler-webhook/Makefile
index 22a58d7f0d..bbc1e39b90 100644
--- a/examples/autoscaler-webhook/Makefile
+++ b/examples/autoscaler-webhook/Makefile
@@ -29,7 +29,7 @@ PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
 root_path := $(realpath $(project_path)/../..)
-version := 0.13
+version := 0.14
 ifeq ($(REPOSITORY),)
 	autoscaler_webhook_tag := autoscaler-webhook:$(version)
 else
diff --git a/examples/autoscaler-webhook/autoscaler-service-tls.yaml b/examples/autoscaler-webhook/autoscaler-service-tls.yaml
index dca068b3dc..36fbb30e10 100644
--- a/examples/autoscaler-webhook/autoscaler-service-tls.yaml
+++ b/examples/autoscaler-webhook/autoscaler-service-tls.yaml
@@ -54,7 +54,7 @@ spec:
             secretName: autoscalersecret
       containers:
         - name: autoscaler-webhook
-          image: us-docker.pkg.dev/agones-images/examples/autoscaler-webhook:0.13
+          image: us-docker.pkg.dev/agones-images/examples/autoscaler-webhook:0.14
           imagePullPolicy: Always
           volumeMounts:
             - mountPath: /home/service/certs
diff --git a/examples/autoscaler-webhook/autoscaler-service.yaml b/examples/autoscaler-webhook/autoscaler-service.yaml
index 3faba2ca40..eb5842a764 100644
--- a/examples/autoscaler-webhook/autoscaler-service.yaml
+++ b/examples/autoscaler-webhook/autoscaler-service.yaml
@@ -50,7 +50,7 @@ spec:
       # serviceAccount: autoscaler-webhook
       containers:
         - name: autoscaler-webhook
-          image: us-docker.pkg.dev/agones-images/examples/autoscaler-webhook:0.13
+          image: us-docker.pkg.dev/agones-images/examples/autoscaler-webhook:0.14
           imagePullPolicy: Always
           ports:
             - name: autoscaler
diff --git a/examples/crd-client/Dockerfile b/examples/crd-client/Dockerfile
index f150213762..7a37911782 100644
--- a/examples/crd-client/Dockerfile
+++ b/examples/crd-client/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Gather dependencies and build the executable
-FROM golang:1.21.6 as builder
+FROM golang:1.21.12 as builder
 WORKDIR /go/src/crd-client
 COPY . .
 
diff --git a/examples/crd-client/Makefile b/examples/crd-client/Makefile
index 1687327432..ab926e63e8 100644
--- a/examples/crd-client/Makefile
+++ b/examples/crd-client/Makefile
@@ -25,7 +25,7 @@
 
 REPOSITORY ?=
 PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
-version := 0.16
+version := 0.17
 ifeq ($(REPOSITORY),)
 	server_tag := crd-client:$(version)
 else
diff --git a/examples/crd-client/create-gs.yaml b/examples/crd-client/create-gs.yaml
index 6e3ff58987..01511999b4 100644
--- a/examples/crd-client/create-gs.yaml
+++ b/examples/crd-client/create-gs.yaml
@@ -34,9 +34,9 @@ spec:
               cpu: 500m
               ephemeral-storage: 1Gi
               memory: 2Gi
-          image: us-docker.pkg.dev/agones-images/examples/crd-client:0.16
+          image: us-docker.pkg.dev/agones-images/examples/crd-client:0.17
           imagePullPolicy: Always
           env:
             - name: GAMESERVER_IMAGE
-              value: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+              value: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
       restartPolicy: Never
diff --git a/examples/custom-controller/Dockerfile b/examples/custom-controller/Dockerfile
index ed9c3a64f8..430e0cfdf3 100644
--- a/examples/custom-controller/Dockerfile
+++ b/examples/custom-controller/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Gather dependencies and build the executable
-FROM golang:1.21.6 as builder
+FROM golang:1.21.12 as builder
 WORKDIR /go/src/custom-controller
 COPY . .
 
diff --git a/examples/custom-controller/Makefile b/examples/custom-controller/Makefile
index 3087a22085..9522aba256 100644
--- a/examples/custom-controller/Makefile
+++ b/examples/custom-controller/Makefile
@@ -25,7 +25,7 @@
 
 REPOSITORY ?=
 PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
-version := 0.4
+version := 0.5
 ifeq ($(REPOSITORY),)
 	server_tag := custom-controller:$(version)
 else
diff --git a/examples/custom-controller/deployment.yaml b/examples/custom-controller/deployment.yaml
index 3865211d30..831e53d74b 100644
--- a/examples/custom-controller/deployment.yaml
+++ b/examples/custom-controller/deployment.yaml
@@ -64,5 +64,5 @@ spec:
       serviceAccountName: custom-controller-sa
       containers:
         - name: custom-controller
-          image: us-docker.pkg.dev/agones-images/examples/custom-controller:0.4
+          image: us-docker.pkg.dev/agones-images/examples/custom-controller:0.5
           imagePullPolicy: Always
diff --git a/examples/fleet.yaml b/examples/fleet.yaml
index f1a64f82f1..5749d8dc2e 100644
--- a/examples/fleet.yaml
+++ b/examples/fleet.yaml
@@ -109,4 +109,4 @@ spec:
         spec:
           containers:
             - name: simple-game-server
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
diff --git a/examples/gameserver.yaml b/examples/gameserver.yaml
index 1f20062748..41e805d1af 100644
--- a/examples/gameserver.yaml
+++ b/examples/gameserver.yaml
@@ -121,7 +121,7 @@ spec:
     spec:
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
           imagePullPolicy: Always
           # nodeSelector is a label that can be used to tell Kubernetes which host
           # OS to use. For Windows game servers uncomment the nodeSelector
diff --git a/examples/simple-game-server/Dockerfile b/examples/simple-game-server/Dockerfile
index 1b1542fb75..4766236cef 100644
--- a/examples/simple-game-server/Dockerfile
+++ b/examples/simple-game-server/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # build
-FROM golang:1.21.6 as builder
+FROM golang:1.21.12 as builder
 WORKDIR /go/src
 COPY . agones.dev/agones
 
diff --git a/examples/simple-game-server/Dockerfile.windows b/examples/simple-game-server/Dockerfile.windows
index 73144d2ecb..690d0d2d50 100644
--- a/examples/simple-game-server/Dockerfile.windows
+++ b/examples/simple-game-server/Dockerfile.windows
@@ -19,9 +19,8 @@
 
 # Build Stage
 ARG WINDOWS_VERSION=ltsc2019
-ARG IMAGE_TAG=""
 
-FROM --platform=linux/amd64 golang:1.21.6 as builder
+FROM --platform=linux/amd64 golang:1.21.12 as builder
 WORKDIR /go/src
 COPY . agones.dev/agones
 
@@ -30,7 +29,7 @@ WORKDIR /go/src/agones.dev/agones/examples/simple-game-server
 RUN GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -o simple-game-server.exe *.go
 
 RUN ls -ltr /go/src/agones.dev/agones/examples/simple-game-server
-FROM mcr.microsoft.com/windows/servercore:${WINDOWS_VERSION}${IMAGE_TAG}
+FROM mcr.microsoft.com/windows/servercore:${WINDOWS_VERSION}
 
 WORKDIR /
 
diff --git a/examples/simple-game-server/Makefile b/examples/simple-game-server/Makefile
index a1a97073a4..81050a6d0d 100644
--- a/examples/simple-game-server/Makefile
+++ b/examples/simple-game-server/Makefile
@@ -31,9 +31,6 @@ BUILDX_WINDOWS_BUILDER = windows-builder
 # GKE-Windows version map: https://cloud.google.com/kubernetes-engine/docs/how-to/creating-a-cluster-windows#version_mapping
 WINDOWS_VERSIONS = ltsc2019 ltsc2022
 
-# https://github.com/microsoft/Windows-Containers/issues/493: Pin the LTSC2019 image to an older sha
-LTSC2019_IMAGE_TAG = "@sha256:6fdf140282a2f809dae9b13fe441635867f0a27c33a438771673b8da8f3348a4"
-
 WINDOWS_DOCKER_PUSH_ARGS = # When pushing set to --push.
 # Build with Windows support
 WITH_WINDOWS ?= 1
@@ -42,7 +39,7 @@ WITH_ARM64 ?= 1
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-version := 0.33
+version := 0.34
 ifeq ($(REPOSITORY),)
 	server_tag := simple-game-server:$(version)
 else
@@ -112,7 +109,7 @@ push-windows-image-%:
 build-windows-image-%: ensure-windows-buildx
 	cd $(root_path) && DOCKER_CLI_EXPERIMENTAL=enabled \
 		docker buildx build --platform windows/amd64 --builder $(BUILDX_WINDOWS_BUILDER) -f $(project_path)Dockerfile.windows \
-	 	--tag=$(server_tag)-windows_amd64-$* --build-arg WINDOWS_VERSION=$* --build-arg IMAGE_TAG=$(if $(filter ltsc2019,$*),$(LTSC2019_IMAGE_TAG),) . $(WINDOWS_DOCKER_PUSH_ARGS)
+	 	--tag=$(server_tag)-windows_amd64-$* --build-arg WINDOWS_VERSION=$* . $(WINDOWS_DOCKER_PUSH_ARGS)
 
 ensure-windows-buildx:
 # Windows image builds must be directed to a specific buildx context.
diff --git a/examples/simple-game-server/dev-gameserver.yaml b/examples/simple-game-server/dev-gameserver.yaml
index 3bd8218587..02a01fd09e 100644
--- a/examples/simple-game-server/dev-gameserver.yaml
+++ b/examples/simple-game-server/dev-gameserver.yaml
@@ -31,4 +31,4 @@ spec:
     spec:
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
diff --git a/examples/simple-game-server/fleet-distributed.yaml b/examples/simple-game-server/fleet-distributed.yaml
index 1333985bb4..be347c2ecc 100644
--- a/examples/simple-game-server/fleet-distributed.yaml
+++ b/examples/simple-game-server/fleet-distributed.yaml
@@ -32,7 +32,7 @@ spec:
         spec:
           containers:
             - name: simple-game-server
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
               resources:
                 requests:
                   memory: 64Mi
diff --git a/examples/simple-game-server/fleet-tcp.yaml b/examples/simple-game-server/fleet-tcp.yaml
index 6c7ae262e4..b1da646e68 100644
--- a/examples/simple-game-server/fleet-tcp.yaml
+++ b/examples/simple-game-server/fleet-tcp.yaml
@@ -28,7 +28,7 @@ spec:
         spec:
           containers:
             - name: simple-game-server
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
               env:
                 # Disables the UDP listener (Enabled by default)
                 - name: UDP
diff --git a/examples/simple-game-server/fleet.yaml b/examples/simple-game-server/fleet.yaml
index 6e3c736c60..ece985c90d 100644
--- a/examples/simple-game-server/fleet.yaml
+++ b/examples/simple-game-server/fleet.yaml
@@ -27,7 +27,7 @@ spec:
         spec:
           containers:
             - name: simple-game-server
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
               resources:
                 requests:
                   memory: 64Mi
diff --git a/examples/simple-game-server/gameserver-none.yaml b/examples/simple-game-server/gameserver-none.yaml
index 1cd1057f21..3d899d5ff6 100644
--- a/examples/simple-game-server/gameserver-none.yaml
+++ b/examples/simple-game-server/gameserver-none.yaml
@@ -29,7 +29,7 @@ spec:
     spec:
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
           resources:
             requests:
               memory: 64Mi
diff --git a/examples/simple-game-server/gameserver-passthrough.yaml b/examples/simple-game-server/gameserver-passthrough.yaml
index 8fc7666636..3a97ef9bc5 100644
--- a/examples/simple-game-server/gameserver-passthrough.yaml
+++ b/examples/simple-game-server/gameserver-passthrough.yaml
@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
           env:
             - name: PASSTHROUGH
               value: 'TRUE'
diff --git a/examples/simple-game-server/gameserver-windows.yaml b/examples/simple-game-server/gameserver-windows.yaml
index ee75733a01..5f61da85ca 100644
--- a/examples/simple-game-server/gameserver-windows.yaml
+++ b/examples/simple-game-server/gameserver-windows.yaml
@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
           resources:
             requests:
               memory: 64Mi
diff --git a/examples/simple-game-server/gameserver.yaml b/examples/simple-game-server/gameserver.yaml
index f19bc49432..60695e0de3 100644
--- a/examples/simple-game-server/gameserver.yaml
+++ b/examples/simple-game-server/gameserver.yaml
@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
           resources:
             requests:
               memory: 64Mi
diff --git a/examples/simple-genai-server/Dockerfile b/examples/simple-genai-server/Dockerfile
index 14097ce420..4fe051b050 100644
--- a/examples/simple-genai-server/Dockerfile
+++ b/examples/simple-genai-server/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # build
-FROM golang:1.21.6 as builder
+FROM golang:1.21.12 as builder
 WORKDIR /go/src
 COPY . agones.dev/agones
 
diff --git a/examples/simple-genai-server/Makefile b/examples/simple-genai-server/Makefile
index 81fecf9d83..e4393526d8 100644
--- a/examples/simple-genai-server/Makefile
+++ b/examples/simple-genai-server/Makefile
@@ -22,19 +22,31 @@
 #    \ V / (_| | |  | | (_| | |_) | |  __\__ \
 #     \_/ \__,_|_|  |_|\__,_|_.__/|_|\___|___/
 #
-REPOSITORY ?= us-docker.pkg.dev/agones-images/examples
+REPOSITORY ?=
+PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-version := 0.2
-server_tag := $(REPOSITORY)/simple-genai-game-server:$(version)
+version := 0.3
+ifeq ($(REPOSITORY),)
+	server_tag := simple-genai-game-server:$(version)
+else
+	server_tag := $(REPOSITORY)/simple-genai-game-server:$(version)
+endif
 server_tag_linux_amd64 = $(server_tag)-linux-amd64
 push_server_manifest = $(server_tag_linux_amd64)
 root_path = $(realpath $(project_path)/../..)
 
+#   _____                    _
+#  |_   _|_ _ _ __ __ _  ___| |_ ___
+#    | |/ _` | '__/ _` |/ _ \ __/ __|
+#    | | (_| | | | (_| |  __/ |_\__ \
+#    |_|\__,_|_|  \__, |\___|\__|___/
+#                 |___/
+
 build: build-linux-image-amd64
 push: push-linux-image-amd64
-  # Docker >=24.0.6
+  	# Docker >=24.0.6
 	docker buildx imagetools create --tag $(server_tag) \
     	$(push_server_manifest)
 
@@ -47,10 +59,14 @@ push-linux-image-amd64: build
 
 # check if hosted on Google Artifact Registry
 gar-check:
-	gcloud container images describe $(server_tag)
+	gcloud container images describe $(PROD_REPO)/$(server_tag)
 
 print-vars:
 	$(info project_path is $(project_path))
 	$(info server_tag is $(server_tag))
 	$(info server_tag_linux_amd64 is $(server_tag_linux_amd64))
 	$(info push_server_manifest is $(push_server_manifest))
+
+# build and push the simple-genai-server image with specified tag
+cloud-build:
+	cd $(root_path) && gcloud builds submit --config=./examples/simple-genai-server/cloudbuild.yaml
\ No newline at end of file
diff --git a/examples/simple-genai-server/cloudbuild.yaml b/examples/simple-genai-server/cloudbuild.yaml
new file mode 100644
index 0000000000..c4496ac06b
--- /dev/null
+++ b/examples/simple-genai-server/cloudbuild.yaml
@@ -0,0 +1,38 @@
+---
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+steps:
+  #
+  # Creates the initial make + docker build platform
+  #
+  - name: ubuntu
+    script: |
+      echo 'FROM gcr.io/cloud-builders/docker:24.0.6\nRUN apt-get install make\nENTRYPOINT [\"/usr/bin/make\"]' > Dockerfile.build
+  - name: gcr.io/cloud-builders/docker:24.0.6
+    id: build-make-docker
+    entrypoint: docker
+    args: [build, -f, Dockerfile.build, -t, make-docker, .]
+
+  # build and push simple-genai-server image to GCR
+  - name: make-docker
+    id: push
+    dir: /workspace/examples/simple-genai-server
+    env: ['REPOSITORY=${_REPOSITORY}']
+    script: |
+      make push
+options:
+  dynamic_substitutions: true
+substitutions:
+  _REPOSITORY: us-docker.pkg.dev/${PROJECT_ID}/examples
+timeout: 1800s
diff --git a/examples/simple-genai-server/gameserver_autochat.yaml b/examples/simple-genai-server/gameserver_autochat.yaml
index 7b5739e001..3ec393c447 100644
--- a/examples/simple-genai-server/gameserver_autochat.yaml
+++ b/examples/simple-genai-server/gameserver_autochat.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
         - name: simple-genai-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-genai-game-server:0.2
+          image: us-docker.pkg.dev/agones-images/examples/simple-genai-game-server:0.3
           # imagePullPolicy: Always  # add for development
           env:
             - name: GEN_AI_ENDPOINT
diff --git a/examples/simple-genai-server/gameserver_manualchat.yaml b/examples/simple-genai-server/gameserver_manualchat.yaml
index 21d9f68535..0ae32698f6 100644
--- a/examples/simple-genai-server/gameserver_manualchat.yaml
+++ b/examples/simple-genai-server/gameserver_manualchat.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
         - name: simple-genai-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-genai-game-server:0.2
+          image: us-docker.pkg.dev/agones-images/examples/simple-genai-game-server:0.3
           # imagePullPolicy: Always  # add for development
           env:
             - name: GEN_AI_ENDPOINT
diff --git a/examples/simple-genai-server/gameserver_npcchat.yaml b/examples/simple-genai-server/gameserver_npcchat.yaml
index 53661d8b1d..11110235dd 100644
--- a/examples/simple-genai-server/gameserver_npcchat.yaml
+++ b/examples/simple-genai-server/gameserver_npcchat.yaml
@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
         - name: simple-genai-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-genai-game-server:0.2
+          image: us-docker.pkg.dev/agones-images/examples/simple-genai-game-server:0.3
           # imagePullPolicy: Always  # add for development
           env:
             - name: GEN_AI_ENDPOINT
diff --git a/examples/supertuxkart/Dockerfile b/examples/supertuxkart/Dockerfile
index d06cfcc36a..ef60f10879 100644
--- a/examples/supertuxkart/Dockerfile
+++ b/examples/supertuxkart/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # build go
-FROM golang:1.21.6 as go-builder
+FROM golang:1.21.12 as go-builder
 WORKDIR /go/src/supertuxkart
 
 COPY main.go go.mod ./
diff --git a/examples/supertuxkart/Makefile b/examples/supertuxkart/Makefile
index fb909a7ef0..47f7c79da5 100644
--- a/examples/supertuxkart/Makefile
+++ b/examples/supertuxkart/Makefile
@@ -28,7 +28,7 @@ PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-version := 0.13
+version := 0.14
 ifeq ($(REPOSITORY),)
 	image_tag := supertuxkart-example:$(version)
 else
diff --git a/examples/supertuxkart/fleet.yaml b/examples/supertuxkart/fleet.yaml
index d178f7f926..16ccca26da 100644
--- a/examples/supertuxkart/fleet.yaml
+++ b/examples/supertuxkart/fleet.yaml
@@ -32,4 +32,4 @@ spec:
         spec:
           containers:
             - name: supertuxkart
-              image: us-docker.pkg.dev/agones-images/examples/supertuxkart-example:0.13
+              image: us-docker.pkg.dev/agones-images/examples/supertuxkart-example:0.14
diff --git a/examples/supertuxkart/gameserver.yaml b/examples/supertuxkart/gameserver.yaml
index e2efce20eb..49c561ecb9 100644
--- a/examples/supertuxkart/gameserver.yaml
+++ b/examples/supertuxkart/gameserver.yaml
@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: supertuxkart
-          image: us-docker.pkg.dev/agones-images/examples/supertuxkart-example:0.13
+          image: us-docker.pkg.dev/agones-images/examples/supertuxkart-example:0.14
           # imagePullPolicy: Always  # add for development
           env:
             - name: ENABLE_PLAYER_TRACKING
diff --git a/examples/xonotic/Dockerfile b/examples/xonotic/Dockerfile
index a5671857d1..d2139768ba 100644
--- a/examples/xonotic/Dockerfile
+++ b/examples/xonotic/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # build
-FROM golang:1.21.6 as builder
+FROM golang:1.21.12 as builder
 
 RUN apt-get update && apt-get install -y unzip curl
 
diff --git a/examples/xonotic/Dockerfile.windows b/examples/xonotic/Dockerfile.windows
index 6d3024ecbe..d8dc05db22 100644
--- a/examples/xonotic/Dockerfile.windows
+++ b/examples/xonotic/Dockerfile.windows
@@ -35,10 +35,9 @@
 # See https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/version-compatibility
 # for details.
 ARG WINDOWS_VERSION=ltsc2019
-ARG IMAGE_TAG=""
 
 # Build Stage
-FROM --platform=linux/amd64 golang:1.21.6 as base
+FROM --platform=linux/amd64 golang:1.21.12 as base
 
 RUN apt-get update && apt-get install -y unzip curl
 
@@ -54,7 +53,7 @@ RUN curl -o xonotic.zip https://dl.xonotic.org/xonotic-0.8.6.zip && \
 
 
 # Final Image
-FROM mcr.microsoft.com/windows/servercore:${WINDOWS_VERSION}${IMAGE_TAG}
+FROM mcr.microsoft.com/windows/servercore:${WINDOWS_VERSION}
 
 WORKDIR C:/Xonotic
 
diff --git a/examples/xonotic/Makefile b/examples/xonotic/Makefile
index d5eafda368..b9dcbca183 100644
--- a/examples/xonotic/Makefile
+++ b/examples/xonotic/Makefile
@@ -29,9 +29,6 @@ PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
 WINDOWS_VERSIONS = ltsc2019 ltsc2022
 BUILDX_WINDOWS_BUILDER = windows-builder
 
-# https://github.com/microsoft/Windows-Containers/issues/493: Pin the LTSC2019 image to an older sha
-LTSC2019_IMAGE_TAG = "@sha256:6fdf140282a2f809dae9b13fe441635867f0a27c33a438771673b8da8f3348a4"
-
 # Build with Windows support
 WITH_WINDOWS ?= 1
 
@@ -40,7 +37,7 @@ WINDOWS_DOCKER_PUSH_ARGS = --push
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-version := 1.9
+version := 2.0
 ifeq ($(REPOSITORY),)
 	server_tag := xonotic-example:$(version)
 else
@@ -89,7 +86,7 @@ push-windows-image-%:
 
 build-windows-image-%: ensure-windows-buildx
 	docker buildx build --platform windows/amd64 --builder $(BUILDX_WINDOWS_BUILDER) -f $(project_path)Dockerfile.windows \
-	--tag=$(server_tag)-windows_amd64-$* --build-arg WINDOWS_VERSION=$* --build-arg IMAGE_TAG=$(if $(filter ltsc2019,$*),$(LTSC2019_IMAGE_TAG),) . $(WINDOWS_DOCKER_PUSH_ARGS)
+	--tag=$(server_tag)-windows_amd64-$* --build-arg WINDOWS_VERSION=$* . $(WINDOWS_DOCKER_PUSH_ARGS)
 
 ensure-windows-buildx:
 # Windows image builds must be directed to a specific buildx context.
diff --git a/examples/xonotic/fleet.yaml b/examples/xonotic/fleet.yaml
index 4191b8bc82..0412dab909 100644
--- a/examples/xonotic/fleet.yaml
+++ b/examples/xonotic/fleet.yaml
@@ -35,7 +35,7 @@ spec:
         spec:
           containers:
             - name: xonotic
-              image: us-docker.pkg.dev/agones-images/examples/xonotic-example:1.9
+              image: us-docker.pkg.dev/agones-images/examples/xonotic-example:2.0
               resources:
                 requests:
                   memory: 700Mi
diff --git a/examples/xonotic/gameserver.yaml b/examples/xonotic/gameserver.yaml
index 5fd39afa2f..ad91aee166 100644
--- a/examples/xonotic/gameserver.yaml
+++ b/examples/xonotic/gameserver.yaml
@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: xonotic
-          image: us-docker.pkg.dev/agones-images/examples/xonotic-example:1.9
+          image: us-docker.pkg.dev/agones-images/examples/xonotic-example:2.0
           resources:
             requests:
               memory: 700Mi
diff --git a/install/helm/agones/templates/tests/test-runner.yaml b/install/helm/agones/templates/tests/test-runner.yaml
index 477a5ff400..ad68019068 100644
--- a/install/helm/agones/templates/tests/test-runner.yaml
+++ b/install/helm/agones/templates/tests/test-runner.yaml
@@ -25,11 +25,11 @@ spec:
   serviceAccountName: agones-controller
   containers:
   - name: create-gameserver
-    image: us-docker.pkg.dev/agones-images/examples/crd-client:0.16
+    image: us-docker.pkg.dev/agones-images/examples/crd-client:0.17
     imagePullPolicy: Always
     env:
     - name: GAMESERVER_IMAGE
-      value: "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33"
+      value: "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34"
     - name: IS_HELM_TEST
       value: "true"
     - name: GAMESERVERS_NAMESPACE
diff --git a/pkg/util/webhooks/webhooks_test.go b/pkg/util/webhooks/webhooks_test.go
index 69e94adbe5..516b9889c8 100644
--- a/pkg/util/webhooks/webhooks_test.go
+++ b/pkg/util/webhooks/webhooks_test.go
@@ -164,7 +164,7 @@ func TestWebHookFleetValidationHandler(t *testing.T) {
 							"template": {
 								"spec": {
 									"containers": [{
-										"image": "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33",
+										"image": "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34",
 										"name": false
 									}]
 								}
diff --git a/site/go.mod b/site/go.mod
index ca50770a76..eddee4ec35 100644
--- a/site/go.mod
+++ b/site/go.mod
@@ -3,5 +3,3 @@ module github.com/agones/agones/site
 go 1.21
 
 require gopkg.in/yaml.v2 v2.4.0
-
-require github.com/google/docsy v0.7.1 // indirect
diff --git a/site/go.sum b/site/go.sum
index 7430d6bc1e..dd0bc19f1f 100644
--- a/site/go.sum
+++ b/site/go.sum
@@ -1,8 +1,3 @@
-github.com/FortAwesome/Font-Awesome v0.0.0-20230327165841-0698449d50f2/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
-github.com/google/docsy v0.7.1 h1:DUriA7Nr3lJjNi9Ulev1SfiG1sUYmvyDeU4nTp7uDxY=
-github.com/google/docsy v0.7.1/go.mod h1:JCmE+c+izhE0Rvzv3y+AzHhz1KdwlA9Oj5YBMklJcfc=
-github.com/google/docsy/dependencies v0.7.1/go.mod h1:gihhs5gmgeO+wuoay4FwOzob+jYJVyQbNaQOh788lD4=
-github.com/twbs/bootstrap v5.2.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
diff --git a/test/e2e/examples_test.go b/test/e2e/examples_test.go
index 5cf92b8ed9..ca9106a9e7 100644
--- a/test/e2e/examples_test.go
+++ b/test/e2e/examples_test.go
@@ -45,7 +45,7 @@ func TestSuperTuxKartGameServerReady(t *testing.T) {
 					Containers: []corev1.Container{
 						{
 							Name:  "supertuxkart",
-							Image: "us-docker.pkg.dev/agones-images/examples/supertuxkart-example:0.13",
+							Image: "us-docker.pkg.dev/agones-images/examples/supertuxkart-example:0.14",
 							Env: []corev1.EnvVar{
 								{
 									Name:  "ENABLE_PLAYER_TRACKING",
@@ -203,7 +203,7 @@ func TestXonoticGameServerReady(t *testing.T) {
 					Containers: []corev1.Container{
 						{
 							Name:  "xonotic",
-							Image: "us-docker.pkg.dev/agones-images/examples/xonotic-example:1.9",
+							Image: "us-docker.pkg.dev/agones-images/examples/xonotic-example:2.0",
 							Resources: corev1.ResourceRequirements{
 								Requests: corev1.ResourceList{
 									corev1.ResourceMemory: resource.MustParse("700Mi"),
diff --git a/test/e2e/fleetautoscaler_test.go b/test/e2e/fleetautoscaler_test.go
index cb84379e81..85a4338efd 100644
--- a/test/e2e/fleetautoscaler_test.go
+++ b/test/e2e/fleetautoscaler_test.go
@@ -645,7 +645,7 @@ func defaultAutoscalerWebhook(namespace string) (*corev1.Pod, *corev1.Service) {
 		},
 		Spec: corev1.PodSpec{
 			Containers: []corev1.Container{{Name: "webhook",
-				Image:           "us-docker.pkg.dev/agones-images/examples/autoscaler-webhook:0.13",
+				Image:           "us-docker.pkg.dev/agones-images/examples/autoscaler-webhook:0.14",
 				ImagePullPolicy: corev1.PullAlways,
 				Ports: []corev1.ContainerPort{{
 					ContainerPort: 8000,
diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
index aa0b6dd057..3fd8604a8d 100644
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -150,7 +150,7 @@ func NewFromFlags() (*Framework, error) {
 	}
 
 	viper.SetDefault(kubeconfigFlag, filepath.Join(usr.HomeDir, ".kube", "config"))
-	viper.SetDefault(gsimageFlag, "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33")
+	viper.SetDefault(gsimageFlag, "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34")
 	viper.SetDefault(pullSecretFlag, "")
 	viper.SetDefault(stressTestLevelFlag, 0)
 	viper.SetDefault(perfOutputDirFlag, "")
diff --git a/test/e2e/gameserver_test.go b/test/e2e/gameserver_test.go
index cd442322a2..f1847ea0a6 100644
--- a/test/e2e/gameserver_test.go
+++ b/test/e2e/gameserver_test.go
@@ -1133,7 +1133,7 @@ spec:
           preferredDuringSchedulingIgnoredDuringExecution: ERROR
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
 `
 	err := os.WriteFile("/tmp/invalid.yaml", []byte(gsYaml), 0o644)
 	require.NoError(t, err)
diff --git a/test/load/allocation/fleet.yaml b/test/load/allocation/fleet.yaml
index df5e92707d..b7c341dcb6 100644
--- a/test/load/allocation/fleet.yaml
+++ b/test/load/allocation/fleet.yaml
@@ -33,7 +33,7 @@ spec:
         spec:
           containers:
             - args: [-automaticShutdownDelaySec=600]
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
               name: simple-game-server
               resources:
                 limits:
diff --git a/test/load/allocation/performance-test-fleet-template.yaml b/test/load/allocation/performance-test-fleet-template.yaml
index 3e4a4f44d8..c0ef5ac602 100644
--- a/test/load/allocation/performance-test-fleet-template.yaml
+++ b/test/load/allocation/performance-test-fleet-template.yaml
@@ -33,7 +33,7 @@ spec:
         spec:
           containers:
             - args: [-automaticShutdownDelaySec=AUTOMATIC_SHUTDOWN_DELAY_SEC_REPLACEMENT]
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
               name: simple-game-server
               resources:
                 limits:
diff --git a/test/load/allocation/scenario-fleet.yaml b/test/load/allocation/scenario-fleet.yaml
index 08248f6354..3ea2fe7523 100644
--- a/test/load/allocation/scenario-fleet.yaml
+++ b/test/load/allocation/scenario-fleet.yaml
@@ -38,7 +38,7 @@ spec:
               value: 'true'
           containers:
             - name: simple-game-server
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
               args: [-automaticShutdownDelaySec=60, -readyIterations=10]
               resources:
                 limits: