diff --git a/kas/opt/Kconfig b/kas/opt/Kconfig
index bc4ed997..ec010757 100644
--- a/kas/opt/Kconfig
+++ b/kas/opt/Kconfig
@@ -213,3 +213,12 @@ config KAS_INCLUDE_USE_DRACUT
 	string
 	default "kas/opt/dracut.yaml"
 	depends on USE_DRACUT
+
+config IMAGE_EXCLUDE_DOCS
+	bool "Exclude docs from the image"
+	default y
+
+config KAS_INCLUDE_IMAGE_EXCLUDE_DOCS
+	string
+	default "kas/opt/exclude-docs.yaml"
+	depends on IMAGE_EXCLUDE_DOCS
diff --git a/kas/package/pkg_isar-exclude-docs.yaml b/kas/opt/exclude-docs.yaml
similarity index 58%
rename from kas/package/pkg_isar-exclude-docs.yaml
rename to kas/opt/exclude-docs.yaml
index 0c24e982..c86b93ab 100644
--- a/kas/package/pkg_isar-exclude-docs.yaml
+++ b/kas/opt/exclude-docs.yaml
@@ -5,5 +5,5 @@ header:
   version: 14
 
 local_conf_header:
-  package-isar-exclude-docs: |
-    IMAGE_INSTALL:append = " isar-exclude-docs"
+  image-exclude-docs: |
+    IMAGE_ROOTFS_FEATURES += "exclude-docs"
diff --git a/kas/package/Kconfig b/kas/package/Kconfig
index 527aec0f..e342f8ef 100644
--- a/kas/package/Kconfig
+++ b/kas/package/Kconfig
@@ -89,17 +89,6 @@ config KAS_INCLUDE_PACKAGE_HELLO_ISAR
         default "kas/package/pkg_hello-isar.yaml"
         depends on PACKAGE_HELLO_ISAR
 
-
-config PACKAGE_ISAR_EXCLUDE_DOCS
-        bool "isar-exclude-docs"
-        default y
-
-config KAS_INCLUDE_PACKAGE_ISAR_EXCLUDE_DOCS
-        string
-        default "kas/package/pkg_isar-exclude-docs.yaml"
-        depends on PACKAGE_ISAR_EXCLUDE_DOCS
-
-
 config PACKAGE_ISAR_DISABLE_APT_CACHE
         bool "isar-disable-apt-cache"
         default y
diff --git a/scripts/generate_yaml.sh b/scripts/generate_yaml.sh
index aaa8bcba..904d241d 100755
--- a/scripts/generate_yaml.sh
+++ b/scripts/generate_yaml.sh
@@ -109,7 +109,6 @@ PKGS=" \
   hello-isar \
   hello \
   isar-disable-apt-cache \
-  isar-exclude-docs \
   kselftest \
   samefile \
   sshd-regen-keys \