diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh
index 4a040e506..699af001a 100755
--- a/home.admin/00infoBlitz.sh
+++ b/home.admin/00infoBlitz.sh
@@ -237,7 +237,7 @@ if [ "${lightning}" == "cln" ]; then
  ln_baseInfo="-"
  ln_channelInfo="\n"
  ln_external="\n"
- ln_alias="$(sudo cat /home/bitcoin/.lightning/${netprefix}config | grep "^alias=*" | cut -f2 -d=)"
+ ln_alias="$(sudo cat "${CLNCONF}" | grep "^alias=*" | cut -f2 -d=)"
  if [ ${#ln_alias} -eq 0 ];then
   ln_alias=$(echo "${ln_getInfo}" | grep '"alias":' | cut -d '"' -f4)
  fi
@@ -245,7 +245,7 @@ if [ "${lightning}" == "cln" ]; then
   ln_alias=${hostname}
  fi
  ln_publicColor=""
- ln_port=$(sudo cat /home/bitcoin/.lightning/${netprefix}config | grep "^bind-addr=*" | cut -f2 -d':')
+ ln_port=$(sudo cat "${CLNCONF}" | grep "^bind-addr=*" | cut -f2 -d':')
  if [ ${#ln_port} -eq 0 ]; then
    ln_port=$(echo "${ln_getInfo}" | grep '"port":' | cut -d: -f2 | tail -1 | bc)
  fi
diff --git a/home.admin/99systemMenu.sh b/home.admin/99systemMenu.sh
index 9babf2252..9adaa98ea 100644
--- a/home.admin/99systemMenu.sh
+++ b/home.admin/99systemMenu.sh
@@ -124,7 +124,7 @@ case $CHOICE in
     read key
     sudo tail -n 30 -f /home/bitcoin/.lightning/${CLNETWORK}/cl.log;;
   CLNCONF)
-    if /home/admin/config.scripts/blitz.setconf.sh "/home/bitcoin/.lightning/${netprefix}config" "root"
+    if /home/admin/config.scripts/blitz.setconf.sh "${CLNCONF}" "root"
     then
       whiptail \
         --title "Restart" --yes-button "Restart" --no-button "Not now" \
diff --git a/home.admin/config.scripts/cln.setname.sh b/home.admin/config.scripts/cln.setname.sh
index dcf138488..f38a16913 100644
--- a/home.admin/config.scripts/cln.setname.sh
+++ b/home.admin/config.scripts/cln.setname.sh
@@ -11,7 +11,7 @@ fi
 newName=$2
 
 # use default values from the raspiblitz.conf
-source <(/home/admin/config.scripts/network.aliases.sh getvars $1)
+source <(/home/admin/config.scripts/network.aliases.sh getvars cln $1)
 
 # run interactive if 'turn on' && no further parameters
 if [ ${#newName} -eq 0 ]; then
@@ -31,7 +31,7 @@ fi
 blitzConfig="/mnt/hdd/raspiblitz.conf"
 
 # cln conf file
-clnConfig="/home/bitcoin/.lightning/${netprefix}config"
+clnConfig="${CLNCONF}"
 
 # check if raspiblitz config file exists
 if [ ! -f ${blitzConfig} ]; then