diff --git a/.github/workflows/test_docker_debian_codename_sub.yml b/.github/workflows/test_docker_debian_codename_sub.yml
index f804784ef..95e94a2ee 100644
--- a/.github/workflows/test_docker_debian_codename_sub.yml
+++ b/.github/workflows/test_docker_debian_codename_sub.yml
@@ -144,10 +144,10 @@ jobs:
       fail-fast: false
       matrix:
         username: ['pi']
-        test_script: ['run_installation_tests.sh', 'run_installation_tests2.sh', 'run_installation_tests3.sh']
+        test_script: ['run_installation_classic.sh', 'run_installation_tests2.sh', 'run_installation_tests3.sh', 'run_installation_staticip_dhcpcd.sh', 'run_installation_autohotspot_dhcpcd.sh', 'run_installation_autohotspot_NetworkManager.sh']
         include:
           - username: 'hans'
-            test_script: 'run_installation_tests.sh'
+            test_script: 'run_installation_classic.sh'
 
 
     steps:
diff --git a/ci/Dockerfile.debian b/ci/Dockerfile.debian
index eb545e6b3..15384e782 100644
--- a/ci/Dockerfile.debian
+++ b/ci/Dockerfile.debian
@@ -84,6 +84,7 @@ FROM test-user as test-code
 ARG GIT_BRANCH
 ARG GIT_URL
 
+ENV CI_RUNNING=true
 ENV GIT_BRANCH=$GIT_BRANCH GIT_URL=$GIT_URL
 
 COPY --chown=root:$TEST_USER_GROUP --chmod=770 packages.txt packages-raspberrypi.txt ./
diff --git a/htdocs/inc.setWifi.php b/htdocs/inc.setWifi.php
index a7a77987f..691e8a247 100755
--- a/htdocs/inc.setWifi.php
+++ b/htdocs/inc.setWifi.php
@@ -1,112 +1,83 @@
 <?php
-/*
-* read ssid and password from /etc/wpa_supplicant/wpa_supplicant.conf
-*/
-$wpaconf = file_get_contents("/etc/wpa_supplicant/wpa_supplicant.conf");
-/*
-* get the lines we need
-*/
-$networks = array();
-$priorities = array();
-unset($temp_ssid);
-unset($temp_pass);
-unset($temp_prio);
-foreach(preg_split("/((\r?\n)|(\r\n?))/", $wpaconf) as $line){
-    unset($temp);
-
-    $line = trim($line);
-    if(substr($line, 0, 7) == "network") {
-        unset($temp_ssid);
-        unset($temp_pass);
-        unset($temp_prio);
-        continue;
-    }
-
-    $temp = explode("=", $line);
-
-    if(count($temp) != 2) {
-        continue;
-    }
-
-    $key = trim($temp[0]);
-    $value = trim(trim($temp[1]), '"');
-
-    if($key == "ssid") {
-        $temp_ssid = $value;
-    } else if($key == "psk") {
-        $temp_pass = $value;
-    } else if($key == "priority") {
-        $temp_prio = $value;
-    }
-
-    if(isset($temp_ssid)) {
-        if(isset($temp_pass)) {
-            $networks[$temp_ssid] = $temp_pass;
-        }
-        if(isset($temp_prio)) {
-            $priorities[$temp_ssid] = $temp_prio;
-        }
-    }
-}
-unset($temp_ssid);
-unset($temp_pass);
-unset($temp_prio);
-
-
-
-unset($exec);
-$exec="iwconfig wlan0 | grep ESSID | cut -d ':' -f 2";
-$active_essid = trim(exec($exec),'"');
 
+$active_essid = trim(exec("iwconfig wlan0 | grep ESSID | cut -d ':' -f 2"),'"');
 /*
-* Now we need to check if we need to create a new wpa_supplicant.conf
+* Reconfigure all entries from UI
 */
 unset($exec);
 if(isset($_POST["submitWifi"]) && $_POST["submitWifi"] == "submit") {
-    $networks=array(); //clear
-    $priorities=array(); //clear
+    // make multiline bash
+    $exec  = "bash -e <<'END'\n";
+    $exec .= "source ".$conf['scripts_abs']."/helperscripts/inc.networkHelper.sh\n";
+    $exec .= "clear_wireless_networks\n";
 
-    foreach ( $_POST as $post_key => $post_value ) {
+    $tempPOST = $_POST;
+    $_POST=array(); //clear
+    foreach ( $tempPOST as $post_key => $post_value ) {
+        unset($temp_ssid);
+        unset($temp_pass);
+        unset($temp_prio);
         if ( substr(trim($post_key), 0, 9) == "WIFIssid_" ) {
-            $WIFIssid = trim($post_value);
+            $temp_ssid = trim($post_value);
             $post_key = "WIFIpass_".substr(trim($post_key), 9);
-            $post_value = $_POST[$post_key];
-            $WIFIpass = trim($post_value);
+            $post_value = $tempPOST[$post_key];
+            $temp_pass = trim($post_value);
             $post_key = "WIFIprio_".substr(trim($post_key), 9);
-            $post_value = $_POST[$post_key];
-            $WIFIprio = trim($post_value);
+            $post_value = $tempPOST[$post_key];
+            $temp_prio = trim($post_value);
 
-            if ( isset($WIFIssid) && $WIFIssid != "") {
-                if(isset($WIFIpass) && strlen($WIFIpass) >= 8) {
-                    $networks[$WIFIssid] = $WIFIpass;
-                }
-                if(isset($WIFIprio) && $WIFIprio != "") {
-                    $priorities[$WIFIssid] = $WIFIprio;
+            if (isset($temp_ssid) && $temp_ssid != "" && isset($temp_pass) && strlen($temp_pass) >= 8) {
+                if(!isset($temp_prio) || !is_numeric($temp_prio)) {
+                    $temp_prio = 0;
                 }
+                $exec .= "add_wireless_network wlan0 ".$temp_ssid." ".$temp_pass." ".$temp_prio."\n";
             }
         }
     }
-    $_POST=array(); //clear
 
-    // make multiline bash
-    $exec  = "bash -e <<'END'\n";
-    $exec .= "echo 'ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev\nupdate_config=1\ncountry=DE\n\n' | sudo tee /etc/wpa_supplicant/wpa_supplicant.conf\n";
-    foreach ( $networks as $WIFIssid => $WIFIpass ) {
-        $WIFIprio = $priorities[$WIFIssid];
-        if (strlen($WIFIpass) < 64) {
-            $WIFIpass = trim(exec("wpa_passphrase '".$WIFIssid."' '".$WIFIpass."' | grep -v -F '#psk' | grep -F 'psk' | cut -d= -f2"));
+    $exec .= "END\n";
+    exec("sudo bash -c '". $exec . "'");
+}
+
+/*
+* get all configured wifis
+*/
+$network_confs_shell = shell_exec("sudo bash -c 'source ".$conf['scripts_abs']."/helperscripts/inc.networkHelper.sh && get_wireless_networks'");
+$network_confs = explode(' ',$network_confs_shell);
+
+$networks = array();
+foreach($network_confs as $line){
+    unset($temp_ssid);
+    unset($temp_pass);
+    unset($temp_prio);
+	unset($temp_active);
+
+    $network_conf = explode(':',$line);
+    $temp_ssid = trim($network_conf[0]);
+    $temp_pass = trim($network_conf[1]);
+    $temp_prio = trim($network_conf[2]);
+	$temp_active = isset($active_essid) && $temp_ssid == $active_essid;
+
+    if(isset($temp_ssid) && $temp_ssid != "" && isset($temp_pass) && $temp_pass != "") {
+		if(!isset($temp_prio) || !is_numeric($temp_prio)) {
+			$temp_prio = 0;
+		}
+        $temp_entry = array($temp_ssid => [ $temp_pass, $temp_prio, $temp_active ]);
+        # use different methods to have the same behavior: the data of the first appearance are kept, following will be ignored
+        if($temp_active) {
+            $networks = array_merge($temp_entry, $networks);
+        } else {
+            $networks = $networks + $temp_entry;
         }
-        $exec .= "echo 'network={\n\tssid=\"".$WIFIssid."\"\n\tpsk=".$WIFIpass."\n\tpriority=".$WIFIprio."\n}' | sudo tee -a /etc/wpa_supplicant/wpa_supplicant.conf\n";
     }
-
-    $exec .= "sudo chown root:netdev /etc/wpa_supplicant/wpa_supplicant.conf\n";
-    $exec .= "sudo chmod 664 /etc/wpa_supplicant/wpa_supplicant.conf\n";
-    $exec .= "END\n";
-    exec($exec);
 }
+unset($temp_ssid);
+unset($temp_pass);
+unset($temp_prio);
+
 ?>
 
-<form name='volume' method='post' action='<?php print $_SERVER['PHP_SELF']; ?>'>
+<form name='wifi' method='post' action='<?php print $_SERVER['PHP_SELF']; ?>'>
     <fieldset>
         <!-- Form Name -->
         <legend><?php print $lang['globalWifiNetwork']; ?></legend>
@@ -127,16 +98,19 @@
         <ul class="list-group">
 <?php
     $network_index = 0;
-    foreach ( $networks as $WIFIssid => $WIFIpass ) {
-        $WIFIprio = $priorities[$WIFIssid];
+    foreach ( $networks as $WIFIssid => $WIFIconf ) {
+        $WIFIpass = $WIFIconf[0];
+        $WIFIprio = $WIFIconf[1];
+		$WIFIactive = $WIFIconf[2];
+        $WIFIindex = $network_index++;
 ?>
             <li class="list-group-item">
                 <div class="row">
 
                     <!-- Text input-->
                     <div class="form-group">
-                        <label class="col-md-4 control-label" for="WIFIssid_<?php print $network_index; ?>"><?php
-                            if(isset($WIFIssid) && isset($active_essid) && $WIFIssid == $active_essid) {
+                        <label class="col-md-4 control-label" for="WIFIssid_<?php print $WIFIindex; ?>"><?php
+                            if($WIFIactive) {
                                 print $lang['globalSSID']."*";
                             } else {
                                 print $lang['globalSSID'];
@@ -144,45 +118,36 @@
                         ?></label>
                         <div class="col-md-6">
                             <input value="<?php
-                                if(isset($WIFIssid) && $WIFIssid != "") {
-                                    print $WIFIssid;
-                                }
-                            ?>" id="WIFIssid_<?php print $network_index; ?>" name="WIFIssid_<?php print $network_index; ?>" placeholder="<?php print $lang['settingsWifiSsidPlaceholder']; ?>" class="form-control input-md" type="text">
+								print $WIFIssid;
+                            ?>" id="WIFIssid_<?php print $WIFIindex; ?>" name="WIFIssid_<?php print $WIFIindex; ?>" placeholder="<?php print $lang['settingsWifiSsidPlaceholder']; ?>" class="form-control input-md" type="text" <?php print $WIFIactive ? "readonly" : ""; ?>>
                             <span class="help-block"></span>
                         </div>
                     </div>
 
                     <!-- Text input-->
                     <div class="form-group">
-                        <label class="col-md-4 control-label" for="WIFIpass_<?php print $network_index; ?>"><?php print $lang['globalPassword']; ?></label>
+                        <label class="col-md-4 control-label" for="WIFIpass_<?php print $WIFIindex; ?>"><?php print $lang['globalPassword']; ?></label>
                         <div class="col-md-6">
                             <input value="<?php
-                                if(isset($WIFIpass) && $WIFIpass != "") {
-                                    print $WIFIpass;
-                                }
-                            ?>" id="WIFIpass_<?php print $network_index; ?>" name="WIFIpass_<?php print $network_index; ?>" placeholder="" class="form-control input-md" type="password" minlength="8" maxlength="63">
+								print $WIFIpass;
+                            ?>" id="WIFIpass_<?php print $WIFIindex; ?>" name="WIFIpass_<?php print $WIFIindex; ?>" placeholder="" class="form-control input-md" type="password" minlength="8" maxlength="63" <?php print $WIFIactive ? "readonly" : ""; ?>>
                             <span class="help-block"></span>
                         </div>
                     </div>
 
                     <!-- Text input-->
                     <div class="form-group">
-                      <label class="col-md-4 control-label" for="WIFIprio_<?php print $network_index; ?>"><?php print $lang['globalPriority']; ?></label>
+                      <label class="col-md-4 control-label" for="WIFIprio_<?php print $WIFIindex; ?>"><?php print $lang['globalPriority']; ?></label>
                       <div class="col-md-6">
                           <input value="<?php
-                              if(isset($WIFIprio) && $WIFIprio != "") {
-                                  print $WIFIprio;
-                              } else {
-                                  print 0;
-                              }
-                          ?>" id="WIFIprio_<?php print $network_index; ?>" name="WIFIprio_<?php print $network_index; ?>" placeholder="" class="form-control input-md" type="number" min="0" max="100">
+							  print $WIFIprio;
+                          ?>" id="WIFIprio_<?php print $WIFIindex; ?>" name="WIFIprio_<?php print $WIFIindex; ?>" placeholder="" class="form-control input-md" type="number" min="0" max="100" <?php print $WIFIactive ? "readonly" : ""; ?>>
                           <span class="help-block"></span>
                       </div>
                     </div>
                 </div>
             </li>
 <?php
-        $network_index++;
     }
 ?>
             <li class="list-group-item">
diff --git a/htdocs/userScripts.php b/htdocs/userScripts.php
index 536c06743..2cac71279 100755
--- a/htdocs/userScripts.php
+++ b/htdocs/userScripts.php
@@ -198,7 +198,7 @@
               <option value="false"><?php print $lang['cardFormYTSelectDefault']; ?></option>
 <?php
 // read the subfolders of $Audio_Folders_Path
-$audiofolders = array_filter(glob($conf['scripts_abs'].'/userscripts/*'), 'is_file');
+$audiofolders = array_filter(glob($conf['scripts_abs'].'/userscripts/*.sh'), 'is_file');
 usort($audiofolders, 'strcasecmp');
 
 
diff --git a/misc/sampleconfigs/autohotspot.service.stretch-default2-Hotspot.sample b/misc/sampleconfigs/autohotspot.service.stretch-default2-Hotspot.sample
deleted file mode 100755
index 1e6ccc5fd..000000000
--- a/misc/sampleconfigs/autohotspot.service.stretch-default2-Hotspot.sample
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Automatically generates an internet Hotspot when a valid ssid is not in range
-After=multi-user.target
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=%AUTOHOTSPOT_SCRIPT%
-[Install]
-WantedBy=multi-user.target
diff --git a/misc/sampleconfigs/autohotspot/NetworkManager/autohotspot b/misc/sampleconfigs/autohotspot/NetworkManager/autohotspot
new file mode 100644
index 000000000..3f3a513a4
--- /dev/null
+++ b/misc/sampleconfigs/autohotspot/NetworkManager/autohotspot
@@ -0,0 +1,353 @@
+#!/bin/bash
+#version 0.8
+#date 12 Dec 2023
+#Copyright Graeme Richards - RaspberryConnect.com
+#Released under the GPL3 Licence (https://www.gnu.org/licenses/gpl-3.0.en.html)
+
+#Script to automatically switch to an Access Point when no Wifi connection is available
+#Developed on a Raspberry Pi PiOS Bookworm for use with Network Manager
+
+#Additions where made for the Phoniebox project
+#https://github.com/MiczFlor/RPi-Jukebox-RFID
+
+#Device Names
+wdev0='%WIFI_INTERFACE%' #wifi device that AP will work on
+
+#AP setup
+ap_profile_name='%AUTOHOTSPOT_PROFILE%'
+ap_ssid='%AUTOHOTSPOT_SSID%'
+ap_pw='%AUTOHOTSPOT_PASSWORD%'
+ap_ip='%AUTOHOTSPOT_IP%/24'
+ap_gate='%IP_WITHOUT_LAST_SEGMENT%.254'
+
+timer_service_name='%AUTOHOTSPOT_TIMER_NAME%'
+
+#If wifi is disabled in Network Manager, then enable it automatically.
+#if set to 'false' then wifi will stay off and no AccessPoint will be generated or Network Connection will be available.
+re_enable_wifi=false
+
+#If true, check if timer is active. Will have been disabled if arg -a used.
+re_enable_timer=false
+
+#*************************************
+#*****No user editable lines below****
+
+NO_SSID='NoSSid'
+
+profiles=() #Currently Available Profiles
+active="" #The active connection
+active_ap=false #is the active profile an AP y/n
+nw_profile=() #saved NW Profiles
+ap_profile=() #The saved AP profiles
+ssidChk=("$NO_SSID")
+force_hotspot=false
+
+#Function is NM installed and running
+check_prerequisite() {
+    if systemctl -all list-unit-files NetworkManager.service | grep "could not be found" >/dev/null 2>&1 ;then
+        if systemctl -all list-unit-files dhcpcd.service | grep "(running)" >/dev/null 2>&1 ;then
+            echo "This script is not compatible with the network setup."
+            echo "Please use the dhcpcd version"
+        else
+            echo "Network Manager is not managing the Wifi on this device"
+            echo "Unable to continue."
+        fi
+        exit 1
+    else
+        local isnm="$( systemctl status NetworkManager | grep '(running)' )"
+        if echo "$isnm" | grep -v "(running)" ;then  >/dev/null 2>&1; #NM not running
+            echo "Network Manager is required but is not the active system network service"
+            echo "Unable to continue."
+            exit 1
+        fi
+    fi
+}
+
+#Function get all wifi profiles
+saved_profiles()
+{
+    ap_profile=()
+    nw_profile=()
+    local n="$(nmcli -t -f TYPE,NAME,AUTOCONNECT-PRIORITY con show)" #Capture Output
+    n="$(awk 1 ORS=':' <(echo "$n"))" #Replaces LF with : Delimeter
+    local profiles=()
+    readarray -d ':' -t profiles < <(printf "%s" "$n") #Change to array output
+    if [ ! -z "$profiles" ]; then
+        for (( c=0; c<=${#profiles[@]}; c+=3 )) #array of profiles
+        do
+            if [ ! -z "${profiles[$c+1]}" ] ; then
+                local conn="$(nmcli con show "${profiles[$c+1]}" | grep 'wireless.mode')" #show mode infurstructure, AP
+                local mode=()
+                readarray -d ':' -t mode < <(printf "%s" "$conn")
+                local mode2="$(echo "${mode[1]}" | sed 's/[[:blank:]]//g')"
+                if [ "$mode2" = "ap" ]; then
+                    ap_profile+=("${profiles[$c+1]}")
+                    echo "AP Profile: ${profiles[$c+1]}"
+                elif [ "$mode2" = "infrastructure" ]; then
+                    nw_profile+=("${profiles[$c+1]}")
+                    echo "NW Profile: ${profiles[$c+1]}"
+                fi
+            fi
+        done
+    fi
+}
+
+#Function what is the current active wifi
+active_wifi()
+{
+    local act="$(nmcli -t -f TYPE,NAME,DEVICE con show --active | grep "$wdev0")" #List of active devices
+    act="$(awk 1 ORS=':' <(echo "$act"))" #Replaces LF with : Delimeter
+    local active_name=()
+    readarray -d ':' -t active_name < <(printf "%s" "$act") #Change to array output
+    if [ ! -z "$active_name" ]; then
+        active="${active_name[1]}"
+    else
+        active=""
+    fi
+}
+
+#Function is the current Connection an AP
+is_active_ap()
+{
+    active_ap=false
+    if [ ! -z "$active" ] ; then
+        for i in "${ap_profile[@]}"
+        do
+            if [[ $i == "$active" ]]; then
+                active_ap=true
+                break
+            fi
+        done
+    fi
+}
+
+#Function IW SSID scan
+nearby_ssids_iw()
+{
+    if [ ${#nw_profile[@]} -eq 0 ]; then #only scan if NW profiles exists#
+        return
+    fi
+
+    #Check to see what SSID's and MAC addresses are in range
+    echo "SSID availability check"
+    local i=0; j=0
+    while [ $i -eq 0 ]
+    do
+        local scanreply=$(iw dev "$wdev0" scan ap-force 2>&1)
+        local ssidreply=$(echo "$scanreply" | egrep "^BSS|SSID:")
+        if [ $j -ge 5 ]; then
+            ssidreply=""
+            i=1
+        elif [ -z "$ssidreply" ] ; then
+            echo "Error scan SSID's, try $j: $scanreply"
+            j=$((j + 1))
+            sleep 2
+        else
+            #success
+            i=1
+        fi
+    done
+
+    ssidChk=()
+    for profile in "${nw_profile[@]}"
+    do
+        echo "Assessing profile: ${profile}"
+        local idssid=$(nmcli -t con show "${profile}" | grep "wireless.ssid")
+        if (echo "$ssidreply" | grep -F -- "${idssid:21}" ) >/dev/null 2>&1
+        then
+            echo "Valid SSID detected, assessing Wifi status"
+            ssidChk+="${profile}"
+        fi
+    done
+
+    if [ "${#ssidChk[@]}" -eq 0 ]; then
+        echo "No Valid SSID detected"
+        ssidChk+="$NO_SSID"
+    fi
+}
+
+check_device()
+{
+    echo "Device availability check"
+    local j=0
+    while [ true ] #wait for wifi if busy, usb wifi is slower.
+    do
+        if [ $j -ge 5 ]; then
+            echo "No wifi device '$wdev0' connected"
+            exit 1
+        elif (nmcli device show "$wdev0" 2>&1 >/dev/null) ; then
+            echo "Wifi device '$wdev0' available"
+            if (rfkill list wifi -rno HARD,SOFT | grep -i "unblocked.*unblocked") >/dev/null 2>&1 ; then
+                return
+            else
+                if [[ $re_enable_wifi = true ]] ; then
+                    nmcli radio wifi on
+                    echo "Wifi has been re-activated"
+                    sleep 10 #delay to allow wifi to initialise
+                    return
+                else
+                    echo "Wifi is deactivated"
+                    exit 0
+                fi
+            fi
+        else
+            j=$((j + 1))
+            sleep 2
+        fi
+    done
+}
+
+#Activate AP profile
+start_ap()
+{
+    local ex=0
+    for i in "${ap_profile[@]}"
+    do
+        if [[ $i == "$ap_profile_name" ]]; then
+            ex=1 #known saved AP profile is available
+            break
+        fi
+    done
+    if [ $ex -eq 0 ];then
+        ap_new_profile #if known AP profile not found, create it
+    fi
+    nmcli con up "$ap_profile_name" >/dev/null 2>&1
+    sleep 3 #give time for ap to be setup
+    active_wifi
+    is_active_ap
+    if [ "$active_ap" = true ]; then
+        echo "Access Point started"
+        local curip="$(nmcli -t con show $active | grep IP4.ADDRESS)"
+        readarray -d ':' -t ipid < <(printf "%s" "$curip")
+        local showip="$(echo "${ipid[1]}" | sed 's/[[:blank:]]//g')"
+        if [ ! -z $showip ]; then
+            echo "AP on IP Address ${showip::-3}"
+        fi
+    else
+        echo "AP failed to be created."
+    fi
+}
+
+#Activate NW profile
+start_nw()
+{
+    if [ "$active_ap" = true ]; then
+        echo "The active profile is $active. Shutting down"
+        nmcli con down "$active" >/dev/null 2>&1
+    fi
+
+    local active_nw=""
+    for i in "${nw_profile[@]}"
+    do
+        echo "Checking: $i"
+        con="$(nmcli con up $i)"
+        if ( echo "$con" | grep 'Connection successfully activated' ) >/dev/null 2>&1; then
+            echo "Connection was good"
+            active_wifi
+            active_nw="$active"
+        elif ( echo "$con" | grep 'Connection activation failed' ) >/dev/null 2>&1; then
+            echo "Unable to make a connection. Check the password is ok for the ssid ${nw_profile[$c]}"
+            active_nw=""
+        else
+            echo "Unable to confirm the connection status"
+            active_nw=""
+        fi
+        if [ ! -z "$active_nw" ] ;then
+            echo "A valid connection has been made with $i"
+            break
+        fi
+    done
+
+    if [ -z "$active_nw" ] ;then
+        echo "A network connection has not been made with any known ssid. Activating access point"
+        start_ap
+    fi
+}
+
+#Function Create AP profile
+ap_new_profile()
+{
+    echo "Create a AP profile ${ap_profile_name}"
+    nmcli device wifi hotspot ifname $wdev0 con-name "$ap_profile_name" ssid "$ap_ssid" band bg password "$ap_pw" >/dev/null 2>&1
+    nmcli con mod "$ap_profile_name" ipv4.method shared ipv4.addr "$ap_ip" ipv4.gateway "$ap_gate" >/dev/null 2>&1
+    ap_profile+=("$ap_profile_name")
+}
+
+#Main
+check_prerequisite
+check_device
+
+while getopts "aht" opt; do
+    case $opt in
+        a )
+            force_hotspot=true
+            ;;
+        t )
+            re_enable_timer=true
+            ;;
+        h )
+            sc="$(basename $0)"
+            echo -e "\nby default the $sc script will setup a connection to a WiFi network where a profile exists"
+            echo "otherwise an Access Point called $ap_ssid will be created. Using ip address $ap_ip"
+            echo "The local wifi signals will be check every 2 minutes. If a known SSID comes into range"
+            echo "the Access Point will be shutdown and a connection to the Wifi network will be made."
+            echo "using sudo $sc -a will activate the Access Point regardless of any existing WiFi profile"
+            echo "and stop the timed checks. Use sudo $sc to return to normal use."
+            exit
+            ;;
+        * )
+            echo "option not valid"
+            exit
+            ;;
+    esac
+done
+
+saved_profiles #get list of saved profile
+active_wifi
+is_active_ap
+echo -e "The active profile is $active\n"
+
+if [ "$force_hotspot" = true ]; then
+    if [ ! "$active_ap" = true ]; then
+        systemctl stop "$timer_service_name"
+        start_ap
+    elif [ ! "$active" = "$ap_profile_name" ]; then #Other AP is running, swap to this one
+        nmcli con down "$active"
+        start_ap
+    else
+        echo "Access Point $active is already running"
+    fi
+else
+    if [ ! -z "$active" ]; then #Active Profile Yes
+        if [ "$active_ap" = true ]; then #Yes it's an AP profile
+            nearby_ssids_iw #scan for nearby SSID's
+            if [ "${ssidChk[0]}" != "$NO_SSID" ]; then #known ssid in range
+                start_nw
+            elif [ ! "$active" = "$ap_profile_name" ]; then #Other AP is running, swap to this one
+                nmcli con down "$active"
+                start_ap
+            fi
+        fi
+    else #no active profile
+        nearby_ssids_iw #scan for nearby SSID's
+        if [ "${ssidChk[0]}" != "$NO_SSID" ]; then #known ssid in range
+            start_nw
+        else
+            start_ap
+        fi
+    fi
+
+    if [[ $re_enable_timer = true ]] ; then
+        #check if timer is active. Will have been disabled if arg -a used.
+        tup="$(systemctl list-timers | grep '${timer_service_name}')"
+        if [ -z "$tup" ];then
+            systemctl start "$timer_service_name"
+            echo "Reactivated timer"
+        fi
+    fi
+fi
+
+active_wifi
+is_active_ap
+echo -e "\nThe Wifi profile in use is: $active"
+echo -e "Is this a local access point? $active_ap\n"
diff --git a/misc/sampleconfigs/autohotspot/NetworkManager/autohotspot.service b/misc/sampleconfigs/autohotspot/NetworkManager/autohotspot.service
new file mode 100644
index 000000000..746b960e1
--- /dev/null
+++ b/misc/sampleconfigs/autohotspot/NetworkManager/autohotspot.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Automatically generates an wifi hotspot when a valid SSID is not in range
+After=multi-user.target
+Requires=network-online.target
+
+[Service]
+Type=simple
+ExecStart=%AUTOHOTSPOT_SCRIPT%
+
+[Install]
+WantedBy=multi-user.target
diff --git a/misc/sampleconfigs/autohotspot/NetworkManager/autohotspot.timer b/misc/sampleconfigs/autohotspot/NetworkManager/autohotspot.timer
new file mode 100644
index 000000000..e3a52baf5
--- /dev/null
+++ b/misc/sampleconfigs/autohotspot/NetworkManager/autohotspot.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Timer to run the %AUTOHOTSPOT_SERVICE% every 2 mins
+
+[Timer]
+OnBootSec=0min
+OnCalendar=*:0/2
+Unit=%AUTOHOTSPOT_SERVICE%
+
+[Install]
+WantedBy=timers.target
diff --git a/misc/sampleconfigs/autohotspot.sh.stretch-default2-Hotspot.sample b/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot
similarity index 86%
rename from misc/sampleconfigs/autohotspot.sh.stretch-default2-Hotspot.sample
rename to misc/sampleconfigs/autohotspot/dhcpcd/autohotspot
index cdb56bad6..0f5699097 100644
--- a/misc/sampleconfigs/autohotspot.sh.stretch-default2-Hotspot.sample
+++ b/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #version 0.962-N/HS
 
 #You may share this script on the condition all references to RaspberryConnect.com
@@ -12,19 +12,25 @@
 #Additions where made for the Phoniebox project
 #https://github.com/MiczFlor/RPi-Jukebox-RFID
 
-if [ $# -gt 0 ] ; then
-    if [ $# -eq 1 ] && [ "$1" == "--force-hotspot" ]; then
-        FORCE_HOTSPOT=1
-    else
-        echo "ignoring unrecognized parameter: $*"
-    fi
-fi
+while getopts "a" opt; do
+    case $opt in
+        a )
+            FORCE_HOTSPOT=true
+            ;;
+        * )
+            echo "option not valid"
+            exit
+            ;;
+    esac
+done
 
 NO_SSID='NoSSid'
 ssidChk="$NO_SSID"
 
-wifidev="wlan0" #device name to use. Default is wlan0.
+wifidev="%WIFI_INTERFACE%" #device name to use.
 #use the command: iw dev ,to see wifi interface name
+hotspot_ip=%AUTOHOTSPOT_IP%
+daemon_service="%AUTOHOTSPOT_SERVICE_DAEMON%"
 
 IFSdef=$IFS
 cnt=0
@@ -50,7 +56,7 @@ CreateAdHocNetwork()
 {
     echo "Creating Hotspot"
     ip link set dev "$wifidev" down
-    ip a add %AUTOHOTSPOT_IP%/24 brd + dev "$wifidev"
+    ip a add "$hotspot_ip"/24 brd + dev "$wifidev"
     ip link set dev "$wifidev" up
     dhcpcd -k "$wifidev" >/dev/null 2>&1
     systemctl start dnsmasq
@@ -81,7 +87,7 @@ CheckWifiUp()
 }
 
 InitWPA() {
-    wpa_supplicant -B -i "$wifidev" -c /etc/wpa_supplicant/wpa_supplicant.conf >/dev/null 2>&1
+    systemctl restart "$daemon_service"
 }
 
 CheckServices()
@@ -108,28 +114,29 @@ CheckServices()
 
 CheckDevice()
 {
+    echo "Device availability check"
     local j=0
     while [ true ] #wait for wifi if busy, usb wifi is slower.
     do
-        echo "Device availability check: try $j"
+
         if [ $j -ge 5 ]; then
             #if no wifi device,ie usb wifi removed, activate wifi so when it is
             #reconnected wifi to a router will be available
-            echo "No wifi device connected"
+            echo "No wifi device '$wifidev' connected"
             InitWPA
             exit 1
         elif (iw dev "$wifidev" info 2>&1 >/dev/null) ; then
-            echo "wifi device available"
+            echo "Wifi device '$wifidev' available"
             if (rfkill list wifi -rno HARD,SOFT | grep -i "unblocked.*unblocked") >/dev/null 2>&1 ; then
                 local wifidev_up=$(ip link show "$wifidev" up)
                 if [ -z "$wifidev_up" ]; then
-                    echo "wifi is down. setting up"
+                    echo "Wifi is down. Setting up"
                     ip link set dev "$wifidev" up
                     sleep 2
                 fi
                 return
             else
-                echo "wifi is deactivated"
+                echo "Wifi is deactivated"
                 exit 0
             fi
         else
@@ -144,22 +151,21 @@ FindSSID()
     if [ -n "$FORCE_HOTSPOT" ]; then return; fi
 
     #Check to see what SSID's and MAC addresses are in range
+    echo "SSID availability check"
     local i=0; j=0
     while [ $i -eq 0 ]
     do
         scanreply=$(iw dev "$wifidev" scan ap-force 2>&1)
         ssidreply=$(echo "$scanreply" | egrep "^BSS|SSID:")
-        echo "SSID availability check: try $j"
         if [ $j -ge 5 ]; then
             ssidreply=""
             i=1
         elif [ -z "$ssidreply" ] ; then
-            echo "Error scan SSID's: $scanreply"
+            echo "Error scan SSID's, try $j: $scanreply"
             j=$((j + 1))
             sleep 2
         else
-            echo "SSID's in range:"
-            echo "$ssidreply"
+            #success
             i=1
         fi
     done
@@ -168,12 +174,15 @@ FindSSID()
     do
         if (echo "$ssidreply" | grep "$ssid") >/dev/null 2>&1
         then
-            #Valid SSid found, passing to script
-            echo "Valid SSID Detected, assesing Wifi status"
+            echo "Valid SSID detected, assessing Wifi status"
             ssidChk=$ssid
-            return 0
+            break
         fi
     done
+
+    if [ "$ssidChk" == "$NO_SSID" ]; then
+        echo "No Valid SSID detected"
+    fi
 }
 
 CheckSSID()
diff --git a/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot-daemon.service b/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot-daemon.service
new file mode 100644
index 000000000..d0381e5ce
--- /dev/null
+++ b/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot-daemon.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Daemon for regular network connection if no hotspot is created
+After=multi-user.target
+
+[Service]
+Type=simple
+ExecStart=wpa_supplicant -i "%WIFI_INTERFACE%" -c /etc/wpa_supplicant/wpa_supplicant.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot.service b/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot.service
new file mode 100644
index 000000000..746b960e1
--- /dev/null
+++ b/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Automatically generates an wifi hotspot when a valid SSID is not in range
+After=multi-user.target
+Requires=network-online.target
+
+[Service]
+Type=simple
+ExecStart=%AUTOHOTSPOT_SCRIPT%
+
+[Install]
+WantedBy=multi-user.target
diff --git a/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot.timer b/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot.timer
new file mode 100644
index 000000000..e3a52baf5
--- /dev/null
+++ b/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Timer to run the %AUTOHOTSPOT_SERVICE% every 2 mins
+
+[Timer]
+OnBootSec=0min
+OnCalendar=*:0/2
+Unit=%AUTOHOTSPOT_SERVICE%
+
+[Install]
+WantedBy=timers.target
diff --git a/misc/sampleconfigs/dnsmasq.conf.stretch-default2-Hotspot.sample b/misc/sampleconfigs/autohotspot/dhcpcd/dnsmasq.conf
similarity index 86%
rename from misc/sampleconfigs/dnsmasq.conf.stretch-default2-Hotspot.sample
rename to misc/sampleconfigs/autohotspot/dhcpcd/dnsmasq.conf
index 96674a303..b8b525407 100644
--- a/misc/sampleconfigs/dnsmasq.conf.stretch-default2-Hotspot.sample
+++ b/misc/sampleconfigs/autohotspot/dhcpcd/dnsmasq.conf
@@ -2,6 +2,6 @@
 #stop DNSmasq from using resolv.conf
 no-resolv
 #Interface to use
-interface=wlan0
+interface=%WIFI_INTERFACE%
 bind-interfaces
 dhcp-range=%IP_WITHOUT_LAST_SEGMENT%.100,%IP_WITHOUT_LAST_SEGMENT%.200,12h
diff --git a/misc/sampleconfigs/hostapd.stretch-default2-Hotspot.sample b/misc/sampleconfigs/autohotspot/dhcpcd/hostapd
old mode 100755
new mode 100644
similarity index 100%
rename from misc/sampleconfigs/hostapd.stretch-default2-Hotspot.sample
rename to misc/sampleconfigs/autohotspot/dhcpcd/hostapd
diff --git a/misc/sampleconfigs/hostapd.conf.stretch-default2-Hotspot.sample b/misc/sampleconfigs/autohotspot/dhcpcd/hostapd.conf
old mode 100755
new mode 100644
similarity index 93%
rename from misc/sampleconfigs/hostapd.conf.stretch-default2-Hotspot.sample
rename to misc/sampleconfigs/autohotspot/dhcpcd/hostapd.conf
index 6b2195dc6..014b86e6b
--- a/misc/sampleconfigs/hostapd.conf.stretch-default2-Hotspot.sample
+++ b/misc/sampleconfigs/autohotspot/dhcpcd/hostapd.conf
@@ -1,5 +1,5 @@
 #2.4GHz setup wifi 80211 b,g,n
-interface=wlan0
+interface=%WIFI_INTERFACE%
 driver=nl80211
 ssid=%AUTOHOTSPOTssid%
 hw_mode=g
diff --git a/misc/sampleconfigs/dhcpcd.conf.buster-default-noHotspot.sample b/misc/sampleconfigs/dhcpcd.conf.buster-default-noHotspot.sample
index f00ed04f4..ef1bcb741 100755
--- a/misc/sampleconfigs/dhcpcd.conf.buster-default-noHotspot.sample
+++ b/misc/sampleconfigs/dhcpcd.conf.buster-default-noHotspot.sample
@@ -1,4 +1,4 @@
-interface wlan0
+interface %WIFIinterface%
 static ip_address=%WIFIip%/24
 static routers=%WIFIipRouter%
-static domain_name_servers=8.8.8.8 %WIFIipRouter%
+static domain_name_servers=%WIFIipRouter% %WIFIipExtDNS%
diff --git a/misc/sampleconfigs/wpa_supplicant.conf.buster-default.sample b/misc/sampleconfigs/wpa_supplicant.conf.sample
old mode 100755
new mode 100644
similarity index 59%
rename from misc/sampleconfigs/wpa_supplicant.conf.buster-default.sample
rename to misc/sampleconfigs/wpa_supplicant.conf.sample
index 0971968bd..32029bd31
--- a/misc/sampleconfigs/wpa_supplicant.conf.buster-default.sample
+++ b/misc/sampleconfigs/wpa_supplicant.conf.sample
@@ -1,9 +1,3 @@
 ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
 update_config=1
 country=%WIFIcountryCode%
-
-network={
-	ssid="%WIFIssid%"
-	psk="%WIFIpass%"
-	key_mgmt=WPA-PSK
-}
diff --git a/packages-autohotspot_NetworkManager.txt b/packages-autohotspot_NetworkManager.txt
new file mode 100644
index 000000000..bd4dbde9c
--- /dev/null
+++ b/packages-autohotspot_NetworkManager.txt
@@ -0,0 +1,4 @@
+# Define packages for apt-get.  These can be installed with
+# 'sed 's/#.*//g' packages.txt | xargs sudo apt-get install'
+
+iw
diff --git a/packages-autohotspot.txt b/packages-autohotspot_dhcpcd.txt
similarity index 100%
rename from packages-autohotspot.txt
rename to packages-autohotspot_dhcpcd.txt
diff --git a/scripts/helperscripts/inc.networkHelper.sh b/scripts/helperscripts/inc.networkHelper.sh
new file mode 100644
index 000000000..ff0df181e
--- /dev/null
+++ b/scripts/helperscripts/inc.networkHelper.sh
@@ -0,0 +1,123 @@
+_get_service_enablement() {
+    local service="$1"
+    local option="${2:+$2 }" # optional, dont't quote in 'systemctl' call!
+
+    if [[ -z "${service}" ]]; then
+        echo "ERROR: at least one parameter value is missing!"
+        exit 1
+    fi
+
+    local actual_enablement=$(systemctl is-enabled ${option}${service} 2>/dev/null)
+
+    echo "$actual_enablement"
+}
+
+is_service_enabled() {
+    local service="$1"
+    local option="$2"
+    local actual_enablement=$(_get_service_enablement $service $option)
+
+    if [[ "$actual_enablement" == "enabled" ]]; then
+        echo true
+    else
+        echo false
+    fi
+}
+
+is_dhcpcd_enabled() {
+    if [[ $(is_service_enabled "dhcpcd.service") == true || "${CI_TEST_DHCPCD}" == true ]]; then
+        echo true
+    else
+        echo false
+    fi
+}
+
+is_NetworkManager_enabled() {
+    if [[ $(is_service_enabled "NetworkManager.service") == true || "${CI_TEST_NETWORKMANAGER}" == true ]]; then
+        echo true
+    else
+        echo false
+    fi
+}
+
+WPA_CONF="/etc/wpa_supplicant/wpa_supplicant.conf"
+clear_wireless_networks() {
+    if [[ $(is_dhcpcd_enabled) == true ]]; then
+        sudo sed -i -e '/^[[:space:]]*$/d' -e '/^network={/,/^}/d' $WPA_CONF
+    fi
+
+    if [[ $(is_NetworkManager_enabled) == true ]]; then
+        nmcli -g UUID,TYPE,ACTIVE connection show | grep  "^.*:.*:no$" | grep -F "wireless" | cut -d : -f 1 | \
+            while read uuid; do sudo nmcli connection delete "$uuid"; done
+    fi
+}
+
+_get_passphrase_for_config() {
+    local ssid="$1"
+    local pass="$2"
+    if [[ "${#pass}" -lt 64 ]]; then
+        pass=$(wpa_passphrase "$ssid" "$pass" | grep -vF '#psk' | grep -F "psk=" | cut -d = -f 2)
+    fi
+    echo $pass
+}
+
+add_wireless_network() {
+    local interface="$1"
+    local ssid="$2"
+    local pass="$3"
+    local prio="$4"
+
+    pass=$(_get_passphrase_for_config "$ssid" "$pass")
+
+    if [[ $(is_dhcpcd_enabled) == true ]]; then
+        if ! sudo cat "$WPA_CONF" | grep -qF "ssid=\"${ssid}\"" ; then
+            local wpa_network_with_dummy_psk=$(wpa_passphrase "$ssid" "dummypsk")
+            if echo "$wpa_network_with_dummy_psk" | grep -qF 'network='; then
+                local wpa_network=$(echo "$wpa_network_with_dummy_psk" | sed -e '/#psk/d' -e "s/psk=.*$/psk=${pass}/" -e "/^}/i\\\tpriority=${prio}" )
+                sudo bash -c "echo '${wpa_network}' >> $WPA_CONF"
+            fi
+        fi
+    fi
+
+    if [[ $(is_NetworkManager_enabled) == true ]]; then
+        if ! nmcli -g NAME,TYPE connection show | grep -F "wireless" | grep -qwF "$ssid"; then
+            sudo nmcli connection add type wifi con-name "$ssid" ifname "$interface" autoconnect yes mode infrastructure ssid "$ssid"
+		    sudo nmcli connection modify "$ssid" wifi-sec.key-mgmt wpa-psk wifi-sec.psk "$pass" conn.autoconnect-p "$prio"
+        fi
+    fi
+}
+
+# gets the configured wireless networks. Returns an array with the format "ssid:pass:prio ssid:pass:prio".
+get_wireless_networks() {
+    networks=()
+
+    if [[ $(is_dhcpcd_enabled) == true ]]; then
+        local wpa_networks=$(sudo sed '/^network={/,/^}/!d' $WPA_CONF)
+        local wpa_networks_perline=$(echo "${wpa_networks//$'\n'/\\n}" | sed -e 's/[[:space:]]//g' -e 's/\\nnetwork=/\nnetwork=/g')
+        for wpa_network in $wpa_networks_perline
+        do
+            local wpa_network_multiline="${wpa_network//\\n/$'\n'}"
+            local ssid=$(echo "$wpa_network_multiline" | grep -F "ssid=" | cut -d = -f 2 | tr -d '"')
+            local pass=$(echo "$wpa_network_multiline" | grep -F "psk=" | cut -d = -f 2)
+            local prio=$(echo "$wpa_network_multiline" | grep -F "priority=" | cut -d = -f 2)
+
+            networks+=("$ssid":"$pass":"$prio")
+        done
+    fi
+
+    if [[ $(is_NetworkManager_enabled) == true ]]; then
+        local network_profiles=$(nmcli -g UUID,TYPE connection show | grep -F "wireless" | cut -d : -f 1)
+
+        for network_profile in $network_profiles
+        do
+            local result=$(sudo nmcli --show-secrets -t -f 802-11-wireless.ssid,802-11-wireless-security.psk,connection.autoconnect-priority con show $network_profile)
+            local ssid=$(echo "$result" | grep -F "802-11-wireless.ssid" | cut -d : -f 2)
+            local pass=$(echo "$result" | grep -F "802-11-wireless-security.psk" | cut -d : -f 2)
+            local prio=$(echo "$result" | grep -F "connection.autoconnect-priority" | cut -d : -f 2)
+
+            networks+=("$ssid":"$pass":"$prio")
+        done
+    fi
+
+    echo "${networks[@]}"
+}
diff --git a/scripts/helperscripts/setup_autohotspot.sh b/scripts/helperscripts/setup_autohotspot.sh
index 5f9067894..2ae9cd361 100644
--- a/scripts/helperscripts/setup_autohotspot.sh
+++ b/scripts/helperscripts/setup_autohotspot.sh
@@ -26,29 +26,67 @@ call_with_args_from_file () {
     sed 's/#.*//g' ${package_file} | xargs "$@"
 }
 
+_get_last_ip_segment() {
+    local ip="$1"
+    echo $ip | cut -d'.' -f1-3
+}
+
+# create flag file if files does no exist (*.remove) or copy present conf to backup file (*.orig)
+# to correctly handling de-/activation of corresponding feature
+config_file_backup() {
+    local config_file="$1"
+    local config_flag_file="${config_file}.remove"
+    local config_orig_file="${config_file}.orig"
+    if [ ! -f "${config_file}" ]; then
+        sudo touch "${config_flag_file}"
+    elif [ ! -f "${config_orig_file}" ] && [ ! -f "${config_flag_file}" ]; then
+        sudo cp "${config_file}" "${config_orig_file}"
+    fi
+}
+
+# revert config files backed up with `config_file_backup`
+config_file_revert() {
+    local config_file="$1"
+    local config_flag_file="${config_file}.remove"
+    local config_orig_file="${config_file}.orig"
+    if [ -f "${config_flag_file}" ]; then
+        sudo rm "${config_flag_file}" "${config_file}"
+    elif [ -f "${config_orig_file}" ]; then
+        sudo mv "${config_orig_file}" "${config_file}"
+    fi
+}
+
 apt_get="sudo apt-get -qq --yes"
 
 systemd_dir="/etc/systemd/system"
 
+autohotspot_script="/usr/bin/autohotspot"
+autohotspot_service_daemon="autohotspot-daemon.service"
+autohotspot_service_daemon_path="${systemd_dir}/${autohotspot_service_daemon}"
 autohotspot_service="autohotspot.service"
 autohotspot_service_path="${systemd_dir}/${autohotspot_service}"
-autohotspot_script="/usr/bin/autohotspot"
+autohotspot_timer="autohotspot.timer"
+autohotspot_timer_path="${systemd_dir}/${autohotspot_timer}"
 
+interfaces_conf_file="/etc/network/interfaces"
 dnsmasq_conf=/etc/dnsmasq.conf
 hostapd_conf=/etc/hostapd/hostapd.conf
 hostapd_deamon=/etc/default/hostapd
 dhcpcd_conf=/etc/dhcpcd.conf
 dhcpcd_conf_nohook_wpa_supplicant="nohook wpa_supplicant"
+networkManager_connections_path="/etc/NetworkManager/system-connections"
 
-if [ "${AUTOHOTSPOTconfig}" == "YES" ]; then
+wifi_interface=wlan0
+ip_without_last_segment=$(_get_last_ip_segment $AUTOHOTSPOTip)
+autohotspot_profile="Phoniebox_Hotspot"
 
-    # adapted from https://www.raspberryconnect.com/projects/65-raspberrypi-hotspot-accesspoints/158-raspberry-pi-auto-wifi-hotspot-switch-direct-connection
+source "${JUKEBOX_HOME_DIR}"/scripts/helperscripts/inc.networkHelper.sh
 
-    # power management of wifi: switch off to avoid disconnecting
-    sudo iwconfig wlan0 power off
+_install_autohotspot_dhcpcd() {
+    # adapted from https://www.raspberryconnect.com/projects/65-raspberrypi-hotspot-accesspoints/158-raspberry-pi-auto-wifi-hotspot-switch-direct-connection
 
     # required packages
-    call_with_args_from_file "${JUKEBOX_HOME_DIR}"/packages-autohotspot.txt ${apt_get} install
+    call_with_args_from_file "${JUKEBOX_HOME_DIR}"/packages-autohotspot_dhcpcd.txt ${apt_get} install
     sudo systemctl unmask hostapd
     sudo systemctl disable hostapd
     sudo systemctl stop hostapd
@@ -56,31 +94,25 @@ if [ "${AUTOHOTSPOTconfig}" == "YES" ]; then
     sudo systemctl disable dnsmasq
     sudo systemctl stop dnsmasq
 
+    # configure interface conf
+    config_file_backup "${interfaces_conf_file}"
+    sudo rm "${interfaces_conf_file}"
+    sudo touch "${interfaces_conf_file}"
+
     # configure DNS
-    # create flag file or copy present conf to orig file
-    # to correctly handling future deactivation of autohotspot
-    if [ ! -f "${dnsmasq_conf}" ]; then
-        sudo touch "${dnsmasq_conf}.remove"
-    elif [ ! -f "${dnsmasq_conf}.orig" ] && [ ! -f "${dnsmasq_conf}.remove" ]; then
-        sudo cp "${dnsmasq_conf}" "${dnsmasq_conf}.orig"
-    fi
+    config_file_backup "${dnsmasq_conf}"
 
-    ip_without_last_segment=$(echo $AUTOHOTSPOTip | cut -d'.' -f1-3)
-    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/dnsmasq.conf.stretch-default2-Hotspot.sample "${dnsmasq_conf}"
+    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/autohotspot/dhcpcd/dnsmasq.conf "${dnsmasq_conf}"
+    sudo sed -i "s|%WIFI_INTERFACE%|${wifi_interface}|g" "${dnsmasq_conf}"
     sudo sed -i "s|%IP_WITHOUT_LAST_SEGMENT%|${ip_without_last_segment}|g" "${dnsmasq_conf}"
     sudo chown root:root "${dnsmasq_conf}"
     sudo chmod 644 "${dnsmasq_conf}"
 
     # configure hostapd conf
-    # create flag file or copy present conf to orig file
-    # to correctly handling future deactivation of autohotspot
-    if [ ! -f "${hostapd_conf}" ]; then
-        sudo touch "${hostapd_conf}.remove"
-    elif [ ! -f "${hostapd_conf}.orig" ] && [ ! -f "${hostapd_conf}.remove" ]; then
-        sudo cp "${hostapd_conf}" "${hostapd_conf}.orig"
-    fi
+    config_file_backup "${hostapd_conf}"
 
-    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/hostapd.conf.stretch-default2-Hotspot.sample "${hostapd_conf}"
+    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/autohotspot/dhcpcd/hostapd.conf "${hostapd_conf}"
+    sudo sed -i "s|%WIFI_INTERFACE%|${wifi_interface}|g" "${hostapd_conf}"
     sudo sed -i "s|%AUTOHOTSPOTssid%|${AUTOHOTSPOTssid}|g" "${hostapd_conf}"
     sudo sed -i "s|%AUTOHOTSPOTpass%|${AUTOHOTSPOTpass}|g" "${hostapd_conf}"
     sudo sed -i "s|%AUTOHOTSPOTcountryCode%|${AUTOHOTSPOTcountryCode}|g" "${hostapd_conf}"
@@ -88,29 +120,19 @@ if [ "${AUTOHOTSPOTconfig}" == "YES" ]; then
     sudo chmod 644 "${hostapd_conf}"
 
     # configure hostapd daemon
-    # create flag file or copy present conf to orig file
-    # to correctly handling future deactivation of autohotspot
-    if [ ! -f "${hostapd_deamon}" ]; then
-        sudo touch "${hostapd_deamon}.remove"
-    elif [ ! -f "${hostapd_deamon}.orig" ] && [ ! -f "${hostapd_deamon}.remove" ]; then
-        sudo cp "${hostapd_deamon}" "${hostapd_deamon}.orig"
-    fi
+    config_file_backup "${hostapd_deamon}"
 
-    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/hostapd.stretch-default2-Hotspot.sample "${hostapd_deamon}"
+    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/autohotspot/dhcpcd/hostapd "${hostapd_deamon}"
     sudo sed -i "s|%HOSTAPD_CONF%|${hostapd_conf}|g" "${hostapd_deamon}"
     sudo chown root:root "${hostapd_deamon}"
     sudo chmod 644 "${hostapd_deamon}"
 
     # configure dhcpcd conf
-    # create flag file or copy present conf to orig file
-    # to correctly handling future deactivation of autohotspot
+    config_file_backup "${dhcpcd_conf}"
     if [ ! -f "${dhcpcd_conf}" ]; then
-        sudo touch "${dhcpcd_conf}.remove"
         sudo touch "${dhcpcd_conf}"
         sudo chown root:netdev "${dhcpcd_conf}"
         sudo chmod 664 "${dhcpcd_conf}"
-    elif [ ! -f "${dhcpcd_conf}.orig" ] && [ ! -f "${dhcpcd_conf}.remove" ]; then
-        sudo cp "${dhcpcd_conf}" "${dhcpcd_conf}.orig"
     fi
 
     if [[ ! $(grep -w "${dhcpcd_conf_nohook_wpa_supplicant}" ${dhcpcd_conf}) ]]; then
@@ -118,64 +140,140 @@ if [ "${AUTOHOTSPOTconfig}" == "YES" ]; then
     fi
 
     # create service to trigger hotspot
-    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/autohotspot.sh.stretch-default2-Hotspot.sample "${autohotspot_script}"
+    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot "${autohotspot_script}"
+    sudo sed -i "s|%WIFI_INTERFACE%|${wifi_interface}|g" "${autohotspot_script}"
     sudo sed -i "s|%AUTOHOTSPOT_IP%|${AUTOHOTSPOTip}|g" "${autohotspot_script}"
+    sudo sed -i "s|%AUTOHOTSPOT_SERVICE_DAEMON%|${autohotspot_service_daemon}|g" "${autohotspot_script}"
     sudo chmod +x "${autohotspot_script}"
 
-    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/autohotspot.service.stretch-default2-Hotspot.sample "${autohotspot_service_path}"
+    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot-daemon.service "${autohotspot_service_daemon_path}"
+    sudo sed -i "s|%WIFI_INTERFACE%|${wifi_interface}|g" "${autohotspot_service_daemon_path}"
+    sudo chown root:root "${autohotspot_service_daemon_path}"
+    sudo chmod 644 "${autohotspot_service_daemon_path}"
+
+    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot.service "${autohotspot_service_path}"
     sudo sed -i "s|%AUTOHOTSPOT_SCRIPT%|${autohotspot_script}|g" "${autohotspot_service_path}"
     sudo chown root:root "${autohotspot_service_path}"
     sudo chmod 644 "${autohotspot_service_path}"
 
-    sudo systemctl enable "${autohotspot_service}"
+    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/autohotspot/dhcpcd/autohotspot.timer "${autohotspot_timer_path}"
+    sudo sed -i "s|%AUTOHOTSPOT_SERVICE%|${autohotspot_service}|g" "${autohotspot_timer_path}"
+    sudo chown root:root "${autohotspot_timer_path}"
+    sudo chmod 644 "${autohotspot_timer_path}"
 
-    # create crontab entry
-    crontab_user=$(crontab -l 2>/dev/null)
-    if [[ -z "${crontab_user}" || ! $(echo "${crontab_user}" | grep -w "${autohotspot_script}") ]]; then
-        (echo "${crontab_user}"; echo "*/5 * * * * sudo ${autohotspot_script} >/dev/null 2>&1") | crontab -
-    fi
+    sudo systemctl enable "${autohotspot_service_daemon}"
+    sudo systemctl disable "${autohotspot_service}"
+    sudo systemctl enable "${autohotspot_timer}"
+}
 
-else
+_uninstall_autohotspot_dhcpcd() {
     # clear autohotspot configurations made from past installation
 
+    # remove crontab entry and script from old version installations
+    crontab_user=$(crontab -l 2>/dev/null)
+    if [[ ! -z "${crontab_user}" && $(echo "${crontab_user}" | grep -w "${autohotspot_script}") ]]; then
+        echo "${crontab_user}" | sed "s|^.*\s${autohotspot_script}\s.*$||g" | crontab -
+    fi
+
     # stop services and clear services
     if systemctl list-unit-files "${autohotspot_service}" >/dev/null 2>&1 ; then
         sudo systemctl stop hostapd
         sudo systemctl stop dnsmasq
+        sudo systemctl stop "${autohotspot_timer}"
+        sudo systemctl disable "${autohotspot_timer}"
         sudo systemctl stop "${autohotspot_service}"
         sudo systemctl disable "${autohotspot_service}"
+        sudo systemctl disable "${autohotspot_service_daemon}"
+        sudo rm "${autohotspot_timer_path}"
         sudo rm "${autohotspot_service_path}"
+        sudo rm "${autohotspot_service_daemon_path}"
     fi
 
-    # remove crontab entry and script
-    crontab_user=$(crontab -l 2>/dev/null)
-    if [[ ! -z "${crontab_user}" && $(echo "${crontab_user}" | grep -w "${autohotspot_script}") ]]; then
-        echo "${crontab_user}" | sed "s|^.*\s${autohotspot_script}\s.*$||g" | crontab -
+    if [ -f "${autohotspot_script}" ]; then
+        sudo rm "${autohotspot_script}"
+    fi
+
+    # remove config files
+    config_file_revert "${dnsmasq_conf}"
+    config_file_revert "${hostapd_conf}"
+    config_file_revert "${hostapd_deamon}"
+    config_file_revert "${dhcpcd_conf}"
+    config_file_revert "${interfaces_conf_file}"
+}
+
+_install_autohotspot_NetworkManager() {
+    # required packages
+    call_with_args_from_file "${JUKEBOX_HOME_DIR}"/packages-autohotspot_NetworkManager.txt ${apt_get} install
+
+    # configure interface conf
+    config_file_backup "${interfaces_conf_file}"
+    sudo rm "${interfaces_conf_file}"
+    sudo touch "${interfaces_conf_file}"
+
+    # create service to trigger hotspot
+    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/autohotspot/NetworkManager/autohotspot "${autohotspot_script}"
+    sudo sed -i "s|%WIFI_INTERFACE%|${wifi_interface}|g" "${autohotspot_script}"
+    sudo sed -i "s|%AUTOHOTSPOT_PROFILE%|${autohotspot_profile}|g" "${autohotspot_script}"
+    sudo sed -i "s|%AUTOHOTSPOT_SSID%|${AUTOHOTSPOTssid}|g" "${autohotspot_script}"
+    sudo sed -i "s|%AUTOHOTSPOT_PASSWORD%|${AUTOHOTSPOTpass}|g" "${autohotspot_script}"
+    sudo sed -i "s|%AUTOHOTSPOT_IP%|${AUTOHOTSPOTip}|g" "${autohotspot_script}"
+    sudo sed -i "s|%IP_WITHOUT_LAST_SEGMENT%|${ip_without_last_segment}|g" "${autohotspot_script}"
+    sudo sed -i "s|%AUTOHOTSPOT_TIMER_NAME%|${autohotspot_timer}|g" "${autohotspot_script}"
+    sudo chmod +x "${autohotspot_script}"
+
+    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/autohotspot/NetworkManager/autohotspot.service "${autohotspot_service_path}"
+    sudo sed -i "s|%AUTOHOTSPOT_SCRIPT%|${autohotspot_script}|g" "${autohotspot_service_path}"
+    sudo chown root:root "${autohotspot_service_path}"
+    sudo chmod 644 "${autohotspot_service_path}"
+
+    sudo cp "${JUKEBOX_HOME_DIR}"/misc/sampleconfigs/autohotspot/NetworkManager/autohotspot.timer "${autohotspot_timer_path}"
+    sudo sed -i "s|%AUTOHOTSPOT_SERVICE%|${autohotspot_service}|g" "${autohotspot_timer_path}"
+    sudo chown root:root "${autohotspot_timer_path}"
+    sudo chmod 644 "${autohotspot_timer_path}"
+
+
+    sudo systemctl unmask "${autohotspot_service}"
+    sudo systemctl unmask "${autohotspot_timer}"
+    sudo systemctl disable "${autohotspot_service}"
+    sudo systemctl enable "${autohotspot_timer}"
+}
+
+_uninstall_autohotspot_NetworkManager() {
+    # clear autohotspot configurations made from past installation
+
+    # stop services and clear services
+    if systemctl list-unit-files "${autohotspot_service}" >/dev/null 2>&1 ; then
+        sudo systemctl stop "${autohotspot_timer}"
+        sudo systemctl disable "${autohotspot_timer}"
+        sudo systemctl stop "${autohotspot_service}"
+        sudo systemctl disable "${autohotspot_service}"
+        sudo rm "${autohotspot_service_path}"
+        sudo rm "${autohotspot_timer_path}"
     fi
 
     if [ -f "${autohotspot_script}" ]; then
         sudo rm "${autohotspot_script}"
     fi
 
+    sudo rm -f "${networkManager_connections_path}/${autohotspot_profile}*"
+
     # remove config files
-    if [ -f "${dnsmasq_conf}.remove" ]; then
-        sudo rm "${dnsmasq_conf}.remove" "${dnsmasq_conf}"
-    elif [ -f "${dnsmasq_conf}.orig" ]; then
-        sudo mv "${dnsmasq_conf}.orig" "${dnsmasq_conf}"
+    config_file_revert "${interfaces_conf_file}"
+}
+
+
+if [ "${AUTOHOTSPOTconfig}" == "YES" ]; then
+    if [[ $(is_dhcpcd_enabled) == true ]]; then
+        _install_autohotspot_dhcpcd
     fi
-    if [ -f "${hostapd_conf}.remove" ]; then
-        sudo rm "${hostapd_conf}.remove" "${hostapd_conf}"
-    elif [ -f "${hostapd_conf}.orig" ]; then
-        sudo mv "${hostapd_conf}.orig" "${hostapd_conf}"
+    if [[ $(is_NetworkManager_enabled) == true ]]; then
+         _install_autohotspot_NetworkManager
     fi
-    if [ -f "${hostapd_deamon}.remove" ]; then
-        sudo rm "${hostapd_deamon}.remove" "${hostapd_deamon}"
-    elif [ -f "${hostapd_deamon}.orig" ]; then
-        sudo mv "${hostapd_deamon}.orig" "${hostapd_deamon}"
+else
+    if [[ $(is_dhcpcd_enabled) == true ]]; then
+        _uninstall_autohotspot_dhcpcd
     fi
-    if [ -f "${dhcpcd_conf}.remove" ]; then
-        sudo rm "${dhcpcd_conf}.remove" "${dhcpcd_conf}"
-    elif [ -f "${dhcpcd_conf}.orig" ]; then
-        sudo mv "${dhcpcd_conf}.orig" "${dhcpcd_conf}"
+    if [[ $(is_NetworkManager_enabled) == true ]]; then
+        _uninstall_autohotspot_NetworkManager
     fi
 fi
diff --git a/scripts/installscripts/install-jukebox.sh b/scripts/installscripts/install-jukebox.sh
index 648755693..af74c43be 100644
--- a/scripts/installscripts/install-jukebox.sh
+++ b/scripts/installscripts/install-jukebox.sh
@@ -40,6 +40,8 @@ JUKEBOX_BACKUP_DIR="${HOME_DIR}/BACKUP"
 OS_CODENAME="$( . /etc/os-release; printf '%s\n' "$VERSION_CODENAME"; )"
 printf "Used Raspberry Pi OS: ${OS_CODENAME}\n"
 
+WIFI_INTERFACE="wlan0"
+
 INTERACTIVE=true
 
 usage() {
@@ -181,18 +183,10 @@ config_wifi() {
 # to assign to your Phoniebox.
 # (Note: can be done manually later, if you are unsure.)
 "
-read -rp "Do you want to configure your WiFi? [Y/n] " response
+read -rp "Do you want to configure your WiFi? [y/N] " response
 echo ""
 case "$response" in
-    [nN][oO]|[nN])
-        WIFIconfig=NO
-        echo "You want to configure WiFi later."
-        # append variables to config file
-        echo "WIFIconfig=$WIFIconfig" >> "${HOME_DIR}/PhonieboxInstall.conf"
-        # make a fallback for WiFi Country Code, because we need that even without WiFi config
-        echo "WIFIcountryCode=DE" >> "${HOME_DIR}/PhonieboxInstall.conf"
-        ;;
-    *)
+    [yY][eE][sS]|[yY])
         WIFIconfig=YES
         #Ask for SSID
         read -rp "* Type SSID name: " WIFIssid
@@ -231,6 +225,14 @@ case "$response" in
                 ;;
         esac
         ;;
+    *)
+        WIFIconfig=NO
+        echo "You want to configure WiFi later."
+        # append variables to config file
+        echo "WIFIconfig=$WIFIconfig" >> "${HOME_DIR}/PhonieboxInstall.conf"
+        # make a fallback for WiFi Country Code, because we need that even without WiFi config
+        echo "WIFIcountryCode=DE" >> "${HOME_DIR}/PhonieboxInstall.conf"
+        ;;
 esac
 read -rp "Hit ENTER to proceed to the next step." INPUT
 }
@@ -924,7 +926,7 @@ install_main() {
     . "${HOME_DIR}/PhonieboxInstall.conf"
 
     # power management of wifi: switch off to avoid disconnecting
-    sudo iwconfig wlan0 power off
+    sudo iwconfig "$WIFI_INTERFACE" power off
 
     # in the docker test env fiddling with resolv.conf causes issues, see https://stackoverflow.com/a/60576223
     if [ "$DOCKER_RUNNING" != "true" ]; then
@@ -1177,6 +1179,7 @@ install_main() {
 
 wifi_settings() {
     local jukebox_dir="$1"
+    local wifiExtDNS="8.8.8.8"
 
     ###############################
     # WiFi settings (SSID password)
@@ -1188,39 +1191,46 @@ wifi_settings() {
     # $WIFIip
     # $WIFIipRouter
     if [ "${WIFIconfig}" == "YES" ]; then
+        echo "Setting up wifi..."
+
+        if [[ $(is_dhcpcd_enabled) == true ]]; then
+            echo "... for dhcpcd"
+
+            local wpa_supplicant_conf="/etc/wpa_supplicant/wpa_supplicant.conf"
+            # -rw-rw-r-- 1 root netdev 137 Jul 16 08:53 /etc/wpa_supplicant/wpa_supplicant.conf
+            sudo cp "${jukebox_dir}"/misc/sampleconfigs/wpa_supplicant.conf.sample "${wpa_supplicant_conf}"
+            sudo sed -i 's/%WIFIcountryCode%/'"$WIFIcountryCode"'/' "${wpa_supplicant_conf}"
+            sudo chown root:netdev "${wpa_supplicant_conf}"
+            sudo chmod 664 "${wpa_supplicant_conf}"
+
+            # add network with high priority
+            add_wireless_network "$WIFI_INTERFACE" "$WIFIssid" "$WIFIpass" 99
+
+            # DHCP configuration settings
+            local dhcpcd_conf="/etc/dhcpcd.conf"
+            #-rw-rw-r-- 1 root netdev 0 Apr 17 11:25 /etc/dhcpcd.conf
+            sudo cp "${jukebox_dir}"/misc/sampleconfigs/dhcpcd.conf.buster-default-noHotspot.sample "${dhcpcd_conf}"
+            # Change IP for router and Phoniebox
+            sudo sed -i 's/%WIFIinterface%/'"$WIFI_INTERFACE"'/' "${dhcpcd_conf}"
+            sudo sed -i 's/%WIFIip%/'"$WIFIip"'/' "${dhcpcd_conf}"
+            sudo sed -i 's/%WIFIipRouter%/'"$WIFIipRouter"'/' "${dhcpcd_conf}"
+            sudo sed -i 's/%WIFIipExtDNS%/'"$wifiExtDNS"'/' "${dhcpcd_conf}"
+            sudo sed -i 's/%WIFIcountryCode%/'"$WIFIcountryCode"'/' "${dhcpcd_conf}"
+            # Change user:group and access mod
+            sudo chown root:netdev "${dhcpcd_conf}"
+            sudo chmod 664 "${dhcpcd_conf}"
+        fi
 
-        # DHCP configuration settings
-        local dhcpcd_conf="/etc/dhcpcd.conf"
-        echo "Setting ${dhcpcd_conf}..."
-        #-rw-rw-r-- 1 root netdev 0 Apr 17 11:25 /etc/dhcpcd.conf
-        sudo cp "${jukebox_dir}"/misc/sampleconfigs/dhcpcd.conf.buster-default-noHotspot.sample "${dhcpcd_conf}"
-        # Change IP for router and Phoniebox
-        sudo sed -i 's/%WIFIip%/'"$WIFIip"'/' "${dhcpcd_conf}"
-        sudo sed -i 's/%WIFIipRouter%/'"$WIFIipRouter"'/' "${dhcpcd_conf}"
-        sudo sed -i 's/%WIFIcountryCode%/'"$WIFIcountryCode"'/' "${dhcpcd_conf}"
-        # Change user:group and access mod
-        sudo chown root:netdev "${dhcpcd_conf}"
-        sudo chmod 664 "${dhcpcd_conf}"
-
-        # WiFi SSID & Password
-        local wpa_supplicant_conf="/etc/wpa_supplicant/wpa_supplicant.conf"
-        echo "Setting ${wpa_supplicant_conf}..."
-        # -rw-rw-r-- 1 root netdev 137 Jul 16 08:53 /etc/wpa_supplicant/wpa_supplicant.conf
-        sudo cp "${jukebox_dir}"/misc/sampleconfigs/wpa_supplicant.conf.buster-default.sample "${wpa_supplicant_conf}"
-        sudo sed -i 's/%WIFIssid%/'"$WIFIssid"'/' "${wpa_supplicant_conf}"
-        sudo sed -i 's/%WIFIpass%/'"$WIFIpass"'/' "${wpa_supplicant_conf}"
-        sudo sed -i 's/%WIFIcountryCode%/'"$WIFIcountryCode"'/' "${wpa_supplicant_conf}"
-        sudo chown root:netdev "${wpa_supplicant_conf}"
-        sudo chmod 664 "${wpa_supplicant_conf}"
-    fi
-
-    # start DHCP
-    echo "Starting dhcpcd service..."
-    sudo service dhcpcd start
-    sudo systemctl enable dhcpcd
+        if [[ $(is_NetworkManager_enabled) == true ]]; then
+            echo "... for NetworkManager"
+            # add network with high priority
+            add_wireless_network "$WIFI_INTERFACE" "$WIFIssid" "$WIFIpass" 99
 
-# / WiFi settings (SSID password)
-###############################
+            sudo nmcli connection modify "$WIFIssid" ipv4.method manual ipv4.address "$WIFIip"/24 ipv4.gateway "$WIFIipRouter" ipv4.dns "$WIFIipRouter $wifiExtDNS"
+        fi
+    fi
+    # / WiFi settings (SSID password)
+    ###############################
 }
 
 existing_assets() {
@@ -1362,6 +1372,7 @@ autohotspot() {
     if [ "${AUTOHOTSPOTconfig}" == "YES" ]; then
         local setup_script="${jukebox_dir}/scripts/helperscripts/setup_autohotspot.sh"
         sudo chmod +x "${setup_script}"
+        "${setup_script}" "${jukebox_dir}" "NO" # Uninstall present old versions first
         "${setup_script}" "${jukebox_dir}" "${AUTOHOTSPOTconfig}" "${AUTOHOTSPOTssid}" "${AUTOHOTSPOTcountryCode}" "${AUTOHOTSPOTpass}" "${AUTOHOTSPOTip}"
     fi
 }
@@ -1467,6 +1478,9 @@ main() {
         check_config_file
     fi
     install_main "${JUKEBOX_HOME_DIR}"
+
+    source "${JUKEBOX_HOME_DIR}"/scripts/helperscripts/inc.networkHelper.sh
+
     wifi_settings "${JUKEBOX_HOME_DIR}"
     autohotspot "${JUKEBOX_HOME_DIR}"
     existing_assets "${JUKEBOX_HOME_DIR}" "${JUKEBOX_BACKUP_DIR}"
diff --git a/scripts/installscripts/tests/run_installation_autohotspot_NetworkManager.sh b/scripts/installscripts/tests/run_installation_autohotspot_NetworkManager.sh
new file mode 100644
index 000000000..049a6aded
--- /dev/null
+++ b/scripts/installscripts/tests/run_installation_autohotspot_NetworkManager.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+# Install Phoniebox and test it
+# Used e.g. for tests on Docker
+
+# Objective: Test installation with script using a simple configuration
+
+# Print current path
+echo $PWD
+
+# Preparations
+# No interactive frontend
+export DEBIAN_FRONTEND=noninteractive
+echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
+
+# Run installation (in interactive mode)
+# y confirm interactive mode
+# n configure wifi (extra ENTER)
+# y configure autohotspot
+# y use autohotspot default config (extra ENTER)
+# y use default audio iface (extra ENTER)
+# n spotify (extra ENTER)
+# n configure mpd (extra ENTER)
+# y audio default location (extra ENTER)
+# y config gpio (extra ENTER)
+# y start installation
+# n RFID registration
+# n reboot
+export CI_TEST_DHCPCD="false"
+export CI_TEST_NETWORKMANAGER="true"
+./../install-jukebox.sh <<< "y
+n
+
+y
+y
+
+y
+
+n
+
+n
+
+y
+
+y
+
+y
+n
+n
+"
+INSTALLATION_EXITCODE=$?
+
+# Test installation
+./test_installation.sh $INSTALLATION_EXITCODE
diff --git a/scripts/installscripts/tests/run_installation_autohotspot_dhcpcd.sh b/scripts/installscripts/tests/run_installation_autohotspot_dhcpcd.sh
new file mode 100644
index 000000000..f1a1b880d
--- /dev/null
+++ b/scripts/installscripts/tests/run_installation_autohotspot_dhcpcd.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+# Install Phoniebox and test it
+# Used e.g. for tests on Docker
+
+# Objective: Test installation with script using a simple configuration
+
+# Print current path
+echo $PWD
+
+# Preparations
+# No interactive frontend
+export DEBIAN_FRONTEND=noninteractive
+echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
+
+# Run installation (in interactive mode)
+# y confirm interactive mode
+# n configure wifi (extra ENTER)
+# y configure autohotspot
+# y use autohotspot default config (extra ENTER)
+# y use default audio iface (extra ENTER)
+# n spotify (extra ENTER)
+# n configure mpd (extra ENTER)
+# y audio default location (extra ENTER)
+# y config gpio (extra ENTER)
+# y start installation
+# n RFID registration
+# n reboot
+export CI_TEST_DHCPCD="true"
+export CI_TEST_NETWORKMANAGER="false"
+./../install-jukebox.sh <<< "y
+n
+
+y
+y
+
+y
+
+n
+
+n
+
+y
+
+y
+
+y
+n
+n
+"
+INSTALLATION_EXITCODE=$?
+
+# Test installation
+./test_installation.sh $INSTALLATION_EXITCODE
diff --git a/scripts/installscripts/tests/run_installation_tests.sh b/scripts/installscripts/tests/run_installation_classic.sh
similarity index 56%
rename from scripts/installscripts/tests/run_installation_tests.sh
rename to scripts/installscripts/tests/run_installation_classic.sh
index 83462a63f..1875cef55 100644
--- a/scripts/installscripts/tests/run_installation_tests.sh
+++ b/scripts/installscripts/tests/run_installation_classic.sh
@@ -15,18 +15,37 @@ echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selecti
 
 # Run installation (in interactive mode)
 # y confirm interactive
-# n dont configure wifi
-# y configure autohotspot
-# y use autohotspot default config
-# y use default audio iface
-# n no spotify
-# y configure mpd
-# y audio default location
-# y config gpio
-# n no RFID registration
-# n No reboot
-
-./../install-jukebox.sh <<< $'y\nn\n\ny\ny\n\ny\n\nn\n\ny\n\ny\n\ny\n\ny\nn\nn\n'
+# n configure wifi (extra ENTER)
+# n configure autohotspot (extra ENTER)
+# - use autohotspot default config
+# y use default audio iface (extra ENTER)
+# n spotify (extra ENTER)
+# y configure mpd (extra ENTER)
+# y audio default location (extra ENTER)
+# y config gpio (extra ENTER)
+# y start installation
+# n RFID registration
+# n reboot
+
+./../install-jukebox.sh <<< "y
+n
+
+n
+
+y
+
+n
+
+y
+
+y
+
+y
+
+y
+n
+n
+"
 INSTALLATION_EXITCODE=$?
 
 # Test installation
diff --git a/scripts/installscripts/tests/run_installation_staticip_dhcpcd.sh b/scripts/installscripts/tests/run_installation_staticip_dhcpcd.sh
new file mode 100644
index 000000000..77fa4fcf5
--- /dev/null
+++ b/scripts/installscripts/tests/run_installation_staticip_dhcpcd.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+# Install Phoniebox and test it
+# Used e.g. for tests on Docker
+
+# Objective: Test installation with script using a simple configuration
+
+# Print current path
+echo $PWD
+
+# Preparations
+# No interactive frontend
+export DEBIAN_FRONTEND=noninteractive
+echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
+
+# Run installation (in interactive mode)
+# y confirm interactive mode
+# y configure wifi
+# y use wifi data (extra ENTER)
+# n configure autohotspot
+# - use autohotspot default config (extra ENTER)
+# y use default audio iface (extra ENTER)
+# n spotify (extra ENTER)
+# n configure mpd (extra ENTER)
+# y audio default location (extra ENTER)
+# y config gpio (extra ENTER)
+# y start installation
+# n RFID registration
+# n reboot
+export CI_TEST_DHCPCD="true"
+export CI_TEST_NETWORKMANAGER="false"
+./../install-jukebox.sh <<< "y
+y
+TestWifi
+DE
+TestWifiPW
+192.168.100.2
+192.168.100.1
+y
+
+n
+
+y
+
+n
+
+n
+
+y
+
+y
+
+y
+n
+n
+"
+INSTALLATION_EXITCODE=$?
+
+# Test installation
+./test_installation.sh $INSTALLATION_EXITCODE
diff --git a/scripts/installscripts/tests/run_installation_tests2.sh b/scripts/installscripts/tests/run_installation_tests2.sh
index e6d2a3189..04edaf4b7 100644
--- a/scripts/installscripts/tests/run_installation_tests2.sh
+++ b/scripts/installscripts/tests/run_installation_tests2.sh
@@ -15,20 +15,42 @@ echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selecti
 
 # Run installation (in interactive mode)
 # y confirm interactive
-# n dont configure wifi
-# n dont configure autohotspot
-# y use default audio iface
-# n no spotify
-# y configure mpd
-# y audio default location
-# y use gpio
+# n configure wifi (extra ENTER)
+# n configure autohotspot (extra ENTER)
+# y use default audio iface (extra ENTER)
+# n spotify (extra ENTER)
+# y configure mpd (extra ENTER)
+# y audio default location (extra ENTER)
+# y use gpio (extra ENTER)
+# y start installation
 # y RFID registration
 # 2 use RC522 reader
 # y, reader is connected
 # y, use legacy readermode
-# n No reboot
+# n reboot
 
-./../install-jukebox.sh <<< $'y\nn\n\nn\n\ny\n\nn\n\ny\n\ny\n\ny\n\ny\ny\n2\ny\ny\nn\n'
+./../install-jukebox.sh <<< "y
+n
+
+n
+
+y
+
+n
+
+y
+
+y
+
+y
+
+y
+y
+2
+y
+y
+n
+"
 INSTALLATION_EXITCODE=$?
 
 # Test installation
diff --git a/scripts/installscripts/tests/run_installation_tests3.sh b/scripts/installscripts/tests/run_installation_tests3.sh
index b61690662..ede4f33f7 100644
--- a/scripts/installscripts/tests/run_installation_tests3.sh
+++ b/scripts/installscripts/tests/run_installation_tests3.sh
@@ -15,17 +15,40 @@ echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selecti
 
 # Run installation (in interactive mode)
 # y confirm interactive
-# n dont configure wifi
-# n dont configure autohotspot
-# y use default audio iface
-# y spotify with myuser, mypassword, myclient_id, myclient_secret
-# y configure mpd
-# y audio default location
-# y config gpio
-# n no RFID registration
-# n No reboot
-
-./../install-jukebox.sh <<< $'y\nn\n\nn\n\ny\n\ny\nmyuser\nmypassword\nmyclient_id\nmyclient_secret\n\ny\n\ny\n\ny\n\ny\nn\nn\n'
+# n configure wifi (extra ENTER)
+# n configure autohotspot (extra ENTER)
+# y use default audio iface (extra ENTER)
+# y spotify with myuser, mypassword, myclient_id, myclient_secret (extra ENTER)
+# y configure mpd (extra ENTER)
+# y audio default location (extra ENTER)
+# y config gpio (extra ENTER)
+# y start installation
+# n RFID registration
+# n reboot
+
+./../install-jukebox.sh <<< "y
+n
+
+n
+
+y
+
+y
+myuser
+mypassword
+myclient_id
+myclient_secret
+
+y
+
+y
+
+y
+
+y
+n
+n
+"
 INSTALLATION_EXITCODE=$?
 
 # Test installation
diff --git a/scripts/installscripts/tests/test_installation.sh b/scripts/installscripts/tests/test_installation.sh
index ee2d9aaf6..6353aab3c 100755
--- a/scripts/installscripts/tests/test_installation.sh
+++ b/scripts/installscripts/tests/test_installation.sh
@@ -16,6 +16,7 @@ tests=0
 failed_tests=0
 
 # Tool functions
+source "${JUKEBOX_HOME_DIR}"/scripts/helperscripts/inc.networkHelper.sh
 
 check_chmod_chown() {
     local mod_expected=$1
@@ -35,6 +36,16 @@ check_chmod_chown() {
     done
 }
 
+check_file_exists() {
+    local file="$1"
+
+    if [[ ! -f "${file}" ]]; then
+        echo "  ERROR: '${file}' does not exists or is not a file!"
+        ((failed_tests++))
+    fi
+    ((tests++))
+}
+
 check_file_contains_string() {
     local string="$1"
     local file="$2"
@@ -159,66 +170,129 @@ verify_conf_file() {
 }
 
 verify_wifi_settings() {
-    local dhcpcd_conf="/etc/dhcpcd.conf"
-    local wpa_supplicant_conf="/etc/wpa_supplicant/wpa_supplicant.conf"
-    printf "\nTESTING WiFi settings...\n"
-
-    # check conf files
-    check_file_contains_string "static ip_address=${WIFIip}/24" "${dhcpcd_conf}"
-    check_file_contains_string "static routers=${WIFIipRouter}" "${dhcpcd_conf}"
-    check_file_contains_string "static domain_name_servers=8.8.8.8 ${WIFIipRouter}" "${dhcpcd_conf}"
-
-    check_file_contains_string "country=${WIFIcountryCode}" "${wpa_supplicant_conf}"
-    check_file_contains_string "ssid=\"${WIFIssid}\"" "${wpa_supplicant_conf}"
-    check_file_contains_string "psk=\"${WIFIpass}\"" "${wpa_supplicant_conf}"
-
-    # check owner and permissions
-    check_chmod_chown 664 root netdev "/etc" "dhcpcd.conf"
-    check_chmod_chown 664 root netdev "/etc/wpa_supplicant" "wpa_supplicant.conf"
+    if [[ "$WIFIconfig" == "YES" ]]; then
+        if [[ $(is_dhcpcd_enabled) == true ]]; then
+            printf "\nTESTING WiFi settings (dhcpcd)...\n"
+            local dhcpcd_conf="/etc/dhcpcd.conf"
+            local wpa_supplicant_conf="/etc/wpa_supplicant/wpa_supplicant.conf"
+
+            # check conf files
+            check_file_contains_string "static ip_address=${WIFIip}/24" "${dhcpcd_conf}"
+            check_file_contains_string "static routers=${WIFIipRouter}" "${dhcpcd_conf}"
+            check_file_contains_string "static domain_name_servers=${WIFIipRouter} 8.8.8.8" "${dhcpcd_conf}"
+
+            check_file_contains_string "country=${WIFIcountryCode}" "${wpa_supplicant_conf}"
+            check_file_contains_string "ssid=\"${WIFIssid}\"" "${wpa_supplicant_conf}"
+            local _pass=$(_get_passphrase_for_config "$WIFIssid" "$WIFIpass")
+            check_file_contains_string "psk=${_pass}" "${wpa_supplicant_conf}"
+            check_file_contains_string "priority=99" "${wpa_supplicant_conf}"
+
+            # check owner and permissions
+            check_chmod_chown 664 root netdev "/etc" "dhcpcd.conf"
+            check_chmod_chown 664 root netdev "/etc/wpa_supplicant" "wpa_supplicant.conf"
+        fi
 
-    # check that dhcpcd service is enabled and started
-    check_service_state dhcpcd active
-    check_service_enablement dhcpcd enabled
+        if [[ $(is_NetworkManager_enabled) == true ]]; then
+            printf "\nTESTING WiFi settings (NetworkManager)...\n"
+            local active_profile_path="/etc/NetworkManager/system-connections/${WIFIssid}.nmconnection"
+
+            check_file_exists "${active_profile_path}"
+            check_file_contains_string "ssid=${WIFIssid}" "${active_profile_path}"
+            local _pass=$(_get_passphrase_for_config "$WIFIssid" "$WIFIpass")
+            check_file_contains_string "psk=${_pass}" "${active_profile_path}"
+            check_file_contains_string "address1=${WIFIip}" "${active_profile_path}"
+            check_file_contains_string "gateway=${WIFIipRouter}" "${active_profile_path}"
+            check_file_contains_string "dns=${WIFIipRouter}" "${active_profile_path}"
+            check_file_contains_string "autoconnect-priority=99" "${active_profile_path}"
+        fi
+    fi
 }
 
 verify_autohotspot_settings() {
     if [[ "$AUTOHOTSPOTconfig" == "YES" ]]; then
         printf "\nTESTING autohotspot settings...\n\n"
 
-        local autohotspot_service="autohotspot.service"
-        local autohotspot_script="/usr/bin/autohotspot"
+        local systemd_dir="/etc/systemd/system"
+        local interfaces_conf_file="/etc/network/interfaces"
 
-        local dnsmasq_conf=/etc/dnsmasq.conf
-        local hostapd_conf=/etc/hostapd/hostapd.conf
-        local hostapd_deamon=/etc/default/hostapd
-        local dhcpcd_conf=/etc/dhcpcd.conf
+        local autohotspot_script="/usr/bin/autohotspot"
+        local autohotspot_service_daemon="autohotspot-daemon.service"
+        local autohotspot_service_daemon_path="${systemd_dir}/${autohotspot_service_daemon}"
+        local autohotspot_service="autohotspot.service"
+        local autohotspot_service_path="${systemd_dir}/${autohotspot_service}"
+        local autohotspot_timer="autohotspot.timer"
+        local autohotspot_timer_path="${systemd_dir}/${autohotspot_timer}"
 
-        check_file_contains_string "${AUTOHOTSPOTip}" "${autohotspot_script}"
+        local autohotspot_wifi_interface=wlan0
         local ip_without_last_segment=$(echo $AUTOHOTSPOTip | cut -d'.' -f1-3)
-        check_file_contains_string "dhcp-range=${ip_without_last_segment}.100,${ip_without_last_segment}.200,12h" "${dnsmasq_conf}"
-        check_file_contains_string "ssid=${AUTOHOTSPOTssid}" "${hostapd_conf}"
-        check_file_contains_string "wpa_passphrase=${AUTOHOTSPOTpass}" "${hostapd_conf}"
-        check_file_contains_string "country_code=${AUTOHOTSPOTcountryCode}" "${hostapd_conf}"
-        check_file_contains_string "DAEMON_CONF=\"${hostapd_conf}\"" "${hostapd_deamon}"
-        check_file_contains_string "nohook wpa_supplicant" "${dhcpcd_conf}"
-        check_file_contains_string "ExecStart=${AUTOHOTSPOT_SCRIPT}" "/etc/systemd/system/${autohotspot_service}"
-
-        local crontab_user=$(crontab -l 2>/dev/null)
-        if [[ ! $(echo "${crontab_user}" | grep -w "${autohotspot_script}") ]]; then
-            echo "  ERROR: crontab for user not installed"
-            ((failed_tests++))
+        local autohotspot_profile="Phoniebox_Hotspot"
+
+        if [[ $(is_dhcpcd_enabled) == true ]]; then
+            local dnsmasq_conf=/etc/dnsmasq.conf
+            local hostapd_conf=/etc/hostapd/hostapd.conf
+            local hostapd_deamon=/etc/default/hostapd
+            local dhcpcd_conf=/etc/dhcpcd.conf
+
+            check_file_exists "${interfaces_conf_file}"
+
+            check_file_contains_string "interface=${autohotspot_wifi_interface}" "${dnsmasq_conf}"
+            check_file_contains_string "dhcp-range=${ip_without_last_segment}.100,${ip_without_last_segment}.200,12h" "${dnsmasq_conf}"
+            check_file_contains_string "interface=${autohotspot_wifi_interface}" "${hostapd_conf}"
+            check_file_contains_string "ssid=${AUTOHOTSPOTssid}" "${hostapd_conf}"
+            check_file_contains_string "wpa_passphrase=${AUTOHOTSPOTpass}" "${hostapd_conf}"
+            check_file_contains_string "country_code=${AUTOHOTSPOTcountryCode}" "${hostapd_conf}"
+            check_file_contains_string "DAEMON_CONF=\"${hostapd_conf}\"" "${hostapd_deamon}"
+            check_file_contains_string "nohook wpa_supplicant" "${dhcpcd_conf}"
+
+            check_file_exists "${autohotspot_script}"
+            check_file_contains_string "wifidev=\"${autohotspot_wifi_interface}\"" "${autohotspot_script}"
+            check_file_contains_string "hotspot_ip=${AUTOHOTSPOTip}" "${autohotspot_script}"
+            check_file_contains_string "daemon_service=\"${autohotspot_service_daemon}\"" "${autohotspot_script}"
+
+            check_file_exists "${autohotspot_service_daemon_path}"
+            check_file_contains_string "\-i \"${autohotspot_wifi_interface}\"" "${autohotspot_service_daemon_path}"
+
+            check_file_exists "${autohotspot_service_path}"
+            check_file_contains_string "ExecStart=${autohotspot_script}" "${autohotspot_service_path}"
+
+            check_file_exists "${autohotspot_timer_path}"
+            check_file_contains_string "Unit=${autohotspot_service}" "${autohotspot_timer_path}"
+
+            # check owner and permissions
+            check_chmod_chown 644 root root "/etc" "dnsmasq.conf hostapd/hostapd.conf default/hostapd"
+            check_chmod_chown 664 root netdev "/etc" "dhcpcd.conf"
+            check_chmod_chown 644 root root "${systemd_dir}" "${autohotspot_service_daemon} ${autohotspot_service} ${autohotspot_timer}"
+
+            # check the services state
+            check_service_enablement "${autohotspot_service_daemon}" enabled
+            check_service_enablement "${autohotspot_service}" disabled
+            check_service_enablement "${autohotspot_timer}" enabled
+            check_service_enablement hostapd disabled
+            check_service_enablement dnsmasq disabled
         fi
-        ((tests++))
 
-        # check owner and permissions
-        check_chmod_chown 644 root root "/etc" "dnsmasq.conf hostapd/hostapd.conf default/hostapd"
-        check_chmod_chown 664 root netdev "/etc" "dhcpcd.conf"
-        check_chmod_chown 644 root root "/etc/systemd/system" "${autohotspot_service}"
+        if [[ $(is_NetworkManager_enabled) == true ]]; then
+            check_file_exists "${interfaces_conf_file}"
+
+            check_file_exists "${autohotspot_script}"
+            check_file_contains_string "wdev0='${autohotspot_wifi_interface}'" "${autohotspot_script}"
+            check_file_contains_string "ap_profile_name='${autohotspot_profile}'" "${autohotspot_script}"
+            check_file_contains_string "ap_ssid='${AUTOHOTSPOTssid}'" "${autohotspot_script}"
+            check_file_contains_string "ap_pw='${AUTOHOTSPOTpass}'" "${autohotspot_script}"
+            check_file_contains_string "ap_ip='${AUTOHOTSPOTip}" "${autohotspot_script}" #intentional "open end"
+            check_file_contains_string "ap_gate='${ip_without_last_segment}" "${autohotspot_script}" #intentional "open end"
+            check_file_contains_string "timer_service_name='${autohotspot_timer}'" "${autohotspot_script}"
+
+            check_file_exists "${autohotspot_service_path}"
+            check_file_contains_string "ExecStart=${autohotspot_script}" "${autohotspot_service_path}"
 
-        # check that the services are activ
-        check_service_enablement "${autohotspot_service}" enabled
-        check_service_enablement hostapd disabled
-        check_service_enablement dnsmasq disabled
+            check_file_exists "${autohotspot_timer_path}"
+            check_file_contains_string "Unit=${autohotspot_service}" "${autohotspot_timer_path}"
+
+            # check the services state
+            check_service_enablement "${autohotspot_service}" disabled
+            check_service_enablement "${autohotspot_timer}" enabled
+        fi
     fi
 }
 
@@ -239,7 +313,8 @@ verify_apt_packages() {
     local packages=$(call_with_args_from_file "${jukebox_dir}"/packages.txt echo)
     local packages_raspberrypi=$(call_with_args_from_file "${jukebox_dir}"/packages-raspberrypi.txt echo)
     local packages_spotify=$(call_with_args_from_file "${jukebox_dir}"/packages-spotify.txt echo)
-    local packages_autohotspot=$(call_with_args_from_file "${jukebox_dir}"/packages-autohotspot.txt echo)
+    local packages_autohotspot_dhcpcd=$(call_with_args_from_file "${jukebox_dir}"/packages-autohotspot_dhcpcd.txt echo)
+    local packages_autohotspot_NetworkManager=$(call_with_args_from_file "${jukebox_dir}"/packages-autohotspot_NetworkManager.txt echo)
 
     printf "\nTESTING installed packages...\n\n"
 
@@ -249,7 +324,12 @@ verify_apt_packages() {
     fi
 
     if [[ "$AUTOHOTSPOTconfig" == "YES" ]]; then
-        packages="${packages} ${packages_autohotspot}"
+        if [[ $(is_dhcpcd_enabled) == true ]]; then
+            packages="${packages} ${packages_autohotspot_dhcpcd}"
+        fi
+        if [[ $(is_NetworkManager_enabled) == true ]]; then
+            packages="${packages} ${packages_autohotspot_NetworkManager}"
+        fi
     fi
 
     # check for raspberry pi packages only on raspberry pi's but not on test docker containers running on x86_64 machines
@@ -367,18 +447,20 @@ verify_spotify_config() {
 }
 
 verify_mpd_config() {
-    local mpd_conf="/etc/mpd.conf"
+    if [[ "$MPDconfig" == "YES" ]]; then
+        local mpd_conf="/etc/mpd.conf"
 
-    printf "\nTESTING mpd config...\n\n"
+        printf "\nTESTING mpd config...\n\n"
 
-    check_file_contains_string "^[[:blank:]]\+mixer_control[[:blank:]]\+\"${AUDIOiFace}\"" "${mpd_conf}"
-    check_file_contains_string "^music_directory[[:blank:]]\+\"${DIRaudioFolders}\"" "${mpd_conf}"
+        check_file_contains_string "^[[:blank:]]\+mixer_control[[:blank:]]\+\"${AUDIOiFace}\"" "${mpd_conf}"
+        check_file_contains_string "^music_directory[[:blank:]]\+\"${DIRaudioFolders}\"" "${mpd_conf}"
 
-    check_chmod_chown 640 mpd audio "/etc" "mpd.conf"
+        check_chmod_chown 640 mpd audio "/etc" "mpd.conf"
 
-    # check that mpd service is enabled, when Spotify support is not installed
-    if [[ "${SPOTinstall}" == "NO" ]]; then
-        check_service_enablement mpd enabled
+        # check that mpd service is enabled, when Spotify support is not installed
+        if [[ "${SPOTinstall}" == "NO" ]]; then
+            check_service_enablement mpd enabled
+        fi
     fi
 }
 
@@ -405,11 +487,9 @@ main() {
     printf "\nTesting installation:\n"
     verify_installation_exitcode
     verify_conf_file
-    if [[ "$WIFIconfig" == "YES" ]]; then
-        verify_wifi_settings
-    fi
     verify_apt_packages "${JUKEBOX_HOME_DIR}"
     verify_pip_packages "${JUKEBOX_HOME_DIR}"
+    verify_wifi_settings
     verify_samba_config
     verify_webserver_config
     verify_systemd_services
diff --git a/scripts/playout_controls.sh b/scripts/playout_controls.sh
index 908655ff8..c6f6f3c80 100755
--- a/scripts/playout_controls.sh
+++ b/scripts/playout_controls.sh
@@ -120,7 +120,7 @@ if [ "${DEBUG_playout_controls_sh}" == "TRUE" ]; then echo "VAR VALUE: ${VALUE}"
 # speed of these commands.
 shortcutCommands="^(setvolume|volumedown|volumeup|mute)$"
 
-autohotspot_script="/usr/bin/autohotspot"
+autohotspot_service='autohotspot.service'
 
 # Run the code from this block only, if the current command is not in "shortcutCommands"
 if [[ ! "$COMMAND" =~ $shortcutCommands ]]
@@ -1007,7 +1007,7 @@ case $COMMAND in
     enablewifi)
         if [ "${DEBUG_playout_controls_sh}" == "TRUE" ]; then echo "   ${COMMAND}" >> ${PATHDATA}/../logs/debug.log; fi
         rfkill unblock wifi
-        if [ -f "$autohotspot_script" ]; then sudo "$autohotspot_script"; fi
+        sudo systemctl start "$autohotspot_service" > /dev/null 2>&1
         ;;
     disablewifi)
         if [ "${DEBUG_playout_controls_sh}" == "TRUE" ]; then echo "   ${COMMAND}" >> ${PATHDATA}/../logs/debug.log; fi
@@ -1021,10 +1021,8 @@ case $COMMAND in
         # Build special for franzformator
         rfkill list wifi | grep -i "Soft blocked: no" > /dev/null 2>&1
         WIFI_SOFTBLOCK_RESULT=$?
-        wpa_cli -i wlan0 status | grep 'ip_address' > /dev/null 2>&1
-        WIFI_IP_RESULT=$?
-        if [ "${DEBUG_playout_controls_sh}" == "TRUE" ]; then echo "   WIFI_IP_RESULT='${WIFI_IP_RESULT}' WIFI_SOFTBLOCK_RESULT='${WIFI_SOFTBLOCK_RESULT}'" >> ${PATHDATA}/../logs/debug.log; fi
-        if [ $WIFI_SOFTBLOCK_RESULT -eq 0 ] && [ $WIFI_IP_RESULT -eq 0 ]
+        if [ "${DEBUG_playout_controls_sh}" == "TRUE" ]; then echo "   WIFI_SOFTBLOCK_RESULT='${WIFI_SOFTBLOCK_RESULT}'" >> ${PATHDATA}/../logs/debug.log; fi
+        if [ $WIFI_SOFTBLOCK_RESULT -eq 0 ]
         then
             if [ "${DEBUG_playout_controls_sh}" == "TRUE" ]; then echo "   Wifi will now be deactivated" >> ${PATHDATA}/../logs/debug.log; fi
             echo "Wifi will now be deactivated"
@@ -1033,7 +1031,7 @@ case $COMMAND in
             if [ "${DEBUG_playout_controls_sh}" == "TRUE" ]; then echo "   Wifi will now be activated" >> ${PATHDATA}/../logs/debug.log; fi
             echo "Wifi will now be activated"
             rfkill unblock wifi
-            if [ -f "$autohotspot_script" ]; then sudo "$autohotspot_script"; fi
+            sudo systemctl start "$autohotspot_service" > /dev/null 2>&1
         fi
         ;;
     randomcard)
diff --git a/scripts/userscripts/addhotspot.sh b/scripts/userscripts/addhotspot.sh
deleted file mode 100644
index 6e8e63a4e..000000000
--- a/scripts/userscripts/addhotspot.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ -z "$1" || -z "$2" ]]; then
-    echo "usage: addhotspot.sh <ssid> <passphrase>"
-	exit 1
-fi
-
-# addhotspot.sh newssid newpassword
-wpa_passphrase "$1" $2 >> /etc/wpa_supplicant/wpa_supplicant.conf
-
-# /etc/dhcpcd.conf
-if [[ ! $(grep -w "ssid $1" /etc/dhcpcd.conf) ]]; then
-    echo "ssid $1" >> /etc/dhcpcd.conf
-fi
diff --git a/scripts/userscripts/placeholder b/scripts/userscripts/placeholder
new file mode 100644
index 000000000..e69de29bb