diff --git a/misc/build.func b/misc/build.func
index 48626d9b0..ee747277d 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -2148,8 +2148,8 @@ install_script() {
         header_info
         echo -e "${DEFAULT}${BOLD}${BL}Using App Defaults for ${APP} on node $PVEHOST_NAME${CL}"
         METHOD="appdefaults"
-        base_settings
         load_vars_file "$(get_app_defaults_path)"
+        base_settings
         echo_default
         defaults_target="$(get_app_defaults_path)"
         break
diff --git a/misc/core.func b/misc/core.func
index 9d3ac79df..04224cd8b 100644
--- a/misc/core.func
+++ b/misc/core.func
@@ -828,7 +828,7 @@ cleanup_lxc() {
   # Ruby gem
   if command -v gem &>/dev/null; then $STD gem cleanup || true; fi
   # Composer (PHP)
-  if command -v composer &>/dev/null; then $STD composer clear-cache || true; fi
+  if command -v composer &>/dev/null; then COMPOSER_ALLOW_SUPERUSER=1 && $STD composer clear-cache || true; fi
 
   if command -v journalctl &>/dev/null; then
     $STD journalctl --vacuum-time=10m || true