diff --git a/examples/example-workload/gatewayapi/kuard/kuard.yaml b/examples/example-workload/gatewayapi/kuard/kuard.yaml
index 5b589e6cfd7..cc8c44523b7 100644
--- a/examples/example-workload/gatewayapi/kuard/kuard.yaml
+++ b/examples/example-workload/gatewayapi/kuard/kuard.yaml
@@ -16,8 +16,19 @@ spec:
         app: kuard
     spec:
       containers:
-      - image: gcr.io/kuar-demo/kuard-amd64:1
+      # gcr.io/kuar-demo/kuard-amd64 is no longer available upstream
+      # (https://github.com/kubernetes-up-and-running/kuard/issues/59),
+      # so this example now runs a small echo server on port 8080 instead
+      # (same image already used by the blue-green example).
+      - image: stevesloka/echo-server
         name: kuard
+        command: ["echo-server"]
+        args:
+          - --echotext=kuard
+        imagePullPolicy: IfNotPresent
+        ports:
+          - name: http
+            containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
diff --git a/examples/example-workload/httpproxy/00-common/02-deployments.yaml b/examples/example-workload/httpproxy/00-common/02-deployments.yaml
index 232599ab2cd..e0cdf441f7d 100644
--- a/examples/example-workload/httpproxy/00-common/02-deployments.yaml
+++ b/examples/example-workload/httpproxy/00-common/02-deployments.yaml
@@ -14,8 +14,17 @@ spec:
         app: kuard
     spec:
       containers:
-      - image: gcr.io/kuar-demo/kuard-amd64:1
+      # gcr.io/kuar-demo/kuard-amd64 is no longer available upstream
+      # (https://github.com/kubernetes-up-and-running/kuard/issues/59),
+      # so this example now runs a small echo server on port 8080 instead
+      # (same image already used by the blue-green example).
+      - image: stevesloka/echo-server
         name: kuard
+        command: ["echo-server"]
+        imagePullPolicy: IfNotPresent
+        ports:
+          - name: http
+            containerPort: 8080
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -33,5 +42,14 @@ spec:
         app: kuard
     spec:
       containers:
-      - image: gcr.io/kuar-demo/kuard-amd64:1
+      # gcr.io/kuar-demo/kuard-amd64 is no longer available upstream
+      # (https://github.com/kubernetes-up-and-running/kuard/issues/59),
+      # so this example now runs a small echo server on port 8080 instead
+      # (same image already used by the blue-green example).
+      - image: stevesloka/echo-server
         name: kuard
+        command: ["echo-server"]
+        imagePullPolicy: IfNotPresent
+        ports:
+          - name: http
+            containerPort: 8080
diff --git a/site/content/docs/main/guides/gateway-api.md b/site/content/docs/main/guides/gateway-api.md
index 4bcc3140c03..0d7bd3b50de 100644
--- a/site/content/docs/main/guides/gateway-api.md
+++ b/site/content/docs/main/guides/gateway-api.md
@@ -159,9 +159,9 @@ $ kubectl apply -f {{< param github_raw_url>}}/{{< param branch >}}/examples/exa
 ```
 This command creates:
 
-- A Deployment named `kuard` in the default namespace to run kuard as the test application.
-- A Service named `kuard` in the default namespace to expose the kuard application on TCP port 80.
-- An HTTPRoute named `kuard` in the default namespace, attached to the `contour` Gateway, to route requests for `local.projectcontour.io` to the kuard service.
+- A Deployment named `kuard` in the default namespace to run a small echo server as the test application.
+- A Service named `kuard` in the default namespace to expose the test application on TCP port 80.
+- An HTTPRoute named `kuard` in the default namespace, attached to the `contour` Gateway, to route requests for `local.projectcontour.io` to the `kuard` service.
 
 Verify the kuard resources are available:
 ```shell