diff --git a/.github/wordlist.txt b/.github/wordlist.txt
index dab0863d..2d617c76 100644
--- a/.github/wordlist.txt
+++ b/.github/wordlist.txt
@@ -24,6 +24,7 @@ CIDR
 config
 de
 dearmor
+debian
 dev
 DHCP
 DNS
@@ -59,6 +60,7 @@ jpc
 jpg
 jqc
 JQC
+kas
 keyrings
 kvm
 LEDs
@@ -74,6 +76,7 @@ MTDA's
 Mux
 MUX
 nano
+nanopi
 NanoPi
 neo
 netmask
@@ -129,3 +132,4 @@ VLC
 VNC
 Wi
 www
+yml
diff --git a/docs/integration.rst b/docs/integration.rst
index 518c2254..3bc2c455 100644
--- a/docs/integration.rst
+++ b/docs/integration.rst
@@ -111,14 +111,14 @@ Sign in to your account with the created superuser. Login should be successful.
 Attach to lava-server
 ~~~~~~~~~~~~~~~~~~~~~
 
-The sample NanoPi NEO image comes with the ``lava-dispatcher`` package
-preinstalled. It however needs to be configured to connect to the LAVA server
-and logger installed as noted above. You may connect to the MTDA agent using
-``ssh`` (default credentials are ``mtda``/``mtda``)::
+The sample NanoPi NEO image may be rebuilt with ``lava-dispatcher`` package
+pre-installed using the optional `lava.yml` fragment when building with `kas`::
 
-    $ ssh mtda@mtda-for-de0-nano-soc.lan
+   $ ./kas-container build kas/debian/mtda-nanopi-neo.yml:kas/opt/lava.yml
 
-Create a worker on the lava-server web interface through::
+It is also possible to install that package using `apt install`. Once the new
+image has been deployed (or required packages installed manually), create a
+worker on the lava-server web interface through::
     
     Administration -> Lava Scheduler App -> Worker (Add)
 
diff --git a/kas/opt/lava.yml b/kas/opt/lava.yml
new file mode 100644
index 00000000..94a39447
--- /dev/null
+++ b/kas/opt/lava.yml
@@ -0,0 +1,17 @@
+# ---------------------------------------------------------------------------
+# Optional support for LAVA
+# ---------------------------------------------------------------------------
+#
+# This software is a part of MTDA.
+# Copyright (C) 2024 Siemens Digital Industries Software
+#
+# ---------------------------------------------------------------------------
+# SPDX-License-Identifier: MIT
+# ---------------------------------------------------------------------------
+
+header:
+  version: 10
+
+local_conf_header:
+  lava_override: |
+    OVERRIDES .= ":lava"
diff --git a/meta-isar/recipes-core/images/mtda-image.bb b/meta-isar/recipes-core/images/mtda-image.bb
index 5dfc3ed9..3b8d761d 100644
--- a/meta-isar/recipes-core/images/mtda-image.bb
+++ b/meta-isar/recipes-core/images/mtda-image.bb
@@ -65,7 +65,7 @@ IMAGE_PREINSTALL += "                    \
 IMAGE_INSTALL += "python3-hap-python"
 
 # LAVA support
-IMAGE_PREINSTALL += "lava-dispatcher"
+IMAGE_PREINSTALL:lava += "lava-dispatcher"
 
 # Expand root file-system
 IMAGE_INSTALL:append = " expand-on-first-boot "