diff --git a/home.admin/20initDialog.sh b/home.admin/20initDialog.sh
index 3e5d1c128..e411f4d20 100755
--- a/home.admin/20initDialog.sh
+++ b/home.admin/20initDialog.sh
@@ -77,16 +77,4 @@ sed -i "s/^${network}d.rpcpass=.*/${network}d.rpcpass=${result}/g" /home/admin/a
 
 # success info dialog
 dialog --backtitle "RaspiBlitz - SetUP" --msgbox "OK - RPC password changed to '$result'\n\nNow starting the Setup of your RaspiBlitz." 7 52
-clear
-
-# init get publicip service
-getpublicipExists=$(sudo ls /usr/local/bin/getpublicip.sh 2>/dev/null | grep "getpublicip.sh" -c)
-if [ ${getpublicipExists} -eq 0 ]; then
-  echo "*** Installing getPublic ip script and service *** "
-  sudo cp ./assets/getpublicip.sh /usr/local/bin/getpublicip.sh
-  sudo chmod +x /usr/local/bin/getpublicip.sh
-  sudo cp ./assets/getpublicip.service /etc/systemd/system/getpublicip.service
-  sudo systemctl enable getpublicip
-  sudo systemctl start getpublicip
-  echo ""
-fi
\ No newline at end of file
+clear
\ No newline at end of file
diff --git a/home.admin/90finishSetup.sh b/home.admin/90finishSetup.sh
index fa62f7922..8731917d8 100755
--- a/home.admin/90finishSetup.sh
+++ b/home.admin/90finishSetup.sh
@@ -64,6 +64,8 @@ echo "allow: trasmission"
 sudo ufw allow 51413 comment 'transmission'
 echo "allow: local web admin"
 sudo ufw allow from 192.168.0.0/24 to any port 80 comment 'allow local LAN web'
+echo "open firewall for  auto nat discover"
+sudo ufw allow proto udp from 192.168.0.0/24 port 1900 to any comment 'allow local LAN SSDP for UPnP discovery'
 echo "enable lazy firewall"
 sudo ufw --force enable
 echo ""
diff --git a/home.admin/96addTorService.sh b/home.admin/96addTorService.sh
index 57d488da1..72f097e9d 100644
--- a/home.admin/96addTorService.sh
+++ b/home.admin/96addTorService.sh
@@ -197,8 +197,8 @@ echo ""
 echo "*** Putting LND behind TOR ***"
 echo "Disable LND again"
 sudo systemctl disable lnd
-echo "Writing Public Onion Address to /run/publicip (just in case for TotHiddenServiceV3)"
-echo "PUBLICIP=${onionLND}" | sudo tee /run/publicip
+echo "Writing Public Onion Address to /mnt/hdd/tor/v3Address (just in case for TotHiddenServiceV3)"
+echo "V3ADDRESS=${onionLND}" | sudo tee /mnt/hdd/tor/v3Address
 echo "Configure and Changing to lnd.tor.service"
 sed -i "5s/.*/Wants=${network}d.service/" ./assets/lnd.tor.service
 sed -i "6s/.*/After=${network}d.service/" ./assets/lnd.tor.service
diff --git a/home.admin/assets/bitcoind.service b/home.admin/assets/bitcoind.service
index 59a906e22..550364914 100644
--- a/home.admin/assets/bitcoind.service
+++ b/home.admin/assets/bitcoind.service
@@ -2,8 +2,8 @@
 
 [Unit]
 Description=Bitcoin daemon
-Wants=getpublicip.service
-After=getpublicip.service
+Wants=bootstrap.service
+After=bootstrap.service
 
 # for use with sendmail alert (coming soon)
 #OnFailure=systemd-sendmail@%n
diff --git a/home.admin/assets/getpublicip.service b/home.admin/assets/getpublicip.service
deleted file mode 100644
index e65d15ee0..000000000
--- a/home.admin/assets/getpublicip.service
+++ /dev/null
@@ -1,21 +0,0 @@
-# RaspiBolt LND Mainnet: systemd unit for getpublicip.sh script
-# /etc/systemd/system/getpublicip.service
-
-[Unit]
-Description=getpublicip.sh: get public ip address from ipinfo.io
-Wants=bootstrap.service
-After=bootstrap.service
-
-[Service]
-User=root
-Group=root
-Type=simple
-ExecStart=/usr/local/bin/getpublicip.sh
-ExecStartPost=/bin/sleep 5
-Restart=always
-
-RestartSec=600
-TimeoutSec=10
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/home.admin/assets/getpublicip.sh b/home.admin/assets/getpublicip.sh
deleted file mode 100644
index bfd0342dc..000000000
--- a/home.admin/assets/getpublicip.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-echo 'getpublicip.sh started, writing public IP address every 10 minutes into /run/publicip'
-while [ 0 ];
-    do
-    # check if TOR is running
-    torExists=$(sudo ls /mnt/hdd/tor/lnd9735/hostname 2>/dev/null | grep hostname -c)
-    if [ ${torExists} -eq 0 ]; then
-      # get and set public IP
-      printf "PUBLICIP=$(curl -vv ipinfo.io/ip 2> /run/publicip.log)\n" > /run/publicip;
-    else
-      # set onion address
-      printf "PUBLICIP=$(sudo cat /mnt/hdd/tor/lnd9735/hostname)\n" > /run/publicip;
-    fi
-    sleep 600
-done;
\ No newline at end of file
diff --git a/home.admin/assets/litecoind.service b/home.admin/assets/litecoind.service
index fd56c659c..4c92f1547 100644
--- a/home.admin/assets/litecoind.service
+++ b/home.admin/assets/litecoind.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Bitcoin daemon
-Wants=getpublicip.service
-After=getpublicip.service
+Wants=bootstrap.service
+After=bootstrap.service
 
 # for use with sendmail alert (coming soon)
 #OnFailure=systemd-sendmail@%n
diff --git a/home.admin/assets/lnd.bitcoin.conf b/home.admin/assets/lnd.bitcoin.conf
index c2158e478..9f10b6867 100755
--- a/home.admin/assets/lnd.bitcoin.conf
+++ b/home.admin/assets/lnd.bitcoin.conf
@@ -5,6 +5,7 @@ debuglevel=debug
 maxpendingchannels=5
 alias=raspiblitz
 color=#68F442
+nat=true
 
 # RPC open to all connections on Port 10009
 rpclisten=0.0.0.0:10009
diff --git a/home.admin/assets/lnd.litecoin.conf b/home.admin/assets/lnd.litecoin.conf
index 924b47b74..dc0a016f5 100755
--- a/home.admin/assets/lnd.litecoin.conf
+++ b/home.admin/assets/lnd.litecoin.conf
@@ -5,6 +5,7 @@ debuglevel=debug
 maxpendingchannels=5
 alias=raspiblitz
 color=#68F442
+nat=true
 
 # RPC open to all connections on Port 10009
 rpclisten=0.0.0.0:10009
diff --git a/home.admin/assets/lnd.service b/home.admin/assets/lnd.service
index 857f64daf..7177a24bd 100644
--- a/home.admin/assets/lnd.service
+++ b/home.admin/assets/lnd.service
@@ -9,10 +9,7 @@ After=bitcoind.service
 #OnFailure=systemd-sendmail@%n
 
 [Service]
-# get var PUBIP from file
-EnvironmentFile=/run/publicip
-
-ExecStart=/usr/local/bin/lnd --externalip=${PUBLICIP}
+ExecStart=/usr/local/bin/lnd
 PIDFile=/home/bitcoin/.lnd/lnd.pid
 User=bitcoin
 Group=bitcoin
diff --git a/home.admin/assets/lnd.tor.service b/home.admin/assets/lnd.tor.service
index d84f172fe..5ea48e1e4 100644
--- a/home.admin/assets/lnd.tor.service
+++ b/home.admin/assets/lnd.tor.service
@@ -10,13 +10,13 @@ After=bitcoind.service
 
 [Service]
 # get var PUBIP from file
-EnvironmentFile=/run/publicip
+EnvironmentFile=/mnt/hdd/tor/v3Address
 
 # TOR Hidden Service v2
 ExecStart=/usr/local/bin/lnd --tor.active --tor.v2 --listen=127.0.0.1:9735
 
 # TOR Hidden Service v3
-# ExecStart=/usr/local/bin/lnd --tor.active --tor.v3 --externalip=${PUBLICIP} --listen=127.0.0.1:9735
+# ExecStart=/usr/local/bin/lnd --tor.active --tor.v3 --externalip=${V3ADDRESS} --listen=127.0.0.1:9735
 
 PIDFile=/home/bitcoin/.lnd/lnd.pid
 User=bitcoin