diff --git a/site-src/api-types/cluster-set.md b/site-src/api-types/cluster-set.md
index b6e357a..05dc644 100644
--- a/site-src/api-types/cluster-set.md
+++ b/site-src/api-types/cluster-set.md
@@ -20,37 +20,37 @@ This property can be used to:
 
 - uniquely identify clusters using a clusterID
 
-    ```
+    ```yaml
     apiVersion: about.k8s.io/v1
     kind: ClusterProperty
     metadata:
-        name: cluster.clusterset.k8s.io
+      name: cluster.clusterset.k8s.io
     spec:
-        value: cluster-1
+      value: cluster-1
     ```
 
 - uniquely identify the membership of a cluster in a ClusterSet for the lifetime of the membership.
 
-    ```
+    ```yaml
     apiVersion: about.k8s.io/v1
     kind: ClusterProperty
     metadata:
-        name: clusterset.k8s.io
+      name: clusterset.k8s.io
     spec:
-        value: mycoolclusterset
+      value: mycoolclusterset
     ```
     
 - Provide a reference point for multi-cluster tooling to build on within a cluster set, for example for DNS labels, for logging and tracing, etc.
 
 - Provide extra metadata space to store other cluster properties that might otherwise be implemented as ad-hoc annotations on semantically adjacent objects.
 
-    ```
+    ```yaml
     apiVersion: about.k8s.io/v1
     kind: ClusterProperty
     metadata:
-        name: fingerprint.mycoolimplementation.com
+      name: fingerprint.mycoolimplementation.com
     spec:
-        value:  '{"major": "1","minor": "18","gitVersion": "v1.18.2","gitCommit": "52c56ce7a8272c798dbc29846288d7cd9fbae032","gitTreeState": "clean","buildDate": "2020-04-30T20:19:45Z","goVersion": "go1.13.9","compiler": "gc","platform": "linux/amd64"}'
+      value: '{"major": "1","minor": "18","gitVersion": "v1.18.2","gitCommit": "52c56ce7a8272c798dbc29846288d7cd9fbae032","gitTreeState": "clean","buildDate": "2020-04-30T20:19:45Z","goVersion": "go1.13.9","compiler": "gc","platform": "linux/amd64"}'
     ```
 
 
diff --git a/site-src/concepts/about-api.md b/site-src/concepts/about-api.md
index 434c18e..c22458d 100644
--- a/site-src/concepts/about-api.md
+++ b/site-src/concepts/about-api.md
@@ -15,7 +15,7 @@ The ClusterProperty CRD is proposed to give a Kubernetes-native way of identifyi
 
 ### Example
 
-```
+```yaml
 apiVersion: about.k8s.io/v1
 kind: ClusterProperty
 metadata:
diff --git a/site-src/concepts/cluster-profile-api.md b/site-src/concepts/cluster-profile-api.md
index e022dc6..d993256 100644
--- a/site-src/concepts/cluster-profile-api.md
+++ b/site-src/concepts/cluster-profile-api.md
@@ -34,29 +34,29 @@ a [ClusterSet](../api-types/cluster-set.md). A cluster inventory is considered a
 apiVersion: multicluster.x-k8s.io/v1alpha1
 kind: ClusterProfile
 metadata:
- name: some-cluster-name
- namespace: fleet-system
- labels:
-   x-k8s.io/cluster-manager: some-cluster-manager
+  name: some-cluster-name
+  namespace: fleet-system
+  labels:
+    x-k8s.io/cluster-manager: some-cluster-manager
 spec:
   displayName: some-cluster
   clusterManager:
     name: some-cluster-manager
 status:
- version:
-   kubernetes: 1.28.0
- properties:
-   - name: clusterset.k8s.io
-     value: some-clusterset
-   - name: location
-     value: apac
- conditions:
-   - type: ControlPlaneHealthy
-     status: True
-     lastTransitionTime: "2023-05-08T07:56:55Z"
-     message: ""
-   - type: Joined
-     status: True
-     lastTransitionTime: "2023-05-08T07:58:55Z"
-     message: ""
+  version:
+    kubernetes: 1.28.0
+  properties:
+    - name: clusterset.k8s.io
+      value: some-clusterset
+    - name: location
+      value: apac
+  conditions:
+    - type: ControlPlaneHealthy
+      status: True
+      lastTransitionTime: "2023-05-08T07:56:55Z"
+      message: ""
+    - type: Joined
+      status: True
+      lastTransitionTime: "2023-05-08T07:58:55Z"
+      message: ""
 ```
diff --git a/site-src/concepts/work-api.md b/site-src/concepts/work-api.md
index a70888a..71a4afc 100644
--- a/site-src/concepts/work-api.md
+++ b/site-src/concepts/work-api.md
@@ -22,23 +22,23 @@ Update of a Work will trigger the resource update on the Managed Cluster, and de
 
 ## Example
 
-```
+```yaml
 apiVersion: multicluster.x-k8s.io/v1alpha1
 kind: Work
 metadata:
- name: work-sample
- namespace: cluster1
+  name: work-sample
+  namespace: cluster1
 spec:
- workload:
-   manifests:
-   - apiVersion: v1
-     kind: ConfigMap
-     metadata:
-       name: cm
-       namespace: default
-     data:
-       ui.properties: |
-         color=purple
+  workload:
+    manifests:
+    - apiVersion: v1
+      kind: ConfigMap
+      metadata:
+        name: cm
+        namespace: default
+      data:
+        ui.properties: |
+          color=purple
 ```
 
 User creates a Work in the `cluster1` namespace on the Work Hub that the Work Controller is authorized to access. 
diff --git a/site-src/guides/coredns.md b/site-src/guides/coredns.md
index 8634a67..4eca64f 100644
--- a/site-src/guides/coredns.md
+++ b/site-src/guides/coredns.md
@@ -265,30 +265,30 @@ cat <<EOF > dnsutils.yaml
 apiVersion: v1
 kind: Pod
 metadata:
- name: dnsutils
- namespace: demo
+  name: dnsutils
+  namespace: demo
 spec:
- containers:
- - name: dnsutils
-   image: k8s.gcr.io/e2e-test-images/jessie-dnsutils:1.3
-   command:
-     - sleep
-     - "3600"
-   imagePullPolicy: IfNotPresent
- restartPolicy: Always
- EOF
- ```
-
- ```
- kubectl apply -f dnsutils.yaml
- ```
-
- You can then use the `dnsutils` pod to confirm that the DNS query for the ServiceImport responds with the IP set in the fake ServiceImport previously defined.
-
- ```
- kubectl exec -it dnsutils -n demo -- bash
- ```
- ```
+  containers:
+  - name: dnsutils
+    image: k8s.gcr.io/e2e-test-images/jessie-dnsutils:1.3
+    command:
+      - sleep
+      - "3600"
+    imagePullPolicy: IfNotPresent
+  restartPolicy: Always
+EOF
+```
+
+```
+kubectl apply -f dnsutils.yaml
+```
+
+You can then use the `dnsutils` pod to confirm that the DNS query for the ServiceImport responds with the IP set in the fake ServiceImport previously defined.
+
+```
+kubectl exec -it dnsutils -n demo -- bash
+```
+```
 root@dnsutils:/# nslookup myservice.demo.svc.clusterset.local
 ```
 **Output (Do Not Copy)**