diff --git a/site/content/en/latest/tasks/extensibility/envoy-patch-policy.md b/site/content/en/latest/tasks/extensibility/envoy-patch-policy.md
index 94d71fc7c777..83b95065a825 100644
--- a/site/content/en/latest/tasks/extensibility/envoy-patch-policy.md
+++ b/site/content/en/latest/tasks/extensibility/envoy-patch-policy.md
@@ -63,10 +63,10 @@ kubectl rollout restart deployment envoy-gateway -n envoy-gateway-system
 
 ### Customize Response
 
-* Lets use EnvoyProxy's [Local Reply Modification][] feature to return a custom response back to the client when
+* Use EnvoyProxy's [Local Reply Modification][] feature to return a custom response back to the client when
 the status code is `404`
 
-* Lets apply the configuration
+* Apply the configuration
 
 ```shell
 cat <<EOF | kubectl apply -f -
@@ -94,10 +94,10 @@ spec:
           - filter:
               status_code_filter:
                 comparison:
-                 op: EQ
-                 value:
-                   default_value: 404
-                   runtime_key: key_b
+                  op: EQ
+                  value:
+                    default_value: 404
+                    runtime_key: key_b
             status_code: 406
             body:
               inline_string: "could not find what you are looking for"
@@ -133,27 +133,27 @@ spec:
           - filter:
               status_code_filter:
                 comparison:
-                 op: EQ
-                 value:
-                   default_value: 404
-                   runtime_key: key_b
+                  op: EQ
+                  value:
+                    default_value: 404
+                    runtime_key: key_b
             status_code: 406
             body:
               inline_string: "could not find what you are looking for"
 EOF
 ```
 
-* Lets edit the HTTPRoute resource from the Quickstart to only match on paths with value `/get`
+* Edit the HTTPRoute resource from the Quickstart to only match on paths with value `/get`
 
-```
-kubectl patch httproute backend --type=json --patch '[{
-   "op": "add",
-   "path": "/spec/rules/0/matches/0/path/value",
-   "value": "/get",
-}]'
+```shell
+kubectl patch httproute backend --type=json --patch '
+  - op: add
+    path: /spec/rules/0/matches/0/path/value
+    value: /get
+  '
 ```
 
-* Lets test it out by specifying a path apart from `/get`
+* Test it out by specifying a path apart from `/get`
 
 ```
 $ curl --header "Host: www.example.com" http://localhost:8888/find
@@ -169,7 +169,7 @@ could not find what you are looking for
 `Accepted=True` and `Programmed=True` conditions are set to ensure that the policy has been
 applied to Envoy Proxy.
 
-```
+```yaml
 apiVersion: gateway.envoyproxy.io/v1alpha1
 kind: EnvoyPatchPolicy
 metadata:
diff --git a/site/content/en/latest/tasks/security/backend-tls.md b/site/content/en/latest/tasks/security/backend-tls.md
index 975e8a5f13c3..9eadf4dd9d82 100644
--- a/site/content/en/latest/tasks/security/backend-tls.md
+++ b/site/content/en/latest/tasks/security/backend-tls.md
@@ -29,7 +29,7 @@ Create a certificate and a private key for `www.example.com`:
 
 ```shell
 openssl req -out www.example.com.csr -newkey rsa:2048 -nodes -keyout www.example.com.key -subj "/CN=www.example.com/O=example organization"
-openssl x509 -req -days 365 -CA example.com.crt -CAkey example.com.key -set_serial 0 -in www.example.com.csr -out www.example.com.crt
+openssl x509 -req -days 365 -CA ca.crt -CAkey ca.key -set_serial 0 -in www.example.com.csr -out www.example.com.crt
 ```
 
 Store the cert/key in a Secret:
@@ -49,56 +49,34 @@ kubectl create configmap example-ca --from-file=ca.crt
 Patch the existing quickstart backend to enable TLS. The patch will mount the TLS certificate secret into the backend as volume. 
 
 ```shell
-kubectl patch deployment backend --type=json --patch '[
-  {
-    "op": "add",
-    "path": "/spec/template/spec/containers/0/volumeMounts",
-    "value": [
-      {
-        "name": "secret-volume",
-        "mountPath": "/etc/secret-volume"
-      }
-    ]
-  },
-  {
-    "op": "add",
-    "path": "/spec/template/spec/volumes",
-    "value": [
-      {
-        "name": "secret-volume",
-        "secret": {
-          "secretName": "example-cert",
-          "items": [
-            {
-              "key": "tls.crt",
-              "path": "crt"
-            },
-            {
-              "key": "tls.key",
-              "path": "key"
-            }
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "op": "add",
-    "path": "/spec/template/spec/containers/0/env/-",
-    "value": {
-      "name": "TLS_SERVER_CERT",
-      "value": "/etc/secret-volume/crt"
-    }
-  },
-  {
-    "op": "add",
-    "path": "/spec/template/spec/containers/0/env/-",
-    "value": {
-      "name": "TLS_SERVER_PRIVKEY",
-      "value": "/etc/secret-volume/key"
-    }
-  }
-]'
+kubectl patch deployment backend --type=json --patch '
+  - op: add
+    path: /spec/template/spec/containers/0/volumeMounts
+    value:
+    - name: secret-volume
+      mountPath: /etc/secret-volume
+  - op: add
+    path: /spec/template/spec/volumes
+    value:
+    - name: secret-volume
+      secret:
+        secretName: example-cert
+        items:
+        - key: tls.crt
+          path: crt
+        - key: tls.key
+          path: key
+  - op: add
+    path: /spec/template/spec/containers/0/env/-
+    value:
+      name: TLS_SERVER_CERT
+      value: /etc/secret-volume/crt
+  - op: add
+    path: /spec/template/spec/containers/0/env/-
+    value:
+      name: TLS_SERVER_PRIVKEY
+      value: /etc/secret-volume/key
+  '
 ```
 
 Create a service that exposes port 443 on the backend service. 
@@ -141,9 +119,9 @@ spec:
     sectionName: "443"
   tls:
     caCertRefs:
-      - name: example-ca
-        group: ''
-        kind: ConfigMap
+    - name: example-ca
+      group: ''
+      kind: ConfigMap
     hostname: www.example.com
 EOF
 ```
@@ -151,18 +129,14 @@ EOF
 Patch the HTTPRoute's backend reference, so that it refers to the new TLS-enabled service:
 
 ```shell
-kubectl patch HTTPRoute backend --type=json --patch '[
-    {
-        "op": "replace",
-        "path": "/spec/rules/0/backendRefs/0/port",
-        "value": 443
-    },
-    {
-        "op": "replace",
-        "path": "/spec/rules/0/backendRefs/0/name",
-        "value": "tls-backend"
-    }
-]'
+kubectl patch HTTPRoute backend --type=json --patch '
+  - op: replace
+    path: /spec/rules/0/backendRefs/0/port
+    value: 443
+  - op: replace
+    path: /spec/rules/0/backendRefs/0/name
+    value: tls-backend
+  '
 ```
 
 Verify the HTTPRoute status:
diff --git a/site/content/en/latest/tasks/security/basic-auth.md b/site/content/en/latest/tasks/security/basic-auth.md
index aa475de189e8..3061ec90918b 100644
--- a/site/content/en/latest/tasks/security/basic-auth.md
+++ b/site/content/en/latest/tasks/security/basic-auth.md
@@ -49,23 +49,20 @@ Update the Gateway from the Quickstart to include an HTTPS listener that listens
 `example-cert` Secret:
 
 ```shell
-kubectl patch gateway eg --type=json --patch '[{
-   "op": "add",
-   "path": "/spec/listeners/-",
-   "value": {
-      "name": "https",
-      "protocol": "HTTPS",
-      "port": 443,
-      "tls": {
-        "mode": "Terminate",
-        "certificateRefs": [{
-          "kind": "Secret",
-          "group": "",
-          "name": "example-cert",
-        }],
-      },
-    },
-}]'
+kubectl patch gateway eg --type=json --patch '
+  - op: add
+    path: /spec/listeners/-
+    value:
+      name: https
+      protocol: HTTPS
+      port: 443
+      tls:
+        mode: Terminate
+        certificateRefs:
+          - kind: Secret
+            group: ""
+            name: example-cert
+  '
 ```
 
 ### Create a .htpasswd file
diff --git a/site/content/en/latest/tasks/security/mutual-tls.md b/site/content/en/latest/tasks/security/mutual-tls.md
index 69bb744cacc1..1a68174e6fe7 100644
--- a/site/content/en/latest/tasks/security/mutual-tls.md
+++ b/site/content/en/latest/tasks/security/mutual-tls.md
@@ -54,23 +54,20 @@ Update the Gateway from the Quickstart to include an HTTPS listener that listens
 `example-cert` Secret:
 
 ```shell
-kubectl patch gateway eg --type=json --patch '[{
-   "op": "add",
-   "path": "/spec/listeners/-",
-   "value": {
-      "name": "https",
-      "protocol": "HTTPS",
-      "port": 443,
-      "tls": {
-        "mode": "Terminate",
-        "certificateRefs": [{
-          "kind": "Secret",
-          "group": "",
-          "name": "example-cert",
-        }],
-      },
-    },
-}]'
+kubectl patch gateway eg --type=json --patch '
+  - op: add
+    path: /spec/listeners/-
+    value:
+      name: https
+      protocol: HTTPS
+      port: 443
+      tls:
+        mode: Terminate
+        certificateRefs:
+          - kind: Secret
+            group: ""
+            name: example-cert
+  '
 ```
 
 Verify the Gateway status:
diff --git a/site/content/en/latest/tasks/security/secure-gateways.md b/site/content/en/latest/tasks/security/secure-gateways.md
index 1568cbf30173..e56a496e022f 100644
--- a/site/content/en/latest/tasks/security/secure-gateways.md
+++ b/site/content/en/latest/tasks/security/secure-gateways.md
@@ -41,23 +41,20 @@ Update the Gateway from the Quickstart to include an HTTPS listener that listens
 `example-cert` Secret:
 
 ```shell
-kubectl patch gateway eg --type=json --patch '[{
-   "op": "add",
-   "path": "/spec/listeners/-",
-   "value": {
-      "name": "https",
-      "protocol": "HTTPS",
-      "port": 443,
-      "tls": {
-        "mode": "Terminate",
-        "certificateRefs": [{
-          "kind": "Secret",
-          "group": "",
-          "name": "example-cert",
-        }],
-      },
-    },
-}]'
+kubectl patch gateway eg --type=json --patch '
+  - op: add
+    path: /spec/listeners/-
+    value:
+      name: https
+      protocol: HTTPS
+      port: 443
+      tls:
+        mode: Terminate
+        certificateRefs:
+        - kind: Secret
+          group: ""
+          name: example-cert
+  '
 ```
 
 Verify the Gateway status:
@@ -122,34 +119,31 @@ kubectl create secret tls foo-cert --key=foo.example.com.key --cert=foo.example.
 Create another HTTPS listener on the example Gateway:
 
 ```shell
-kubectl patch gateway eg --type=json --patch '[{
-   "op": "add",
-   "path": "/spec/listeners/-",
-   "value": {
-      "name": "https-foo",
-      "protocol": "HTTPS",
-      "port": 443,
-      "hostname": "foo.example.com",
-      "tls": {
-        "mode": "Terminate",
-        "certificateRefs": [{
-          "kind": "Secret",
-          "group": "",
-          "name": "foo-cert",
-        }],
-      },
-    },
-}]'
+kubectl patch gateway eg --type=json --patch '
+  - op: add
+    path: /spec/listeners/-
+    value:
+      name: https-foo
+      protocol: HTTPS
+      port: 443
+      hostname: foo.example.com
+      tls:
+        mode: Terminate
+        certificateRefs:
+        - kind: Secret
+          group: ""
+          name: foo-cert
+  '
 ```
 
 Update the HTTPRoute to route traffic for hostname `foo.example.com` to the example backend service:
 
 ```shell
-kubectl patch httproute backend --type=json --patch '[{
-   "op": "add",
-   "path": "/spec/hostnames/-",
-   "value": "foo.example.com",
-}]'
+kubectl patch httproute backend --type=json --patch '
+  - op: add
+    path: /spec/hostnames/-
+    value: foo.example.com
+  '
 ```
 
 Verify the Gateway status:
@@ -171,9 +165,9 @@ Before proceeding, ensure you can query the HTTPS backend service from the [Test
 To demonstrate cross namespace certificate references, create a ReferenceGrant that allows Gateways from the "default"
 namespace to reference Secrets in the "envoy-gateway-system" namespace:
 
-```console
-$ cat <<EOF | kubectl apply -f -
-apiVersion: gateway.networking.k8s.io/v1alpha2
+```shell
+cat <<EOF | kubectl apply -f -
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: ReferenceGrant
 metadata:
   name: example
@@ -210,8 +204,8 @@ kubectl create secret tls example-cert -n envoy-gateway-system --key=www.example
 
 Update the Gateway HTTPS listener with `namespace: envoy-gateway-system`, for example:
 
-```console
-$ cat <<EOF | kubectl apply -f -
+```shell
+cat <<EOF | kubectl apply -f -
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
@@ -316,13 +310,12 @@ kubectl create secret tls example-cert-ecdsa --key=www.example.com.ecdsa.key --c
 Patch the Gateway with this additional ECDSA Secret:
 
 ```shell
-kubectl patch gateway eg --type=json --patch '[{
-   "op": "add",
-   "path": "/spec/listeners/1/tls/certificateRefs/-",
-   "value": {
-      "name": "example-cert-ecdsa",
-    },
-}]'
+kubectl patch gateway eg --type=json --patch '
+  - op: add
+    path: /spec/listeners/1/tls/certificateRefs/-
+    value:
+      name: example-cert-ecdsa
+  '
 ```
 
 Verify the Gateway status:
@@ -393,23 +386,22 @@ Note that all occurrences of `example.com` were just replaced with `sample.com`
 Next we update the `Gateway` configuration to accommodate the new Certificate which will be used to Terminate TLS traffic:
 
 ```shell
-kubectl patch gateway eg --type=json --patch '[{
-   "op": "add",
-   "path": "/spec/listeners/1/tls/certificateRefs/-",
-   "value": {
-      "name": "sample-cert",
-    },
-}]'
+kubectl patch gateway eg --type=json --patch '
+  - op: add
+    path: /spec/listeners/1/tls/certificateRefs/-
+    value:
+      name: sample-cert
+  '
 ```
 
 Finally, we update the HTTPRoute to route traffic for hostname `www.sample.com` to the example backend service:
 
 ```shell
-kubectl patch httproute backend --type=json --patch '[{
-  "op": "add",
-  "path": "/spec/hostnames/-",
-  "value": "www.sample.com",
-}]'
+kubectl patch httproute backend --type=json --patch '
+  - op: add
+    path: /spec/hostnames/-
+    value: www.sample.com
+  '
 ```
 
 ## Testing
diff --git a/site/content/en/latest/tasks/security/tls-passthrough.md b/site/content/en/latest/tasks/security/tls-passthrough.md
index 5942a68f4dbd..2683f5683329 100644
--- a/site/content/en/latest/tasks/security/tls-passthrough.md
+++ b/site/content/en/latest/tasks/security/tls-passthrough.md
@@ -53,17 +53,17 @@ Patch the Gateway from the Quickstart to include a TLS listener that listens on
 TLS mode Passthrough:
 
 ```shell
-kubectl patch gateway eg --type=json --patch '[{
-   "op": "add",
-   "path": "/spec/listeners/-",
-   "value": {
-      "name": "tls",
-      "protocol": "TLS",
-      "hostname": "passthrough.example.com",
-      "tls": {"mode": "Passthrough"}, 
-      "port": 6443,
-    },
-}]'
+kubectl patch gateway eg --type=json --patch '
+  - op: add
+    path: /spec/listeners/-
+    value:
+      name: tls
+      protocol: TLS
+      hostname: passthrough.example.com
+      port: 6443
+      tls:
+        mode: Passthrough
+   '
 ```
 
 ## Testing
diff --git a/site/content/en/latest/tasks/traffic/gateway-address.md b/site/content/en/latest/tasks/traffic/gateway-address.md
index d211d315c1a7..efc5372efa55 100644
--- a/site/content/en/latest/tasks/traffic/gateway-address.md
+++ b/site/content/en/latest/tasks/traffic/gateway-address.md
@@ -5,6 +5,7 @@ title: "Gateway Address"
 The Gateway API provides an optional [Addresses][] field through which Envoy Gateway can set addresses for Envoy Proxy Service.
 Depending on the Service Type, the addresses of gateway can be used as:
 
+- [Prerequisites](#prerequisites)
 - [External IPs](#external-ips)
 - [Cluster IP](#cluster-ip)
 
@@ -21,21 +22,22 @@ The Envoy Gateway deploys Envoy Proxy Service as `LoadBalancer` by default,
 so you can set the address of the Gateway directly (the address settings here are for reference only):
 
 ```shell
-kubectl patch gateway eg --type=json --patch '[{
-   "op": "add",
-   "path": "/spec/addresses",
-   "value": [{
-      "type": "IPAddress",
-      "value": "1.2.3.4"
-   }]
-}]'
+kubectl patch gateway eg --type=json --patch '
+- op: add
+  path: /spec/addresses
+  value:
+   - type: IPAddress
+     value: 1.2.3.4
+'
 ```
 
 Verify the Gateway status:
 
 ```shell
 kubectl get gateway
+```
 
+```console
 NAME   CLASS   ADDRESS   PROGRAMMED   AGE
 eg     eg      1.2.3.4   True         14m
 ```
@@ -44,7 +46,9 @@ Verify the Envoy Proxy Service status:
 
 ```shell
 kubectl get service -n envoy-gateway-system
+```
 
+```console
 NAME                            TYPE           CLUSTER-IP      EXTERNAL-IP   PORT(S)        AGE
 envoy-default-eg-64656661       LoadBalancer   10.96.236.219   1.2.3.4       80:31017/TCP   15m
 envoy-gateway                   ClusterIP      10.96.192.76    <none>        18000/TCP      15m
diff --git a/site/content/en/latest/tasks/traffic/http3.md b/site/content/en/latest/tasks/traffic/http3.md
index 3b83bc7def5e..702a3e3716fc 100644
--- a/site/content/en/latest/tasks/traffic/http3.md
+++ b/site/content/en/latest/tasks/traffic/http3.md
@@ -41,23 +41,20 @@ Update the Gateway from the Quickstart to include an HTTPS listener that listens
 `example-cert` Secret:
 
 ```shell
-kubectl patch gateway eg --type=json --patch '[{
-   "op": "add",
-   "path": "/spec/listeners/-",
-   "value": {
-      "name": "https",
-      "protocol": "HTTPS",
-      "port": 443,
-      "tls": {
-        "mode": "Terminate",
-        "certificateRefs": [{
-          "kind": "Secret",
-          "group": "",
-          "name": "example-cert",
-        }],
-      },
-    },
-}]'
+kubectl patch gateway eg --type=json --patch '
+  - op: add
+    path: /spec/listeners/-
+    value:
+      name: https
+      protocol: HTTPS
+      port: 443
+      tls:
+        mode: Terminate
+        certificateRefs:
+        - kind: Secret
+          group: ""
+          name: example-cert
+  '
 ```
 
 Apply the following ClientTrafficPolicy to enable HTTP3
diff --git a/site/content/en/latest/tasks/traffic/routing-outside-kubernetes.md b/site/content/en/latest/tasks/traffic/routing-outside-kubernetes.md
index 95b91eaa0e1a..e43052073cb0 100644
--- a/site/content/en/latest/tasks/traffic/routing-outside-kubernetes.md
+++ b/site/content/en/latest/tasks/traffic/routing-outside-kubernetes.md
@@ -3,7 +3,7 @@ title: "Routing outside Kubernetes"
 ---
 
 Routing to endpoints outside the Kubernetes cluster where Envoy Gateway and its corresponding Envoy Proxy fleet is
-running is a common use. This can be achieved by defining FQDN addresses in a [EndpointSlice][].
+running is a common use case. This can be achieved by defining FQDN addresses in a [EndpointSlice][].
 
 ## Installation
 
@@ -12,7 +12,7 @@ Before proceeding, you should be able to query the example backend using HTTP.
 
 ## Configuration
 
-* Lets define a Service and EndpointSlice that represents https://httpbin.org
+Define a Service and EndpointSlice that represents https://httpbin.org
 
 ```shell
 cat <<EOF | kubectl apply -f -
@@ -46,24 +46,22 @@ endpoints:
 EOF
 ```
 
-* Lets update the [Gateway][] to include a TLS Listener on port 443
+Update the [Gateway][] to include a TLS Listener on port 443
 
 ```shell
-kubectl patch gateway eg --type=json --patch '[{
-   "op": "add",
-   "path": "/spec/listeners/-",
-   "value": {
-      "name": "tls",
-      "protocol": "TLS",
-      "port": 443,
-      "tls": {
-        "mode": "Passthrough",
-      },
-    },
-}]'
+kubectl patch gateway eg --type=json --patch '
+  - op: add
+    path: /spec/listeners/-
+    value:
+      name: tls
+      protocol: TLS
+      port: 443
+      tls:
+        mode: Passthrough
+  '
 ```
 
-* Lets add a [TLSRoute][] that can route incoming traffic to the above backend that we created
+Add a [TLSRoute][] that can route incoming traffic to the above backend that we created
 
 ```shell
 cat <<EOF | kubectl apply -f -
@@ -82,17 +80,16 @@ spec:
 EOF
 ```    
 
-Lets get the Gateway address
+Get the Gateway address:
 
 ```shell
 export GATEWAY_HOST=$(kubectl get gateway/eg -o jsonpath='{.status.addresses[0].value}')
 ```
 
-
-Lets send a request and view the response
+Send a request and view the response:
 
 ```shell
-curl -I -HHost:httpbin.org --resolve "httpbin.org:443:${GATEWAY_HOST}" https://httpbin.org:443
+curl -I -HHost:httpbin.org --resolve "httpbin.org:443:${GATEWAY_HOST}" https://httpbin.org/
 ```
 
 [EndpointSlice]: https://kubernetes.io/docs/concepts/services-networking/endpoint-slices/
diff --git a/site/content/en/latest/tasks/traffic/udp-routing.md b/site/content/en/latest/tasks/traffic/udp-routing.md
index 51f3b1f8dd64..497d0781b98b 100644
--- a/site/content/en/latest/tasks/traffic/udp-routing.md
+++ b/site/content/en/latest/tasks/traffic/udp-routing.md
@@ -33,20 +33,17 @@ kubectl wait --timeout=5m deployment/coredns --for=condition=Available
 Update the Gateway from the Quickstart to include a UDP listener that listens on UDP port `5300`:
 
 ```shell
-kubectl patch gateway eg --type=json --patch '[{
-   "op": "add",
-   "path": "/spec/listeners/-",
-   "value": {
-      "name": "coredns",
-      "protocol": "UDP",
-      "port": 5300,
-      "allowedRoutes": {
-         "kinds": [{
-            "kind": "UDPRoute"
-          }]
-      }
-    },
-}]'
+kubectl patch gateway eg --type=json --patch '
+  - op: add
+    path: /spec/listeners/-
+    value:
+      name: coredns
+      protocol: UDP
+      port: 5300
+      allowedRoutes:
+        kinds:
+        - kind: UDPRoute
+  '
 ```
 
 Verify the Gateway status:
diff --git a/site/content/en/v1.0.1/tasks/extensibility/envoy-patch-policy.md b/site/content/en/v1.0.1/tasks/extensibility/envoy-patch-policy.md
index 884324502f60..83b95065a825 100644
--- a/site/content/en/v1.0.1/tasks/extensibility/envoy-patch-policy.md
+++ b/site/content/en/v1.0.1/tasks/extensibility/envoy-patch-policy.md
@@ -2,7 +2,7 @@
 title: "Envoy Patch Policy"
 ---
 
-This guide explains the usage of the [EnvoyPatchPolicy][] API.
+This task explains the usage of the [EnvoyPatchPolicy][] API.
 __Note:__ This API is meant for users extremely familiar with Envoy [xDS][] semantics.
 Also before considering this API for production use cases, please be aware that this API
 is unstable and the outcome may change across versions. Use at your own risk.
@@ -22,7 +22,7 @@ not exposed by Envoy Gateway APIs today.
 
 ### Prerequisites
 
-* Follow the steps from the [Quickstart](../../quickstart) guide to install Envoy Gateway and the example manifest.
+* Follow the steps from the [Quickstart](../../quickstart) task to install Envoy Gateway and the example manifest.
 Before proceeding, you should be able to query the example backend using HTTP.
 
 ### Enable EnvoyPatchPolicy
diff --git a/site/content/en/v1.0.1/tasks/security/backend-tls.md b/site/content/en/v1.0.1/tasks/security/backend-tls.md
index 142db19b0188..9eadf4dd9d82 100644
--- a/site/content/en/v1.0.1/tasks/security/backend-tls.md
+++ b/site/content/en/v1.0.1/tasks/security/backend-tls.md
@@ -2,8 +2,8 @@
 title: "Backend TLS: Gateway to Backend"
 ---
 
-This guide demonstrates how TLS can be achieved between the Gateway and a backend. The guide uses a self-signed CA, so it should be used for
-testing and demonstration purposes only.
+This task demonstrates how TLS can be achieved between the Gateway and a backend.
+This task uses a self-signed CA, so it should be used for testing and demonstration purposes only.
 
 Envoy Gateway supports the Gateway-API defined [BackendTLSPolicy][].
 
diff --git a/site/content/en/v1.0.1/tasks/security/basic-auth.md b/site/content/en/v1.0.1/tasks/security/basic-auth.md
index 6315f8277c01..e162e4f98790 100644
--- a/site/content/en/v1.0.1/tasks/security/basic-auth.md
+++ b/site/content/en/v1.0.1/tasks/security/basic-auth.md
@@ -2,7 +2,7 @@
 title: "Basic Authentication"
 ---
 
-This guide provides instructions for configuring [HTTP Basic authentication][http Basic authentication]. 
+This task provides instructions for configuring [HTTP Basic authentication][http Basic authentication].
 HTTP Basic authentication checks if an incoming request has a valid username and password before routing the request to 
 a backend service.
 
@@ -12,7 +12,7 @@ This instantiated resource can be linked to a [Gateway][Gateway], [HTTPRoute][HT
 
 ## Prerequisites
 
-Follow the steps from the [Quickstart](../../quickstart) guide to install Envoy Gateway and the example manifest.
+Follow the steps from the [Quickstart](../../quickstart) to install Envoy Gateway and the example manifest.
 Before proceeding, you should be able to query the example backend using HTTP.
 
 ## Configuration
@@ -125,7 +125,7 @@ kubectl get securitypolicy/basic-auth-example -o yaml
 
 ## Testing
 
-Ensure the `GATEWAY_HOST` environment variable from the [Quickstart](../../quickstart) guide is set. If not, follow the
+Ensure the `GATEWAY_HOST` environment variable from the [Quickstart](../../quickstart) is set. If not, follow the
 Quickstart instructions to set the variable.
 
 ```shell
@@ -173,7 +173,7 @@ The request should be allowed and you should see the response from the backend s
 
 ## Clean-Up
 
-Follow the steps from the [Quickstart](../../quickstart) guide to uninstall Envoy Gateway and the example manifest.
+Follow the steps from the [Quickstart](../../quickstart) to uninstall Envoy Gateway and the example manifest.
 
 Delete the SecurityPolicy and the secret
 
diff --git a/site/content/en/v1.0.1/tasks/security/mutual-tls.md b/site/content/en/v1.0.1/tasks/security/mutual-tls.md
index 11bd2138498d..1a68174e6fe7 100644
--- a/site/content/en/v1.0.1/tasks/security/mutual-tls.md
+++ b/site/content/en/v1.0.1/tasks/security/mutual-tls.md
@@ -2,8 +2,8 @@
 title: "Mutual TLS: External Clients to the Gateway"
 ---
 
-This guide demonstrates how mutual TLS can be achieved between external clients and the Gateway. The guide uses a self-signed CA, so it should be used for
-testing and demonstration purposes only.
+This task demonstrates how mutual TLS can be achieved between external clients and the Gateway.
+This task uses a self-signed CA, so it should be used for testing and demonstration purposes only.
 
 ## Prerequisites
 
@@ -11,7 +11,7 @@ testing and demonstration purposes only.
 
 ## Installation
 
-Follow the steps from the [Quickstart](../../quickstart) to install Envoy Gateway and the example manifest.
+Follow the steps from the [Quickstart](../quickstart) to install Envoy Gateway and the example manifest.
 Before proceeding, you should be able to query the example backend using HTTP.
 
 ## TLS Certificates
diff --git a/site/content/en/v1.0.1/tasks/security/secure-gateways.md b/site/content/en/v1.0.1/tasks/security/secure-gateways.md
index ca386563af0d..e56a496e022f 100644
--- a/site/content/en/v1.0.1/tasks/security/secure-gateways.md
+++ b/site/content/en/v1.0.1/tasks/security/secure-gateways.md
@@ -2,8 +2,8 @@
 title: "Secure Gateways"
 ---
 
-This guide will help you get started using secure Gateways. The guide uses a self-signed CA, so it should be used for
-testing and demonstration purposes only.
+This task will help you get started using secure Gateways.
+This task uses a self-signed CA, so it should be used for testing and demonstration purposes only.
 
 ## Prerequisites
 
@@ -11,7 +11,7 @@ testing and demonstration purposes only.
 
 ## Installation
 
-Follow the steps from the [Quickstart](../../quickstart) to install Envoy Gateway and the example manifest.
+Follow the steps from the [Quickstart](../quickstart) to install Envoy Gateway and the example manifest.
 Before proceeding, you should be able to query the example backend using HTTP.
 
 ## TLS Certificates
@@ -251,10 +251,10 @@ This section gives a walkthrough to generate RSA and ECDSA derived certificates
 
 ## Prerequisites
 
-Follow the steps from the [Quickstart](../../quickstart) to install Envoy Gateway and the example manifest.
+Follow the steps from the [Quickstart](../quickstart) to install Envoy Gateway and the example manifest.
 Before proceeding, you should be able to query the example backend using HTTP.
 
-Follow the steps in the [TLS Certificates](#tls-certificates) section in the guide to generate self-signed RSA derived Server certificate and private key, and configure those in the Gateway listener configuration to terminate HTTPS traffic.
+Follow the steps in the [TLS Certificates](#tls-certificates) section to generate self-signed RSA derived Server certificate and private key, and configure those in the Gateway listener configuration to terminate HTTPS traffic.
 
 ## Pre-checks
 
@@ -289,7 +289,7 @@ Moving forward in the doc, we will be configuring the existing Gateway listener
 
 ## TLS Certificates
 
-Reuse the CA certificate and key pair generated in the [Secure Gateways](#tls-certificates) guide and use this CA to sign both RSA and ECDSA Server certificates.
+Reuse the CA certificate and key pair generated in the [Secure Gateways](#tls-certificates) task and use this CA to sign both RSA and ECDSA Server certificates.
 Note the CA certificate and key names are `example.com.crt` and `example.com.key` respectively.
 
 
@@ -365,11 +365,11 @@ This sections gives a walkthrough to generate multiple certificates correspondin
 Follow the steps from the [Quickstart](../../quickstart) to install Envoy Gateway and the example manifest.
 Before proceeding, you should be able to query the example backend using HTTP.
 
-Follow the steps in the [TLS Certificates](#tls-certificates) section in the guide to generate self-signed RSA derived Server certificate and private key, and configure those in the Gateway listener configuration to terminate HTTPS traffic.
+Follow the steps in the [TLS Certificates](#tls-certificates) section to generate self-signed RSA derived Server certificate and private key, and configure those in the Gateway listener configuration to terminate HTTPS traffic.
 
 ## Additional Configurations
 
-Using the [TLS Certificates](#tls-certificates) section in the guide we first generate additional Secret for another Host `www.sample.com`.
+Using the [TLS Certificates](#tls-certificates) section, we first generate additional Secret for another Host `www.sample.com`.
 
 ```shell
 openssl req -x509 -sha256 -nodes -days 365 -newkey rsa:2048 -subj '/O=sample Inc./CN=sample.com' -keyout sample.com.key -out sample.com.crt
@@ -438,7 +438,7 @@ Since the multiple certificates are configured on the same Gateway listener, Env
 
 ### Clusters with External LoadBalancer Support
 
-Refer to the steps mentioned earlier in the guide under [Testing in clusters with External LoadBalancer Support](#clusters-with-external-loadbalancer-support)
+Refer to the steps mentioned earlier under [Testing in clusters with External LoadBalancer Support](#clusters-with-external-loadbalancer-support)
 
 ## Next Steps
 
diff --git a/site/content/en/v1.0.1/tasks/security/tls-passthrough.md b/site/content/en/v1.0.1/tasks/security/tls-passthrough.md
index 98c90ec352d9..2683f5683329 100644
--- a/site/content/en/v1.0.1/tasks/security/tls-passthrough.md
+++ b/site/content/en/v1.0.1/tasks/security/tls-passthrough.md
@@ -2,7 +2,7 @@
 title: "TLS Passthrough"
 ---
 
-This guide will walk through the steps required to configure TLS Passthrough via Envoy Gateway. Unlike configuring
+This task will walk through the steps required to configure TLS Passthrough via Envoy Gateway. Unlike configuring
 Secure Gateways, where the Gateway terminates the client TLS connection, TLS Passthrough allows the application itself
 to terminate the TLS connection, while the Gateway routes the requests to the application based on SNI headers.
 
diff --git a/site/content/en/v1.0.1/tasks/traffic/http3.md b/site/content/en/v1.0.1/tasks/traffic/http3.md
index 0c1dcba36761..e9367c72f105 100644
--- a/site/content/en/v1.0.1/tasks/traffic/http3.md
+++ b/site/content/en/v1.0.1/tasks/traffic/http3.md
@@ -2,8 +2,8 @@
 title: "HTTP3"
 ---
 
-This guide will help you get started using HTTP3 using EG. The guide uses a self-signed CA, so it should be used for
-testing and demonstration purposes only.
+This task will help you get started using HTTP3 using EG.
+This task uses a self-signed CA, so it should be used for testing and demonstration purposes only.
 
 ## Prerequisites
 
diff --git a/site/content/en/v1.0.1/tasks/traffic/routing-outside-kubernetes.md b/site/content/en/v1.0.1/tasks/traffic/routing-outside-kubernetes.md
index f64dfd5ac9fb..e43052073cb0 100644
--- a/site/content/en/v1.0.1/tasks/traffic/routing-outside-kubernetes.md
+++ b/site/content/en/v1.0.1/tasks/traffic/routing-outside-kubernetes.md
@@ -7,7 +7,7 @@ running is a common use case. This can be achieved by defining FQDN addresses in
 
 ## Installation
 
-Follow the steps from the [Quickstart](../../quickstart) guide to install Envoy Gateway and the example manifest.
+Follow the steps from the [Quickstart](../../quickstart) to install Envoy Gateway and the example manifest.
 Before proceeding, you should be able to query the example backend using HTTP.
 
 ## Configuration
diff --git a/site/content/en/v1.0.1/tasks/traffic/udp-routing.md b/site/content/en/v1.0.1/tasks/traffic/udp-routing.md
index 59e6cc8f4b78..497d0781b98b 100644
--- a/site/content/en/v1.0.1/tasks/traffic/udp-routing.md
+++ b/site/content/en/v1.0.1/tasks/traffic/udp-routing.md
@@ -3,7 +3,7 @@ title: "UDP Routing"
 ---
 
 The [UDPRoute][] resource allows users to configure UDP routing by matching UDP traffic and forwarding it to Kubernetes
-backends. This guide will use CoreDNS example to walk you through the steps required to configure UDPRoute on Envoy
+backends. This task will use CoreDNS example to walk you through the steps required to configure UDPRoute on Envoy
 Gateway.
 
 __Note:__ UDPRoute allows Envoy Gateway to operate as a non-transparent proxy between a UDP client and server. The lack
@@ -12,7 +12,7 @@ For additional information, refer to Envoy's [UDP proxy documentation][].
 
 ## Prerequisites
 
-Follow the steps from the [Quickstart](../../quickstart) guide to install Envoy Gateway and the example manifest.
+Follow the steps from the [Quickstart](../../quickstart) to install Envoy Gateway and the example manifest.
 Before proceeding, you should be able to query the example backend using HTTP.
 
 ## Installation