diff --git a/access-points/Makefile b/access-points/Makefile
index d8a5657..e1da798 100644
--- a/access-points/Makefile
+++ b/access-points/Makefile
@@ -1,12 +1,10 @@
 all: its
 
-export IMAGEBUILDER_URL = http://downloads.lede-project.org/releases/17.01.4/targets/ar71xx/generic/lede-imagebuilder-17.01.4-ar71xx-generic.Linux-x86_64.tar.xz
-
 its-tl-wr841-v10:
-	./build-image.sh control/tl-wr841-v10
+	IMAGEBUILDER_URL='https://downloads.openwrt.org/releases/18.06.0/targets/ar71xx/tiny/openwrt-imagebuilder-18.06.0-ar71xx-tiny.Linux-x86_64.tar.xz' ./build-image.sh control/tl-wr841-v10
 
 its-ubnt-unifiac-lite:
-	./build-image.sh control/ubnt-unifiac-lite
+	IMAGEBUILDER_URL='https://downloads.openwrt.org/releases/18.06.0/targets/ar71xx/generic/openwrt-imagebuilder-18.06.0-ar71xx-generic.Linux-x86_64.tar.xz' ./build-image.sh control/ubnt-unifiac-lite
 
 its: its-ubnt-unifiac-lite its-tl-wr841-v10
 
diff --git a/access-points/build-image.sh b/access-points/build-image.sh
index 106b93b..39b2430 100755
--- a/access-points/build-image.sh
+++ b/access-points/build-image.sh
@@ -29,6 +29,8 @@ tar -C "$BUILDDIR" -axf "$DLDIR"/"$imagebuilder"
 IMAGEBUILDER_DIR="$BUILDDIR"/"$(tar -atf "$DLDIR"/"$imagebuilder" | head -n1)"
 
 profile=$(. "$CONTROL"; echo "${PROFILE}")
+target=$(. "$CONTROL"; echo "${TARGET}")
+subtarget=$(. "$CONTROL"; echo "${SUBTARGET}")
 
 (
     IFS='
@@ -55,7 +57,7 @@ profile=$(. "$CONTROL"; echo "${PROFILE}")
     make image FILES="$tmp" 1>&2
 )
 
-cp "$IMAGEBUILDER_DIR"/bin/targets/ar71xx/generic/lede*-ar71xx-generic-"${profile}"-squashfs-sysupgrade.bin "$IMAGEDIR"/
+cp "$IMAGEBUILDER_DIR"/bin/targets/ar71xx/"${subtarget}"/openwrt*-"${target}-${subtarget}-${profile}"-squashfs-sysupgrade.bin "$IMAGEDIR"/
 
 {
     printf '%s\n' "Date: $(date -R)"
@@ -64,6 +66,6 @@ cp "$IMAGEBUILDER_DIR"/bin/targets/ar71xx/generic/lede*-ar71xx-generic-"${profil
     printf 'Checksums-Sha512:\n'
     {
         ( cd "$DLDIR"   ; sha512sum "$imagebuilder" )
-        ( cd "$IMAGEDIR"; sha512sum lede*-ar71xx-generic-"${profile}"-squashfs-sysupgrade.bin )
+        ( cd "$IMAGEDIR"; sha512sum openwrt*-"${target}-${subtarget}-${profile}"-squashfs-sysupgrade.bin )
     } | sed 's/^/  /'
 } > "$IMAGEDIR"/"${profile}".image-manifest
diff --git a/access-points/control/tl-wr841-v10 b/access-points/control/tl-wr841-v10
index a48124c..6ec89c6 100644
--- a/access-points/control/tl-wr841-v10
+++ b/access-points/control/tl-wr841-v10
@@ -1,4 +1,6 @@
 PROFILE=tl-wr841-v10
+TARGET=ar71xx
+SUBTARGET=tiny
 FILES=files/tl-wr841-v10
 COMMON_FILES=files/common/its
 PACKAGES='
diff --git a/access-points/control/ubnt-unifiac-lite b/access-points/control/ubnt-unifiac-lite
index 620736e..9537dcf 100644
--- a/access-points/control/ubnt-unifiac-lite
+++ b/access-points/control/ubnt-unifiac-lite
@@ -1,5 +1,7 @@
 PROFILE=ubnt-unifiac-lite
 FILES=files/ubnt-unifiac-lite
+TARGET=ar71xx
+SUBTARGET=generic
 COMMON_FILES=files/common/its
 PACKAGES='
   collectd