diff --git a/build-pipeline-yocto.yml.jinja2 b/build-pipeline-yocto.yml.jinja2
index cc0cb7abc3213ff5e30fe1526650208c71c78f6f..d16786b0df41a06413f75866f0a54c5035dbb9a6 100644
--- a/build-pipeline-yocto.yml.jinja2
+++ b/build-pipeline-yocto.yml.jinja2
@@ -82,15 +82,17 @@ build-{{ machine }}:
     - source build.env
     # yamllint disable-line rule:line-length
 {%- if machine == "seco-mx6" %}
-    - export SUPPORTED_HARDWARE="     SANTARO,     SANTOKA,     SANTINO,     SANTINO LT,     SANTVEND, "
+    - export SUPPORTED_HARDWARE="     SANTARO,     SANTOKA,     SANTINO,     SANTINO-LT,     SANTVEND, "
 {%- elif machine == "seco-mx8mm" %}
     - export SUPPORTED_HARDWARE="     TANARO, "
+{%- elif machine == "seco-mx8mp" %}
+    - export SUPPORTED_HARDWARE="     SOM-Trizeps-VIII-MX8M-Plus, "
 {%- elif machine == "seco-mx93" %}
-    - export SUPPORTED_HARDWARE="     MAURY, "
-{%- elif machine == "seco-genio700" %}
-    - export SUPPORTED_HARDWARE="     SOM-SMARC-Genio700, "
+    - export SUPPORTED_HARDWARE="     SOM-SMARC-MX93, "
 {%- elif machine == "seco-genio510" %}
     - export SUPPORTED_HARDWARE="     SOM-SMARC-Genio510, "
+{%- elif machine == "seco-genio700" %}
+    - export SUPPORTED_HARDWARE="     SOM-SMARC-Genio700, "
 {%- endif %}
     - !reference [.save_build_env]
 
@@ -105,7 +107,7 @@ build-{{ machine }}:
 # Run platform tests for this machine which the yocto image
 # This is a little hacky as we need to match the machine name to
 # the available platforms
-# 
+#
 # @TODO: We don't have devices for the i.MX93 and Genio 700 in
 # LAVA yet. Enable the tests here, when the new devices have
 # been added.
@@ -121,14 +123,14 @@ build-{{ machine }}:
   {% set platforms = "tanaro" %}
   {% set lava_machine = "imx8mguf" %}
 #{% elif machine == 'seco-mx93' %}
-#  {% set platforms = "maury" %}
+#  {% set platforms = "som-smarc-mx93" %}
 #  {% set lava_machine = "mx93" %}
-#{% elif machine == 'seco-genio700' %}
-#  {% set platforms = "som-smarc-genio700" %}
-#  {% set lava_machine = "genio700" %}
 #{% elif machine == 'seco-genio510' %}
 #  {% set platforms = "som-smarc-genio510" %}
 #  {% set lava_machine = "genio510" %}
+#{% elif machine == 'seco-genio700' %}
+#  {% set platforms = "som-smarc-genio700" %}
+#  {% set lava_machine = "genio700" %}
 {% else %}
   {% set platforms = '' %}
   {% set lava_machine = '' %}