diff --git a/config.json b/config.json
index afae5e9..31c3776 100644
--- a/config.json
+++ b/config.json
@@ -322,6 +322,22 @@
             "MACHINE" : "qemuarm64",
             "TEMPLATE" : "ltp-qemu"
         },
+        "qemuriscv32" : {
+            "MACHINE" : "qemuriscv64",
+            "TEMPLATE" : "arch-qemu"
+        },
+        "qemuriscv64" : {
+            "MACHINE" : "qemuriscv64",
+            "TEMPLATE" : "arch-qemu"
+        },
+        "qemuriscv64-ptest" : {
+            "MACHINE" : "qemuriscv64",
+            "TEMPLATE" : "ptest-qemu"
+        },
+        "qemuppc64" : {
+            "MACHINE" : "qemuppc64",
+            "TEMPLATE" : "arch-qemu"
+        },
         "meta-arm" : {
             "NEEDREPOS" : ["poky", "meta-arm"],
             "ADDLAYER" : [
diff --git a/scripts/run-config b/scripts/run-config
index 82de91f..9d639ef 100755
--- a/scripts/run-config
+++ b/scripts/run-config
@@ -85,6 +85,8 @@ testmode = args.test
 # toolchain tests are run in system mode for x86, user mode for the other 
 # arches due to speed
 # toolchain tests only run on full builds
+if args.target in ["qemuriscv32", "qemuriscv64", "qemuppc64"]:
+    args.build_type = "full"
 if args.build_type == "quick":
     ourconfig["HELPERSTMACHTARGS"] = "-a -t machine"
 elif args.build_type == "full":