diff --git a/extensions/apa.sh b/extensions/apa.sh
new file mode 100644
index 000000000..19e394f72
--- /dev/null
+++ b/extensions/apa.sh
@@ -0,0 +1,23 @@
+# Install armbian-common etc. from APA
+
+function extension_prepare_config__apa() {
+	display_alert "Target image will have Armbian Package Archive (APA) enabled by default" "${EXTENSION}" "info"
+}
+
+function custom_apt_repo__add_apa() {
+	run_host_command_logged echo "deb [signed-by=${APT_SIGNING_KEY_FILE}] https://github.armbian.com/apa current main" "|" tee "${SDCARD}"/etc/apt/sources.list.d/armbian-apa.list
+}
+
+function post_armbian_repo_customize_image__install_from_apa() {
+	# do not install armbian recommends for minimal images
+	[[ "${BUILD_MINIMAL,,}" =~ ^(true|yes)$ ]] && INSTALL_RECOMMENDS="no" || INSTALL_RECOMMENDS="yes"
+	chroot_sdcard_apt_get --install-recommends=$INSTALL_RECOMMENDS install "armbian-common armbian-bsp"
+
+	# install desktop environmnent if requested
+	case ${DESKTOP_ENVIRONMENT^^} in
+		XFCE|KDE|GNOME)
+			display_alert "installing ${DESKTOP_ENVIRONMENT^^} desktop environment" "${EXTENSION}: ${DESKTOP_ENVIRONMENT^^}" "info"
+			chroot_sdcard_apt_get --install-recommends=yes "armbian-desktop-${DESKTOP_ENVIRONMENT,,}"
+			;;
+	esac
+}