diff --git a/bin/ncp/CONFIG/nc-nextcloud.sh b/bin/ncp/CONFIG/nc-nextcloud.sh
index 75f4e3ab..6c925bd9 100644
--- a/bin/ncp/CONFIG/nc-nextcloud.sh
+++ b/bin/ncp/CONFIG/nc-nextcloud.sh
@@ -28,10 +28,10 @@ install()
   $APTINSTALL lbzip2 iputils-ping jq wget
   # NOTE: php-smbclient in sury but not in Debian sources, we'll use the binary version
   # https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/external_storage/smb.html
-  $APTINSTALL -t $RELEASE smbclient exfat-fuse exfat-utils                      # for external storage \
-    php${PHPVER}-exif                                                           # for gallery \
-    php${PHPVER}-bcmath                                                         # for LDAP \
-    php${PHPVER}-gmp                                                            # for bookmarks
+  $APTINSTALL -t $RELEASE smbclient exfat-fuse exfat-utils                      `# for external storage` \
+    php${PHPVER}-exif                                                           `# for gallery` \
+    php${PHPVER}-bcmath                                                         `# for LDAP` \
+    php${PHPVER}-gmp                                                            `# for bookmarks`
   #$APTINSTALL -t imagemagick php${PHPVER}-imagick ghostscript   # for gallery
 
 
diff --git a/bin/ncp/NETWORKING/dnsmasq.sh b/bin/ncp/NETWORKING/dnsmasq.sh
index 9e5ce3a5..f92c2df2 100644
--- a/bin/ncp/NETWORKING/dnsmasq.sh
+++ b/bin/ncp/NETWORKING/dnsmasq.sh
@@ -16,7 +16,7 @@ install()
   apt-get install --no-install-recommends -y dnsmasq
   rc=0
   service dnsmasq status > /dev/null 2>&1 || rc=$?
-  ! is_docker && [[ $rc -eq 3 ]] && ! [[ "$INIT_SYSTEM" =~ ^("chroot"|"unknown")$ ]] && {
+  ! is_docker && [[ $rc -eq 3 ]] && ! [[ "$INIT_SYSTEM" =~ ^("chroot"|"unknown"|"armbian-build")$ ]] && {
     echo "Applying workaround for dnsmasq bug (compare issue #1446)"
     service systemd-resolved stop || true
     service dnsmasq start
diff --git a/build/armbian/armbian.sh b/build/armbian/armbian.sh
index 554c31cf..dc558e16 100644
--- a/build/armbian/armbian.sh
+++ b/build/armbian/armbian.sh
@@ -31,8 +31,17 @@ echo -e "\nInstalling NextCloudPi"
 
 hostname -F /etc/hostname # fix 'sudo resolve host' errors
 
+teardown_docker() {
+  pkill containerd dockerd
+}
+
+trap teardown_docker EXIT 1 2 3 15
+
 CODE_DIR="$(pwd)" DBG=x bash install.sh
 
+teardown_docker
+trap '' EXIT 1 2 3 15
+
 echo -e "\nPostinstall..."
 run_app_unsafe post-inst.sh
 
diff --git a/docker.sh b/docker.sh
index a13f7374..4f2d3e5d 100644
--- a/docker.sh
+++ b/docker.sh
@@ -40,6 +40,8 @@ install() {
     fi
   done
   [[ "$success" == "true" ]] || exit 1
+
+  docker rmi hello-world:latest
 }
 
 configure() { :; }