diff --git a/lib/chroot-buildpackages.sh b/lib/chroot-buildpackages.sh
index f96834f64..15abce7e8 100644
--- a/lib/chroot-buildpackages.sh
+++ b/lib/chroot-buildpackages.sh
@@ -87,7 +87,7 @@ chroot_prepare_distccd()
 	rm -f $dest/cmdlist
 	mkdir -p $dest
 	local toolchain_path=$(find_toolchain "${gcc_type[$arch]}" "== ${gcc_version[$release]}")
-	ln -sfv ${toolchain_path}/${gcc_type[$arch]}gcc $dest/cc
+	ln -sf ${toolchain_path}/${gcc_type[$arch]}gcc $dest/cc
 	echo "$dest/cc" >> $dest/cmdlist
 	for compiler in gcc cpp g++ c++; do
 		echo "$dest/$compiler" >> $dest/cmdlist
@@ -111,7 +111,7 @@ chroot_build_packages()
 		for arch in armhf arm64; do
 			display_alert "Starting package building process" "$release/$arch" "info"
 
-			local target_dir=$SRC/cache/buildpkg/${release}-${arch}-v5
+			local target_dir=$SRC/cache/buildpkg/${release}-${arch}-v${CHROOT_CACHE_VERSION}
 			local distcc_bindaddr="127.0.0.2"
 
 			[[ ! -f $target_dir/root/.debootstrap-complete ]] && create_chroot "$target_dir" "$release" "$arch"
@@ -175,7 +175,8 @@ chroot_build_packages()
 				export DEBIAN_FRONTEND="noninteractive"
 				export DEB_BUILD_OPTIONS="nocheck noautodbgsym"
 				export CCACHE_TEMPDIR="/tmp"
-				export CCACHE_PREFIX="distcc"
+				# distcc is disabled to prevent compilation issues due to different host and cross toolchain configurations
+				#export CCACHE_PREFIX="distcc"
 				# uncomment for debug
 				#export CCACHE_RECACHE="true"
 				#export CCACHE_DISABLE="true"
diff --git a/lib/configuration.sh b/lib/configuration.sh
index 91e56fa9c..dd0433967 100644
--- a/lib/configuration.sh
+++ b/lib/configuration.sh
@@ -19,6 +19,7 @@ USEALLCORES=yes # Use all CPU cores for compiling
 EXIT_PATCHING_ERROR="" # exit patching if failed
 HOST="$(echo "$BOARD" | cut -f1 -d-)" # set hostname to the board
 ROOTFSCACHE_VERSION=3
+CHROOT_CACHE_VERSION=6
 [[ -z $DISPLAY_MANAGER ]] && DISPLAY_MANAGER=nodm
 ROOTFS_CACHE_MAX=8 # max number of rootfs cache, older ones will be cleaned up
 
diff --git a/packages/extras-buildpkgs/hostapd-realtek/debian/rules b/packages/extras-buildpkgs/hostapd-realtek/debian/rules
index e7de0f65d..f99b3ea05 100644
--- a/packages/extras-buildpkgs/hostapd-realtek/debian/rules
+++ b/packages/extras-buildpkgs/hostapd-realtek/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # without "-relro,-pie" building on Stretch breaks
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-relro,-pie
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 include /usr/share/dpkg/buildflags.mk
 
diff --git a/packages/extras-buildpkgs/hostapd/debian/rules b/packages/extras-buildpkgs/hostapd/debian/rules
index 3926dbfb7..6d21b1a6b 100644
--- a/packages/extras-buildpkgs/hostapd/debian/rules
+++ b/packages/extras-buildpkgs/hostapd/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # without "-relro,-pie" building on Stretch breaks
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-relro,-pie
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 include /usr/share/dpkg/buildflags.mk
 
diff --git a/packages/extras-buildpkgs/mmc-utils/debian/rules b/packages/extras-buildpkgs/mmc-utils/debian/rules
index e34e9693f..ece699f74 100644
--- a/packages/extras-buildpkgs/mmc-utils/debian/rules
+++ b/packages/extras-buildpkgs/mmc-utils/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=-relro,-pie
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
diff --git a/packages/extras-buildpkgs/sunxi-tools/debian/rules b/packages/extras-buildpkgs/sunxi-tools/debian/rules
index d0d34c348..ad2dc03f3 100644
--- a/packages/extras-buildpkgs/sunxi-tools/debian/rules
+++ b/packages/extras-buildpkgs/sunxi-tools/debian/rules
@@ -6,9 +6,6 @@ include /usr/share/dpkg/architecture.mk
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# without this building on Stretch breaks
-export DEB_BUILD_MAINT_OPTIONS = hardening=-relro,-pie
-
 %:
 	dh $@