diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 98641d0..7fccd5b 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -7,7 +7,7 @@ accept_configuration:
       equals_value: Yocto
     - condition: property
       property: target.arch
-      in_values: [TARGET1, TARGET2, TARGET3, TARGET4, TARGET5]
+      in_values: [TARGET1, TARGET2, TARGET3, TARGET4, TARGET5, TARGET6]
 
 machine_type:
   Build:
@@ -15,12 +15,14 @@ machine_type:
 
 # Target build matrix:
 #
-#           [target1]       [target2]   [target3]       [target4]       [target5]
-# [machine] qemuarm64       qemux86-64  qemuarm         qemux86         qemuarm64
-# [yocto]   master          walnascar   scarthgap       styhead         scarthgap
-# [wayland] yes             no          no              yes             yes
-# [mingw]   no              no          yes             no              no
-# [static]  no              no          no              no              yes
+#           [target1] [target2]  [target3] [target4] [target5] [target6]
+# [machine] qemuarm64 qemux86-64 qemuarm   qemux86   qemuarm64 qemuarm64
+# [yocto]   master    walnascar  scarthgap styhead   scarthgap master
+# [wayland] yes       no         yes       yes       yes       no
+# [x11]     no        yes        yes       no        no        yes
+# [opengl]  yes       yes        yes       yes       yes       no
+# [mingw]   no        no         yes       no        no        no
+# [static]  no        no         no        no        yes       no
 #
 
 target1: &target1
@@ -34,7 +36,7 @@ target1: &target1
       variableValue: master.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland
+      variableValue: ci configs wayland opengl
   enable_if:
       condition: property
       property: target.arch
@@ -50,7 +52,7 @@ target2: &target2
       variableValue: walnascar.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs
+      variableValue: ci configs x11 opengl
   enable_if:
       condition: property
       property: target.arch
@@ -66,7 +68,7 @@ target3: &target3
       variableValue: scarthgap.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs mingw
+      variableValue: ci configs mingw wayland x11 opengl
   enable_if:
       condition: property
       property: target.arch
@@ -82,7 +84,7 @@ target4: &target4
       variableValue: styhead.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland no-webengine
+      variableValue: ci configs wayland opengl
   enable_if:
       condition: property
       property: target.arch
@@ -98,11 +100,27 @@ target5: &target5
       variableValue: scarthgap.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland static no-webengine
+      variableValue: ci configs wayland opengl static
   enable_if:
       condition: property
       property: target.arch
       equals_value: TARGET5
+target6: &target6
+  type: Group
+  instructions:
+    - type: EnvironmentVariable
+      variableName: MACHINE
+      variableValue: qemuarm64
+    - type: EnvironmentVariable
+      variableName: MANIFEST
+      variableValue: master.xml
+    - type: EnvironmentVariable
+      variableName: TEST_CONFIGS
+      variableValue: ci configs x11
+  enable_if:
+      condition: property
+      property: target.arch
+      equals_value: TARGET6
 
 instructions:
   Build:
@@ -111,6 +129,7 @@ instructions:
   - *target3
   - *target4
   - *target5
+  - *target6
   - type: EnvironmentVariable
     variableName: DL_DIR
     variableValue: "/mnt/yocto-cache/downloads"
diff --git a/coin/test-configs.inc b/coin/test-configs.inc
index 183c2eb..a4ddedc 100644
--- a/coin/test-configs.inc
+++ b/coin/test-configs.inc
@@ -40,13 +40,16 @@ PREFERRED_ARM_INSTRUCTION_SET              ?= "thumb"
 ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"
 
 # enable webengine with commercial/proprietary features
-DISTRO_FEATURES:append = " webengine"
 PACKAGECONFIG:append:pn-qtwebengine = " proprietary-codecs"
 
 PACKAGECONFIG:append:pn-qtbase = "\
-    tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \
+    tslib zstd libproxy gssapi mtdev cups \
     sql-mysql sql-odbc sql-psql sql-sqlite journald brotli \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
 "
 
 RDEPENDS:${PN}:append:pn-packagegroup-qt6-modules = " packagegroup-qt6-examples"
+
+# remove all main features, added back in different builds
+POKY_DEFAULT_DISTRO_FEATURES:remove = "opengl wayland vulkan"
+DISTRO_FEATURES_DEFAULT:remove = "x11"
diff --git a/coin/test-no-webengine.inc b/coin/test-no-webengine.inc
deleted file mode 100644
index 8c3f2ad..0000000
--- a/coin/test-no-webengine.inc
+++ /dev/null
@@ -1 +0,0 @@
-DISTRO_FEATURES:remove = "webengine"
diff --git a/coin/test-opengl.inc b/coin/test-opengl.inc
new file mode 100644
index 0000000..b586d66
--- /dev/null
+++ b/coin/test-opengl.inc
@@ -0,0 +1,2 @@
+DISTRO_FEATURES:append = " opengl vulkan"
+DISTRO_FEATURES:append = " webengine"
diff --git a/coin/test-static.inc b/coin/test-static.inc
index d3c028e..8164503 100644
--- a/coin/test-static.inc
+++ b/coin/test-static.inc
@@ -2,3 +2,4 @@ PACKAGECONFIG:append:pn-qtbase = " static"
 QT_PTEST_ENABLED = "0"
 PACKAGECONFIG:remove:pn-qtapplicationmanager = "multi-process bubblewrap"
 RDEPENDS:${PN}:remove:pn-packagegroup-qt6-modules = "packagegroup-qt6-examples"
+DISTRO_FEATURES:remove = "webengine"
diff --git a/coin/test-wayland.inc b/coin/test-wayland.inc
index bd91fd8..51ed909 100644
--- a/coin/test-wayland.inc
+++ b/coin/test-wayland.inc
@@ -1,2 +1 @@
-DISTRO_FEATURES:remove = "x11"
 DISTRO_FEATURES:append = " wayland"
diff --git a/coin/test-x11.inc b/coin/test-x11.inc
new file mode 100644
index 0000000..9931390
--- /dev/null
+++ b/coin/test-x11.inc
@@ -0,0 +1 @@
+DISTRO_FEATURES:append = " x11"