diff --git a/src/freedombone-adduser b/src/freedombone-adduser
index 7cd24f4e..85f630c0 100755
--- a/src/freedombone-adduser
+++ b/src/freedombone-adduser
@@ -34,7 +34,7 @@ PROJECT_NAME='freedombone'
 export TEXTDOMAIN=${PROJECT_NAME}-adduser
 export TEXTDOMAINDIR="/usr/share/locale"
 
-CONFIGURATION_FILE=/root/${PROJECT_NAME}.cfg
+CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
 
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
 for f in $UTILS_FILES
diff --git a/src/freedombone-config b/src/freedombone-config
index 06889979..15fa2726 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -1362,7 +1362,7 @@ function show_result {
 }
 
 if [ ! $CONFIGURATION_FILE ]; then
-    CONFIGURATION_FILE=/root/freedombone.cfg
+    CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
 fi
 
 read_configuration_values
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 818d048c..8fe9811f 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -81,7 +81,7 @@ WIFI_NETWORKS_FILE=~/${PROJECT_NAME}-wifi.cfg
 
 USB_DRIVE=sdb
 # get default USB from config file
-CONFIGURATION_FILE=/root/${PROJECT_NAME}.cfg
+CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
 if [ -f $CONFIGURATION_FILE ]; then
     if grep -q "WIFI_HOTSPOT=" $CONFIGURATION_FILE; then
         WIFI_HOTSPOT=$(cat $CONFIGURATION_FILE | grep "WIFI_HOTSPOT=" | awk -F '=' '{print $2}')
diff --git a/src/freedombone-image b/src/freedombone-image
index 370687a6..e196d25b 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -362,8 +362,8 @@ done
 
 if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]]; then
     ${PROJECT_NAME}-config --minimal "$MINIMAL_INSTALL"
-    if [ -f /root/freedombone.cfg ]; then
-        CONFIG_FILENAME=/root/freedombone.cfg
+    if [ -f $HOME/${PROJECT_NAME}.cfg ]; then
+        CONFIG_FILENAME=$HOME/${PROJECT_NAME}.cfg
         DEFAULT_DOMAIN_NAME=$(cat $CONFIG_FILENAME | grep 'DEFAULT_DOMAIN_NAME' | awk -F '=' '{print $2}')
     fi
 fi
diff --git a/src/freedombone-utils-config b/src/freedombone-utils-config
index 24a27ee5..056577d4 100755
--- a/src/freedombone-utils-config
+++ b/src/freedombone-utils-config
@@ -145,7 +145,7 @@ function write_config_param {
 
 function save_configuration_values {
     if [ ! $CONFIGURATION_FILE ]; then
-        CONFIGURATION_FILE=/root/freedombone.cfg
+        CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
     fi
 
     for v in "${configuration_variables[@]}"