diff --git a/src/freedombone b/src/freedombone
index 6e57cd48..48871374 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -300,7 +300,7 @@ upgrade_installation_from_previous_versions
 setup_utils
 setup_email
 setup_web
-setup_apps
+setup_apps $command_options
 setup_final
 
 echo "${PROJECT_NAME} installation is complete"
diff --git a/src/freedombone-config b/src/freedombone-config
index 6b6bc2ac..6e794bf3 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -1346,18 +1346,6 @@ function interactive_config {
     choose_default_domain_name
     choose_email_address
 
-    function_check create_completion_file
-    create_completion_file
-
-    function_ckeck detect_installable_apps
-    detect_installable_apps
-
-    function_check choose_apps_for_variant
-    choose_apps_for_variant "$SYSTEM_TYPE"
-
-    function_check install_apps_interactive
-    install_apps_interactive
-
     # delete the temporary configuration file
     if [ -f temp.cfg ]; then
         shred -zu temp.cfg
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index b343f19b..8bf65c5b 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -513,6 +513,8 @@ function upgrade_apps {
 }
 
 function setup_apps {
+    is_interactive=$1
+
     function_check create_completion_file
     create_completion_file
 
@@ -532,8 +534,14 @@ function setup_apps {
     function_check upgrade_apps
     upgrade_apps
 
-    function_check install_apps
-    install_apps
+    if [[ $is_interactive == "menuconfig"* ]]; then
+        ${PROJECT_NAME}-addremove
+    fi
+
+    if [[ $is_interactive == "noninteractive" || $is_interactive == "headless" ]]; then
+        function_check install_apps
+        install_apps
+    fi
 }
 
 function combine_all_scripts {