diff --git a/config.json b/config.json
index 6d8d576..87059cd 100644
--- a/config.json
+++ b/config.json
@@ -282,7 +282,6 @@
             }
         },
         "reproducible" : {
-            "MACHINE" : "qemux86-64",
             "step1" : {
                 "shortname" : "Reproducible Selftest",
                 "EXTRACMDS" : ["OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail/ oe-selftest -r reproducible"],
@@ -1228,25 +1227,23 @@
             }
         },
         "reproducible" : {
+            "MACHINE" : "qemux86-64",
             "TEMPLATE" : "reproducible"
         },
-        "reproducible-meta-oe" : {
-            "TEMPLATE" : "reproducible-meta-oe"
-        },
-        "reproducible-ubuntu" : {
-            "TEMPLATE" : "reproducible"
-        },
-        "reproducible-debian" : {
+        "reproducible-arm" : {
+            "MACHINE" : "qemuarm64",
             "TEMPLATE" : "reproducible"
         },
-        "reproducible-fedora" : {
+        "reproducible-cross" : {
+            "MACHINE" : "qemuarm64",
             "TEMPLATE" : "reproducible"
         },
-        "reproducible-opensuse" : {
+        "reproducible-arm-cross" : {
+            "MACHINE" : "qemux86-64",
             "TEMPLATE" : "reproducible"
         },
-        "reproducible-centos" : {
-            "TEMPLATE" : "reproducible"
+        "reproducible-meta-oe" : {
+            "TEMPLATE" : "reproducible-meta-oe"
         },
         "check-layer" : {
             "NEEDREPOS" : ["bitbake", "meta-mingw"],