diff --git a/Makefile b/Makefile
index 0502ac65f2..712f03cb5a 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,15 @@ docs-build:
 docs-serve: docs-build
 	docker run --rm -p 8000:8000 -v ${PWD}:/docs:ro kata-docs:latest serve --config-file /docs/mkdocs.yaml -a 0.0.0.0:8000
 
+CSPELL_IMAGE ?= ghcr.io/streetsidesoftware/cspell@sha256:f02e91044d7ab4c31aab76e9b87943a1c8a229f30ce684ca1f04f941084cb049
+docs-spellcheck:
+	docker run --rm -v ${PWD}:/workdir:ro -w /workdir ${CSPELL_IMAGE} --config .cspell.yaml "**/*.md" "**/*.rst" "**/*.txt"
+
+docs-editorconfig-checker:
+	docker run --rm --volume=${PWD}:/check mstruebing/editorconfig-checker:v3.7
+
+docs-lint: docs-spellcheck docs-editorconfig-checker
+
 .PHONY: \
 	all \
 	kata-tarball \
@@ -59,4 +68,7 @@ docs-serve: docs-build
 	default \
 	static-checks \
 	docs-build \
-	docs-serve
+	docs-serve \
+	docs-spellcheck \
+	docs-editorconfig-checker \
+	docs-lint
diff --git a/docs/Documentation-Requirements.md b/docs/Documentation-Requirements.md
index 4f6b66acae..c02c481277 100644
--- a/docs/Documentation-Requirements.md
+++ b/docs/Documentation-Requirements.md
@@ -191,7 +191,7 @@ Since this project uses a number of terms not found in conventional
 dictionaries, we have a [kata-dictionary](../tests/spellcheck/kata-dictionary.txt)
 that contains some project specific terms we use.
 
-You can run the `cspell` checking tool on your document before raising a PR to ensure it
+You can run the `make docs-spellcheck` tool on your document before raising a PR to ensure it
 is free of mistakes.
 
 If your document introduces new terms, you need to update the custom
diff --git a/docs/helm-configuration.md b/docs/helm-configuration.md
index aa83ecda2f..ba7d5752da 100644
--- a/docs/helm-configuration.md
+++ b/docs/helm-configuration.md
@@ -93,6 +93,14 @@ customRuntimes:
 
 Again, view the default [`values.yaml`](#parameters) file for more details.
 
+### Drop-In Runtime Configuration
+
+The base runtime configuration shipped with Kata Containers can be modified using an
+overlay method. This can be done directly on the filesystem using the instructions
+found [here](runtime-configuration.md#drop-in-files).
+You can also use the `customRuntimes.runtimes.[name].dropIn` configuration in the helm
+chart to achieve the same results.
+
 ## Deployment Modes (DaemonSet vs Job)
 
 The chart can install Kata on nodes in one of two ways, selected with the
@@ -394,49 +402,3 @@ no manual `runtimeClass.nodeSelector` is set for that shim.
 cluster), external NFD is not seen, so auto-injected labels are not added. Manual
 `runtimeClass.nodeSelector` values are still applied in all cases.
 
-## Customizing Configuration with Drop-in Files
-
-When kata-deploy installs Kata Containers, the base configuration files should not
-be modified directly. Instead, use drop-in configuration files to customize
-settings. This approach ensures your customizations survive kata-deploy upgrades.
-
-### How Drop-in Files Work
-
-The Kata runtime reads the base configuration file and then applies any `.toml`
-files found in the `config.d/` directory alongside it. Files are processed in
-alphabetical order, with later files overriding earlier settings.
-
-### Creating Custom Drop-in Files
-
-To add custom settings, create a `.toml` file in the appropriate `config.d/`
-directory. Use a numeric prefix to control the order of application.
-
-**Reserved prefixes** (used by kata-deploy):
-
-- `10-*`: Core kata-deploy settings
-- `20-*`: Debug settings
-- `30-*`: Kernel parameters
-
-**Recommended prefixes for custom settings**: `50-89`
-
-### Drop-In Config Examples
-
-#### Adding Custom Kernel Parameters
-
-```bash
-# SSH into the node or use kubectl exec
-sudo mkdir -p /opt/kata/share/defaults/kata-containers/runtimes/qemu/config.d/
-sudo cat > /opt/kata/share/defaults/kata-containers/runtimes/qemu/config.d/50-custom.toml << 'EOF'
-[hypervisor.qemu]
-kernel_params = "my_param=value"
-EOF
-```
-
-#### Changing Default Memory Size
-
-```bash
-sudo cat > /opt/kata/share/defaults/kata-containers/runtimes/qemu/config.d/50-memory.toml << 'EOF'
-[hypervisor.qemu]
-default_memory = 4096
-EOF
-```
diff --git a/docs/runtime-configuration.md b/docs/runtime-configuration.md
index 668543a86f..69b15f4f89 100644
--- a/docs/runtime-configuration.md
+++ b/docs/runtime-configuration.md
@@ -1,58 +1,64 @@
 # Runtime Configuration
 
-The containerd shims (both the Rust and Go implementations) take configuration files to control their behavior. These files are in `/opt/kata/share/defaults/kata-containers/`. An example excerpt:
 
-```toml title="/opt/kata/share/defaults/kata-containers/configuration.toml"
+## Drop-in Files
+
+When kata-deploy installs Kata Containers, the base configuration files at
+`/opt/kata/share/defaults/kata-containers` should not be modified directly. Instead, use
+drop-in configuration files to customize settings. This approach ensures your
+customizations survive kata-deploy upgrades.
+
+### How Drop-in Files Work
+
+The Kata runtime reads the base configuration file and then applies any `.toml`
+files found in the `config.d/` directory alongside it. Files are processed in
+alphabetical order, with later files overriding earlier settings.
+
+### Base Configuration Files
+
+The base configuration references for the Go runtime can be found [here](https://github.com/kata-containers/kata-containers/tree/main/src/runtime/config), and for the Rust runtime [here](https://github.com/kata-containers/kata-containers/tree/main/src/runtime-rs/config).
+
+!!! tip "What runtime implementation am I using?"
+
+    By looking at the `/opt/kata/containerd/config.d/kata-deploy.toml` file, each runtimeClass (ex. `kata-qemu-nvidia-gpu`, `kata-qemu-nvidia-gpu-runtime-rs`) is configured with a specific `runtime_path`. If this path is set to `#!toml runtime_path = "/opt/kata/bin/containerd-shim-kata-v2"` you are using the Go runtime. Otherwise if it's `#!toml runtime_path = "/opt/kata/runtime-rs/bin/containerd-shim-kata-v2"`, it's the Rust runtime.
+
+Note that Rust will be the default runtime in Kata v4.
+
+### Creating Custom Drop-in Files
+
+The recommended way to create custom drop-in files is to use the [helm chart](helm-configuration.md#drop-in-runtime-configuration).
+Drop-in files may also be added directly to the filesystem.
+
+To add custom settings, create a `.toml` file in the appropriate `config.d/`
+directory. Use a numeric prefix to control the order of application.
+
+**Reserved prefixes** (used by kata-deploy):
+
+- `10-*`: Core kata-deploy settings
+- `20-*`: Debug settings
+- `30-*`: Kernel parameters
+- `50-*`: Settings from the helm chart
+
+**Recommended prefixes for custom settings**: `50-89`
+
+### Drop-In Config Examples
+
+#### Adding Custom Kernel Parameters
+
+```bash
+# SSH into the node or use kubectl exec
+sudo mkdir -p /opt/kata/share/defaults/kata-containers/runtimes/qemu/config.d/
+sudo cat > /opt/kata/share/defaults/kata-containers/runtimes/qemu/config.d/50-custom.toml << 'EOF'
 [hypervisor.qemu]
-path = "/opt/kata/bin/qemu-system-x86_64"
-kernel = "/opt/kata/share/kata-containers/vmlinux.container"
-image = "/opt/kata/share/kata-containers/kata-containers.img"
-machine_type = "q35"
-
-# rootfs filesystem type:
-#   - ext4 (default)
-#   - xfs
-#   - erofs
-rootfs_type = "ext4"
-
-# Enable running QEMU VMM as a non-root user.
-# By default QEMU VMM run as root. When this is set to true, QEMU VMM process runs as
-# a non-root random user. See documentation for the limitations of this mode.
-rootless = false
-
-# List of valid annotation names for the hypervisor
-# Each member of the list is a regular expression, which is the base name
-# of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path"
-enable_annotations = ["enable_iommu", "kernel_params"]
+kernel_params = "my_param=value"
+EOF
 ```
 
-Warning: do not enable `virtio_fs_extra_args` in `enable_annotations` unless you fully trust all annotation sources. Allowing pods to pass `virtiofsd` extra arguments can be abused to inject unsafe daemon options and lead to malicious host-side behavior.
+#### Changing Default Memory Size
 
-These files should never be modified directly. If you wish to create a modified version of these files, you may create your own [custom runtime](helm-configuration.md#custom-runtimes). For example, to modify the image path, we provide these values to helm:
-
-```yaml title="values.yaml"
-customRuntimes:
-  enabled: true
-  runtimes:
-    my-gpu-runtime:
-      baseConfig: "qemu-nvidia-gpu"
-      dropIn: |
-        [hypervisor.qemu]
-        image = "/path/to/custom-image.img"
-      runtimeClass: |
-        kind: RuntimeClass
-        apiVersion: node.k8s.io/v1
-        metadata:
-          name: kata-my-gpu-runtime
-          labels:
-            app.kubernetes.io/managed-by: kata-deploy
-        handler: kata-my-gpu-runtime
-        overhead:
-          podFixed:
-            memory: "640Mi"
-            cpu: "500m"
-        scheduling:
-          nodeSelector:
-            katacontainers.io/kata-runtime: "true"
+```bash
+sudo cat > /opt/kata/share/defaults/kata-containers/runtimes/qemu/config.d/50-memory.toml << 'EOF'
+[hypervisor.qemu]
+default_memory = 4096
+EOF
 ```
-
diff --git a/mkdocs.yaml b/mkdocs.yaml
index fc79fd57ce..4c2480973c 100644
--- a/mkdocs.yaml
+++ b/mkdocs.yaml
@@ -88,4 +88,5 @@ markdown_extensions:
 plugins:
     - search
     - awesome-nav
+    - open-in-new-tab