diff --git a/.drone.jsonnet b/.drone.jsonnet
index b4485aa..51c7abf 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -135,30 +135,30 @@ local build(board, arch, mode, distro) = {
 [
     build(board.name, board.arch, board.type, distro)
     for board in [
-        { name: "cubieboard2", arch: "arm", type: "all" },
-        { name: "cubieboard", arch: "arm", type: "all" },
+#        { name: "cubieboard2", arch: "arm", type: "all" },
+#        { name: "cubieboard", arch: "arm", type: "all" },
         { name: "beagleboneblack", arch: "arm", type: "all" },
-        { name: "bananapim3", arch: "arm", type: "all" },
-        { name: "rock64", arch: "arm", type: "all" },
-        { name: "helios4", arch: "arm", type: "all" },
-        { name: "helios64", arch: "arm", type: "all" },
-        { name: "raspberrypi", arch: "arm", type: "all" },
-        { name: "raspberrypi-64", arch: "arm64", type: "all" },
-        { name: "raspberrypi2", arch: "arm", type: "all" },
-        { name: "odroid-xu3and4", arch: "arm", type: "all" },
-        { name: "odroid-xu3and4", arch: "arm", type: "sd" },
-	{ name: "jetson-nano", arch: "arm64", type: "all" },
-        { name: "odroid-c2", arch: "arm", type: "all" },
-        { name: "odroid-u3", arch: "arm", type: "all" },
-        { name: "bananapim2", arch: "arm", type: "all" },
-        { name: "bananapim1", arch: "arm", type: "all" },
-        { name: "cubietruck", arch: "arm", type: "all" },
-        { name: "tinker", arch: "arm", type: "all" },
-        { name: "odroid-n2", arch: "arm", type: "all" },
-        { name: "lime2", arch: "arm", type: "all" },
-        { name: "amd64", arch: "amd64", type: "all"},
-        { name: "amd64-uefi", arch: "amd64", type: "all"},
-        { name: "odroid-hc4", arch: "arm64", type: "all"},
+#        { name: "bananapim3", arch: "arm", type: "all" },
+#        { name: "rock64", arch: "arm", type: "all" },
+#        { name: "helios4", arch: "arm", type: "all" },
+#        { name: "helios64", arch: "arm", type: "all" },
+#        { name: "raspberrypi", arch: "arm", type: "all" },
+#        { name: "raspberrypi-64", arch: "arm64", type: "all" },
+#        { name: "raspberrypi2", arch: "arm", type: "all" },
+#        { name: "odroid-xu3and4", arch: "arm", type: "all" },
+#        { name: "odroid-xu3and4", arch: "arm", type: "sd" },
+#	{ name: "jetson-nano", arch: "arm64", type: "all" },
+#        { name: "odroid-c2", arch: "arm", type: "all" },
+#        { name: "odroid-u3", arch: "arm", type: "all" },
+#        { name: "bananapim2", arch: "arm", type: "all" },
+#        { name: "bananapim1", arch: "arm", type: "all" },
+#        { name: "cubietruck", arch: "arm", type: "all" },
+#        { name: "tinker", arch: "arm", type: "all" },
+#        { name: "odroid-n2", arch: "arm", type: "all" },
+#        { name: "lime2", arch: "arm", type: "all" },
+#        { name: "amd64", arch: "amd64", type: "all"},
+#        { name: "amd64-uefi", arch: "amd64", type: "all"},
+#        { name: "odroid-hc4", arch: "arm64", type: "all"},
     ]
     for distro in [
         "buster"
diff --git a/tools/extract.sh b/tools/extract.sh
index 415eaf9..06974ce 100755
--- a/tools/extract.sh
+++ b/tools/extract.sh
@@ -208,6 +208,11 @@ function extract_root {
         cp -rp ${from}/var/lib ${to}/var
     fi
 
+    if [[ -d ${from}/opt/scripts ]]; then
+        mkdir -p ${to}/original/opt
+        cp -rp ${from}/opt/scripts ${to}/original/opt
+    fi
+
     cp -rp ${from}/boot ${to}/boot
 
     if [[ -f ${to}/boot/grub/grub.cfg ]]; then