diff --git a/dynamic-layers/webserver/recipes-core/images/webkit-dev-ci-tools.bbappend b/dynamic-layers/webserver/recipes-core/images/webkit-dev-ci-tools.bbappend
index 205c0586..1a9faeca 100644
--- a/dynamic-layers/webserver/recipes-core/images/webkit-dev-ci-tools.bbappend
+++ b/dynamic-layers/webserver/recipes-core/images/webkit-dev-ci-tools.bbappend
@@ -1,4 +1,5 @@
 IMAGE_INSTALL:append = " \
     apache2 \
     apache2-scripts \
-"
\ No newline at end of file
+"
+
diff --git a/recipes-browser/images/core-image-wpe-crosscompilation.bb b/recipes-browser/images/core-image-wpe-crosscompilation.bb
index be5780cb..ff5f6678 100644
--- a/recipes-browser/images/core-image-wpe-crosscompilation.bb
+++ b/recipes-browser/images/core-image-wpe-crosscompilation.bb
@@ -1,7 +1,8 @@
-SUMMARY = "WPE cross-compilation image with wpebackend-fdo. \
-           This is useful for creating a SDK for cross-building WPE. \
-           The SDK for ARMv7 will default to use the traditional ISA. \
-           To use Thumb2 you have to pass the -mthumb compiler flag."
+SUMMARY = "WPE SDK image with wpebackend-fdo"
+DESCRIPTION = "WPE cross-compilation image with wpebackend-fdo. \
+               This is useful for creating a SDK for cross-building WPE. \
+               The SDK for ARMv7 will default to use the traditional ISA. \
+               To use Thumb2 you have to pass the -mthumb compiler flag."
 
 LICENSE = "BSD-2-Clause"
 
diff --git a/recipes-browser/images/webkit-dev-ci-tools.bb b/recipes-browser/images/webkit-dev-ci-tools.bb
index 4133ad75..8186ab01 100644
--- a/recipes-browser/images/webkit-dev-ci-tools.bb
+++ b/recipes-browser/images/webkit-dev-ci-tools.bb
@@ -1,11 +1,12 @@
-SUMMARY = "Image with all the required tools to build WPE (using the script build-webkit) \
-           and also run the tests (layout-tests, performance-tests, api-tests, etc). \
-           The SDK that gets build with 'bitbake ${IMAGENAME} -c populate_sdk' is valid \
-           for using in the host with the script build-webkit and the image itself has \
-           the tools to run the tests on the board. But the image doesn't contain \
-           webkit (wpe) itself. The purpose of this image is for using on the \
-           continous integration systems of webkit.org for WPE tests. \
-           For more info see the WebKit script named cross-toolchain-helper."
+SUMMARY = "WPE continuous integration build and test image"
+DESCRIPTION = "Image with all the required tools to build WPE (using the script build-webkit) \
+               and also run the tests (layout-tests, performance-tests, api-tests, etc). \
+               The SDK that gets build with 'bitbake ${IMAGENAME} -c populate_sdk' is valid \
+               for using in the host with the script build-webkit and the image itself has \
+               the tools to run the tests on the board. But the image doesn't contain \
+               webkit (wpe) itself. The purpose of this image is for using on the \
+               continous integration systems of webkit.org for WPE tests. \
+               For more info see the WebKit script named cross-toolchain-helper."
 
 LICENSE = "MIT"
 
@@ -17,6 +18,7 @@ SDK_XZ_COMPRESSION_LEVEL ?= "-0"
 
 # Use .xz instead of .bz2
 IMAGE_FSTYPES:append = " tar.xz wic.xz wic.bmap"
+# nooelint: oelint.vars.specific - ignored for convenience
 IMAGE_FSTYPES:remove:rpi = "tar.bz2 wic.bz2 ext3"
 
 inherit core-image features_check
@@ -24,16 +26,17 @@ inherit core-image features_check
 # Add 'dbg-pkgs' to this list or to EXTRA_IMAGE_FEATURES in local.conf if
 # you want debug symbols installed on the image. It is not added by default
 # because it increases the image size quite a bit (from 4GB to 10GB unpacked)
-IMAGE_FEATURES += " \
-                    debug-tweaks \
-                    dev-pkgs \
-                    hwcodecs \
-                    package-management \
-                    ssh-server-openssh \
-                    tools-debug \
-                    tools-profile \
-                    tools-sdk \
-                    "
+# nooelint: oelint.var.badimagefeature.debug-tweaks - This is an evaluation image
+IMAGE_FEATURES += "\
+                   debug-tweaks \
+                   dev-pkgs \
+                   hwcodecs \
+                   package-management \
+                   ssh-server-openssh \
+                   tools-debug \
+                   tools-profile \
+                   tools-sdk \
+                   "
 REQUIRED_DISTRO_FEATURES = "opengl wayland"
 
 IMAGE_LINGUAS = "en-us es-es"
@@ -91,7 +94,7 @@ IMAGE_INSTALL:append = " \
     wayland-tools \
     "
 
-# vcgencmd and related tools for the RPi (works also with opensource stack)
+# nooelint: oelint.vars.specific - vcgencmd and related tools for the RPi (works also with opensource stack)
 IMAGE_INSTALL:append:rpi = " userland"
 
 SDK_NATIVE_TOOLS = " \
@@ -129,7 +132,6 @@ IMAGE_INSTALL:append = " ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 waylan
 IMAGE_INSTALL:append = " ${PREFERRED_PROVIDER_virtual/wpebackend}"
 IMAGE_INSTALL:append = " packagegroup-wpewebkit-depends"
 
-
 #
 # Set a valid internal-sftp
 #