-# Add local packagegroups to agl-test-wgt and agl-devel-wgt image feature
-# package lists
-FEATURE_PACKAGES_agl-test-wgt_append = " packagegroup-agl-ivi-services-test"
-FEATURE_PACKAGES_agl-devel-wgt_append = " \
- packagegroup-agl-ivi-services-devel \
- packagegroup-agl-demo-platform-devel \
- "
+# Include all kernel modules here for ease-of-use during development.
+# Note that this is conditional on virtual/kernel not being linux-dummy
+# in order to allow building the demo images as containers.
+# Comment this out to switch to selecting the kernel modules
+# individually.
+IMAGE_INSTALL:append = " ${@'kernel-modules' if d.getVar('PREFERRED_PROVIDER_virtual/kernel') != 'linux-dummy' else ''}"