diff --git a/.github/workflow_config.yml b/.github/workflow_config.yml
index 1e6b40b30..e13dc70c0 100644
--- a/.github/workflow_config.yml
+++ b/.github/workflow_config.yml
@@ -16,16 +16,16 @@
 
 buildtest:
   # armbian based images
-  - armbian/bananapim2zero
-  - armbian/orangepi3lts
+  # - armbian/bananapim2zero
+  # - armbian/orangepi3lts
   - armbian/orangepi4lts
-  - armbian/orangepi_zero2
+  # - armbian/orangepi_zero2
   # Orange Pi OS based images
   # Raspberry Pi OS based images
-  - raspberry/rpi32
-  - raspberry/rpi64
+  # - raspberry/rpi32
+  # - raspberry/rpi64
   # rpi 64 with KS
-  - raspberry/rpi64-ks
+  # - raspberry/rpi64-ks
 
 # This is used to setup release build chain.
 # Each entry will be used in setup matrix for releases
diff --git a/.github/workflows/BuildImages.yml b/.github/workflows/BuildImages.yml
index a0813ad53..84cbe5ea8 100644
--- a/.github/workflows/BuildImages.yml
+++ b/.github/workflows/BuildImages.yml
@@ -64,6 +64,8 @@ jobs:
         uses: ./repository/.github/actions/build
         with:
           config: ${{ matrix.config }}
+          custompios-repository: KwadFan/CustomPiOS
+          custompios-ref: fix/chrootmount
 
       - name: Rename image file
         id: move-image
diff --git a/config/armbian/default b/config/armbian/default
index ed699d4a8..21a31141a 100644
--- a/config/armbian/default
+++ b/config/armbian/default
@@ -23,7 +23,8 @@ BASE_IMAGE_RESIZEROOT=600
 # Compress not needed due compression done in workflow
 BASE_RELEASE_COMPRESS=no
 # Modules are valid for 32bit and 64bit images
-MODULES="base(pkgupgrade,udev_fix,armbian(armbian_net,mainsailos,klipper,is_req_preinstall,moonraker,mainsail,timelapse,crowsnest,sonar))"
+# MODULES="base(pkgupgrade,udev_fix,armbian(armbian_net,mainsailos,klipper,is_req_preinstall,moonraker,mainsail,timelapse,crowsnest,sonar))"
+MODULES="base(debug)"
 
 # export Variables
 export DOWNLOAD_BASE_URL
diff --git a/src/modules/debug/config b/src/modules/debug/config
new file mode 100644
index 000000000..e484f8b84
--- /dev/null
+++ b/src/modules/debug/config
@@ -0,0 +1 @@
+# Intentionally left blank
diff --git a/src/modules/debug/start_chroot_script b/src/modules/debug/start_chroot_script
new file mode 100644
index 000000000..3f9a53ad1
--- /dev/null
+++ b/src/modules/debug/start_chroot_script
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+## Source error handling, leave this in place
+set -Eex
+
+## Set LC_ALL to prevent errors
+export LC_ALL=C
+
+# Set DEBIAN_FRONTEND to noninteractive
+if [[ "${DEBIAN_FRONTEND}" != "noninteractive" ]]; then
+    export DEBIAN_FRONTEND=noninteractive
+fi
+
+## Source CustomPIOS common.sh
+# shellcheck disable=SC1091
+source /common.sh
+install_cleanup_trap
+
+
+echo_red "DEBUG: -------------------------------------------------"
+cd /
+ls -al /run/systemd/resolve/stub-resolv.conf || true
+cat /run/systemd/resolve/stub-resolv.conf || true
+
+echo_red "--------------------------------------------------------"
+
+
+
+echo_red "--------------------------------------------------------"
+
+resolvectl status
+
+echo_red "--------------------------------------------------------"
+
+
+ping -c 2 google.de || true
+
+echo_red "DEBUG: --------------------------------------------------"
+
+echo_green "Try to alter dns ---------------------------------------"
+
+echo "nameserver 1.1.1.1" > /etc/resolv.conf
+sudo systemctl restart systemd-resolved
+
+echo_green "Try to alter dns ---------------------------------------"
+
+echo_red "DEBUG: -------------------------------------------------"
+cd /
+ls -al /run/systemd/resolve/stub-resolv.conf || true
+cat /run/systemd/resolve/stub-resolv.conf || true
+
+echo_red "--------------------------------------------------------"
+
+
+
+echo_red "--------------------------------------------------------"
+
+resolvectl status
+
+echo_red "--------------------------------------------------------"
+
+
+ping -c 2 google.de || true
+
+echo_red "DEBUG: --------------------------------------------------"
+
+# Let it fail anyways!
+exit 1