diff --git a/configs/archer-c6-v3-files/etc/uci-defaults/99-custom b/configs/archer-c6-v3-files/etc/uci-defaults/99-custom
new file mode 100644
index 0000000..0d8be2c
--- /dev/null
+++ b/configs/archer-c6-v3-files/etc/uci-defaults/99-custom
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Read all about UCI defaults at
+# https://openwrt.org/docs/guide-developer/uci-defaults
+
+# Note that scripts in /etc/uci-defaults will get executed at *every* first
+# boot (i.e. after both factory install as well as upgrades),
+# possibly overwriting already existing values!
+# scripts in this dir should *not* be executable
+
+exit 0
diff --git a/configs/archer-c7-v5 b/configs/archer-c7-v5
new file mode 100644
index 0000000..20b8153
--- /dev/null
+++ b/configs/archer-c7-v5
@@ -0,0 +1,32 @@
+#!/bin/sh
+# Archer C7 v5 configuration for openwrt-image-buildomatic
+
+# Running OpenWRT image builder 18.06 on Ubuntu 20.04 requires at least:
+#     sudo apt install python2 libncurses5-dev
+
+#RELEASE=${RELEASE_18_06}
+#RELEASE=${RELEASE_19_07}
+#RELEASE=${RELEASE_21_02}
+RELEASE=${RELEASE_23_05}
+
+if [ -z "${RELEASE}" ]; then echo "RELEASE is empty"; return 1; fi
+
+# See targets here: https://downloads.openwrt.org/snapshots/targets
+#
+# device can be built with one of two TARGETs:
+#   ar71xx/generic is usable for releases 17.01, 18.06, 19.07
+#   ath79/generic  is usable for releases               19.07, 21.02
+if echo "${RELEASE}" | grep -q "18.06"; then
+    TARGET=ath79/generic
+    PROFILE="tplink_archer-c7-v5"
+else
+    TARGET=ath79/generic
+    PROFILE="tplink_archer-c7-v5"
+fi
+
+# This package list works for releases 18.06, 19.07 and 21.02
+PACKAGES="luci"
+
+FILES="archer-c7-v5-files"
+
+DISABLED_SERVICES=""
diff --git a/configs/archer-c7-v5-files/etc/uci-defaults/99-custom b/configs/archer-c7-v5-files/etc/uci-defaults/99-custom
new file mode 100644
index 0000000..0d8be2c
--- /dev/null
+++ b/configs/archer-c7-v5-files/etc/uci-defaults/99-custom
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Read all about UCI defaults at
+# https://openwrt.org/docs/guide-developer/uci-defaults
+
+# Note that scripts in /etc/uci-defaults will get executed at *every* first
+# boot (i.e. after both factory install as well as upgrades),
+# possibly overwriting already existing values!
+# scripts in this dir should *not* be executable
+
+exit 0
diff --git a/configs/common b/configs/common
index 6850286..b4841a7 100644
--- a/configs/common
+++ b/configs/common
@@ -10,6 +10,7 @@ RELEASE_18_06="18.06.9"
 RELEASE_19_07="19.07.7"
 RELEASE_21_02="21.02.3"
 RELEASE_22_03="22.03.0"
+RELEASE_23_05="23.05.2"
 
 # Popular Luci apps
 # This list is probably only valid for the 21.02 release
@@ -38,11 +39,23 @@ luci-app-wireguard kmod-wireguard wireguard-tools qrencode
 luci-app-wol
 "
 
+packages_antizapret=""
+
+# the absolute minimum for extroot to work at all (i.e. when the disk is already set up, for example by hand).
+# this list may be smaller and/or different for your router, but it works with my ath79.
+# blockdev is needed to re-read the partition table using `blockdev --rereadpt /dev/sdX`
+packages_ext_root="block-mount kmod-fs-ext4 kmod-usb-storage blockdev"
+ 
+# some kernel modules may also be needed for your hardware
+packages_ext_root_2=" kmod-usb-uhci kmod-usb-ohci"
+ 
+# these are needed for the proper functioning of the auto extroot scripts
+packages_ext_root_3=" blkid mount-utils swap-utils e2fsprogs fdisk"
+
 # Packages only working on OpenWRT 21.02.x
 packages_21_02_luci_apps="\
 luci-app-banip banip \
 "
-
 packages_unbound="luci-app-unbound unbound-checkconf unbound-anchor unbound-control-setup unbound-host"
 
 packages_sec_dns="
diff --git a/configs/tl-wdr3600-v1 b/configs/tl-wdr3600-v1
index 8ffd150..0ada637 100644
--- a/configs/tl-wdr3600-v1
+++ b/configs/tl-wdr3600-v1
@@ -6,7 +6,8 @@
 
 #RELEASE=${RELEASE_18_06}
 #RELEASE=${RELEASE_19_07}
-RELEASE=${RELEASE_21_02}
+#RELEASE=${RELEASE_21_02}
+RELEASE=${RELEASE_23_05}
 
 if [ -z "${RELEASE}" ]; then echo "RELEASE is empty"; return 1; fi
 
@@ -17,15 +18,15 @@ if [ -z "${RELEASE}" ]; then echo "RELEASE is empty"; return 1; fi
 #   ath79/generic  is usable for releases               19.07, 21.02
 if echo "${RELEASE}" | grep -q "18.06"; then
     TARGET=ar71xx/generic
-    PROFILE="tl-wdr3600-v1"
+    PROFILE="tplink_tl-wdr3600-v1"
 else
     TARGET=ath79/generic
     PROFILE="tplink_tl-wdr3600-v1"
 fi
 
 # See https://openwrt.org/packages/start
-PACKAGES="luci htop"
+PACKAGES="luci"
 
-FILES=""
+FILES="tl-wdr3600-v1-files"
 
 DISABLED_SERVICES=""
diff --git a/configs/tl-wdr3600-v1-files/etc/uci-defaults/99-custom b/configs/tl-wdr3600-v1-files/etc/uci-defaults/99-custom
new file mode 100644
index 0000000..0d8be2c
--- /dev/null
+++ b/configs/tl-wdr3600-v1-files/etc/uci-defaults/99-custom
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Read all about UCI defaults at
+# https://openwrt.org/docs/guide-developer/uci-defaults
+
+# Note that scripts in /etc/uci-defaults will get executed at *every* first
+# boot (i.e. after both factory install as well as upgrades),
+# possibly overwriting already existing values!
+# scripts in this dir should *not* be executable
+
+exit 0
diff --git a/oi-build b/oi-build
index b84e163..3a3fd36 100755
--- a/oi-build
+++ b/oi-build
@@ -7,7 +7,7 @@
 ###############################################################################
 
 # Default configuration (file) to use
-config_name="rpi-4"
+config_name="archer-c6-v3"
 
 # Release to fetch and build (can be "snapshot")
 RELEASE=""
@@ -24,13 +24,13 @@ FILES=""
 DISABLED_SERVICES=""
 
 # See https://openwrt.org/packages/ for list of all packages
-PACKAGES="
-luci luci-app-uhttpd
-luci-theme-bootstrap luci-theme-openwrt luci-theme-openwrt-2020
-luci-app-wireguard kmod-wireguard wireguard-tools
-zoneinfo-europe
-kmod-usb-net-rtl8150 kmod-usb-net-rtl8152
-"
+#PACKAGES="
+#luci luci-app-uhttpd
+#luci-theme-bootstrap luci-theme-openwrt luci-theme-openwrt-2020
+#luci-app-wireguard kmod-wireguard wireguard-tools
+#zoneinfo-europe
+#kmod-usb-net-rtl8150 kmod-usb-net-rtl8152
+#"
 
 # glob to use for searching for USB SD-card reader device
 dev_usb_sdcard_glob=/dev/disk/by-id/usb-Generic-*-0:0