diff --git a/build-nethsec.sh b/build-nethsec.sh
index 94f0af845..4ceed6fd4 100755
--- a/build-nethsec.sh
+++ b/build-nethsec.sh
@@ -55,11 +55,11 @@ podman run \
     --interactive \
     --tty \
     --replace \
-    --volume nethsecurity_builder_build:/home/buildbot/openwrt/build_dir \
-    --volume nethsecurity_builder_staging:/home/buildbot/openwrt/staging_dir \
-    --volume nethsecurity_builder_cache:/home/buildbot/openwrt/.ccache \
-    --volume nethsecurity_builder_downloads:/home/buildbot/openwrt/download \
-    --volume nethsecurity_builder_dl:/home/buildbot/openwrt/dl \
+    --volume "nethsecurity_builder_${OWRT_VERSION}_build:/home/buildbot/openwrt/build_dir" \
+    --volume "nethsecurity_builder_${OWRT_VERSION}_staging:/home/buildbot/openwrt/staging_dir" \
+    --volume "nethsecurity_builder_${OWRT_VERSION}_cache:/home/buildbot/openwrt/.ccache" \
+    --volume "nethsecurity_builder_${OWRT_VERSION}_downloads:/home/buildbot/openwrt/download" \
+    --volume "nethsecurity_builder_${OWRT_VERSION}_dl:/home/buildbot/openwrt/dl" \
     nethsecurity-next \
     "$@" || status=$?
 
diff --git a/patches/feeds/packages/100-adblock-start-tsdns.patch b/patches/feeds/packages/100-adblock-start-tsdns.patch
deleted file mode 100644
index 9b00d1cba..000000000
--- a/patches/feeds/packages/100-adblock-start-tsdns.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git i/net/adblock/files/adblock.init w/net/adblock/files/adblock.init
-index ed02d69ff..32647663b 100755
---- i/net/adblock/files/adblock.init
-+++ w/net/adblock/files/adblock.init
-@@ -35,6 +35,7 @@ boot() {
-
- start_service() {
- 	if "${adb_init}" enabled; then
-+		/usr/sbin/ts-dns # configure threat shield dns, if needed
- 		if [ "${action}" = "boot" ]; then
- 			[ -n "$(uci_get adblock global adb_trigger)" ] && return 0
- 		fi
-@@ -49,15 +50,18 @@ start_service() {
- }
-
- restart() {
-+	/usr/sbin/ts-dns # configure threat shield dns, if needed
- 	stop_service "restart"
- 	rc_procd start_service restart
- }
-
- reload_service() {
-+	/usr/sbin/ts-dns # configure threat shield dns, if needed
- 	rc_procd start_service reload
- }
-
- stop_service() {
-+	/usr/sbin/ts-dns # configure threat shield dns, if needed
- 	[ -z "${1}" ] && rc_procd "${adb_script}" stop
- }
-