diff --git a/.github/configs/build-base-remix.yaml b/.github/configs/build-base-remix.yaml
new file mode 100644
index 0000000..97d8b01
--- /dev/null
+++ b/.github/configs/build-base-remix.yaml
@@ -0,0 +1,11 @@
+_source_dir: .
+header:
+  version: 16
+local_conf_header:
+  __menu_config_locals: ''
+  __menu_config_vars: |-
+    PVROOT_IMAGE = "yes"
+    PVROOT_IMAGE_BSP = "core-image-base"
+    EXTRA_IMAGE_FEATURES:append = "debug-tweaks"
+target:
+- pantavisor-remix
diff --git a/.github/configs/sunxi/sunxi-orange-pi-3lts-remix-scarthgap.yaml b/.github/configs/sunxi/sunxi-orange-pi-3lts-remix-scarthgap.yaml
deleted file mode 100644
index d930d10..0000000
--- a/.github/configs/sunxi/sunxi-orange-pi-3lts-remix-scarthgap.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Automatically generated by kas 4.3.2
-#
-_source_dir: .
-header:
-  includes:
-  - kas/machines/sunxi-orange-pi-3lts.yaml
-  - kas/bsp-base.yaml
-  - kas/scarthgap.yaml
-  version: 16
-local_conf_header:
-  __menu_config_locals: ''
-  __menu_config_vars: |-
-    PVROOT_IMAGE = "yes"
-    PVROOT_IMAGE_BSP = "core-image-base"
-menu_configuration:
-  BUILD_BSP: false
-  BUILD_REMIX: true
-  BUILD_TYPE_BSP_MULTI: false
-  BUILD_TYPE_BSP_PLAIN: true
-  CODENAME_KIRKSTONE: false
-  CODENAME_SCARTHGAP: true
-  CONTAINER_PV_CONNMAN: false
-  CONTAINER_PV_PVR_SDK: false
-  MACHINE_FILTER_ALL: false
-  MACHINE_FILTER_CORAL: false
-  MACHINE_FILTER_NXP: false
-  MACHINE_FILTER_QEMU: false
-  MACHINE_FILTER_RISCV: false
-  MACHINE_FILTER_ROCKCHIP: false
-  MACHINE_FILTER_RPI: false
-  MACHINE_FILTER_SUNXI: true
-  MACHINE_FILTER_TI: false
-  MACHINE_FILTER_VARISCITE: false
-  MACHINE_SUNXI_NANOPI_R1: false
-  MACHINE_SUNXI_ORANGE_PI_3LTS: true
-  MACHINE_SUNXI_ORANGE_PI_R1: false
-  MACHINE_SUNXI_ORANGE_PI_ZERO_PLUS2_H3: false
-  PVROOT_IMAGE_BSP: core-image-base
-  USE_PVROOT_IMAGE: true
-target:
-- pantavisor-remix
diff --git a/.github/configs/sunxi/sunxi-orange-pi-r1-remix-scarthgap.yaml b/.github/configs/sunxi/sunxi-orange-pi-r1-remix-scarthgap.yaml
deleted file mode 100644
index 7520ca5..0000000
--- a/.github/configs/sunxi/sunxi-orange-pi-r1-remix-scarthgap.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Automatically generated by kas 4.3.2
-#
-_source_dir: .
-header:
-  includes:
-  - kas/machines/sunxi-nanopi-r1.yaml
-  - kas/bsp-base.yaml
-  - kas/scarthgap.yaml
-  version: 16
-local_conf_header:
-  __menu_config_locals: ''
-  __menu_config_vars: |-
-    PVROOT_IMAGE = "yes"
-    PVROOT_IMAGE_BSP = "core-image-base"
-menu_configuration:
-  BUILD_BSP: false
-  BUILD_REMIX: true
-  BUILD_TYPE_BSP_MULTI: false
-  BUILD_TYPE_BSP_PLAIN: true
-  CODENAME_KIRKSTONE: false
-  CODENAME_SCARTHGAP: true
-  CONTAINER_PV_CONNMAN: false
-  CONTAINER_PV_PVR_SDK: false
-  MACHINE_FILTER_ALL: false
-  MACHINE_FILTER_CORAL: false
-  MACHINE_FILTER_NXP: false
-  MACHINE_FILTER_QEMU: false
-  MACHINE_FILTER_RISCV: false
-  MACHINE_FILTER_ROCKCHIP: false
-  MACHINE_FILTER_RPI: false
-  MACHINE_FILTER_SUNXI: true
-  MACHINE_FILTER_TI: false
-  MACHINE_FILTER_VARISCITE: false
-  MACHINE_SUNXI_NANOPI_R1: true
-  MACHINE_SUNXI_ORANGE_PI_3LTS: false
-  MACHINE_SUNXI_ORANGE_PI_R1: false
-  MACHINE_SUNXI_ORANGE_PI_ZERO_PLUS2_H3: false
-  PVROOT_IMAGE_BSP: core-image-base
-  USE_PVROOT_IMAGE: true
-target:
-- pantavisor-remix
diff --git a/.github/workflows/buildkas.yaml b/.github/workflows/buildkas.yaml
index 22b38c6..74f8f1d 100644
--- a/.github/workflows/buildkas.yaml
+++ b/.github/workflows/buildkas.yaml
@@ -3,7 +3,7 @@ name: 'Build Kas'
 on:
   workflow_call:
     inputs:
-      config:
+      configs:
         required: true
         type: string
 
@@ -25,7 +25,7 @@ jobs:
       - name: getgit
         run: su - builder -c "cd $GITHUB_WORKSPACE && git fetch origin $GITHUB_SHA && git reset --hard $GITHUB_SHA && rm -rf build/ && git clean -f -f -d -x "
       - name: Build Kas
-        run: su - builder -c "cd $GITHUB_WORKSPACE && env && kas build .github/configs/${{ inputs.config }}:.github/configs/shared-vols.yaml"
+        run: su - builder -c "cd $GITHUB_WORKSPACE && env && kas build .github/configs/build-base-remix.yaml:${{ inputs.configs }}:.github/configs/shared-vols.yaml"
       - name: chmod
         run: chmod -R 777 $GITHUB_WORKSPACE
       - name: Archive image artifacts
diff --git a/.github/workflows/onpush.yaml b/.github/workflows/onpush.yaml
index dd63260..30789c4 100644
--- a/.github/workflows/onpush.yaml
+++ b/.github/workflows/onpush.yaml
@@ -1,15 +1,27 @@
-name: 'Build Basic'
+name: 'Build On Push'
 
 on:
   push:
 
 jobs:
-  build-remix-sunxi-orange-pi-3lts-remix-scarthgap:
+  remix-sunxi-orange-pi-3lts-remix-scarthgap:
     uses: ./.github/workflows/buildkas.yaml
     with:
-      config: sunxi/sunxi-orange-pi-3lts-remix-scarthgap.yaml
-  build-remix-sunxi-orange-pi-r1-remix-scarthgap:
+      configs: kas/machines/sunxi-orange-pi-3lts.yaml:kas/bsp-base.yaml:kas/scarthgap.yaml
+  remix-sunxi-orange-pi-r1-remix-scarthgap:
     uses: ./.github/workflows/buildkas.yaml
     with:
-      config: sunxi/sunxi-orange-pi-r1-remix-scarthgap.yaml
+      configs: kas/machines/sunxi-orange-pi-r1.yaml:kas/bsp-base.yaml:kas/scarthgap.yaml
+  remix-sunxi-nanopi-r1-remix-scarthgap:
+    uses: ./.github/workflows/buildkas.yaml
+    with:
+      configs: kas/machines/sunxi-nanopi-r1.yaml:kas/bsp-base.yaml:kas/scarthgap.yaml
+  remix-nxp-imx8qxpc0mek-scarthgap:
+    uses: ./.github/workflows/buildkas.yaml
+    with:
+      configs: kas/machines/imx8qxpc0mek.yaml:kas/bsp-base.yaml:kas/scarthgap.yaml:kas/scarthgap-nxp.yaml
+  remix-raspberrypi-armv8-scarthgap:
+    uses: ./.github/workflows/buildkas.yaml
+    with:
+      configs: kas/machines/raspberrypi-armv8.yaml:kas/bsp-base.yaml:kas/scarthgap.yaml