diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh
index ac3760f015..ad38031f4e 100644
--- a/lib/functions/configuration/main-config.sh
+++ b/lib/functions/configuration/main-config.sh
@@ -321,9 +321,10 @@ function do_main_configuration() {
 			;;
 	esac
 
-        # enable APA extension for Debian Unstable release
-	# loong64 is not supported now
-        [ "$RELEASE" = "sid" ] && [ "$ARCH" != "loong64" ] && enable_extension "apa"
+	# enable APA extension for latest Ubuntu and Debian releases
+	# FIXME: drop this paragraph when APA becomes the default
+	# FIXME: loong64 is not supported now
+	[[ "$RELEASE" =~ ^(sid|questing|resolute)$ ]] && [[ "$ARCH" != "loong64" ]] && enable_extension "apa"
 
 	## Extensions: at this point we've sourced all the config files that will be used,
 	##             and (hopefully) not yet invoked any extension methods. So this is the perfect