diff --git a/FAQ.md b/FAQ.md
index 375803209..1eb635ae1 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -8,8 +8,9 @@
 - Update: LND version 0.10.1-beta [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.10.1-beta)
 - Update: Specter Desktop 0.4.1 [details](https://github.com/cryptoadvance/specter-desktop/blob/master/README.md)
 - Update: Loop 0.6.4 [details](https://lightning.engineering/posts/2020-05-13-loop-mpp/)
-- Update: BTCPayServer v1.0.4.4+ [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.0.4.4)
+- Update: BTCPayServer v1.0.5.2 [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.0.5.2)
 - Update: RTL 0.7.1 [details](https://github.com/Ride-The-Lightning/RTL/releases/tag/v0.7.1)
+- Update: JoinMarket v0.6.3.1 [details](https://github.com/JoinMarket-Org/joinmarket-clientserver/releases/tag/v0.6.3.1)
 - New: Nginx Web Server
 - New: Subscriptions Management 
 - New: IP2Tor Bridge (optional subscription service)
diff --git a/build_sdcard.sh b/build_sdcard.sh
index 6f000c8e7..7af59fdd0 100644
--- a/build_sdcard.sh
+++ b/build_sdcard.sh
@@ -170,6 +170,7 @@ if [ -f "/usr/bin/python3.7" ]; then
 elif [ -f "/usr/bin/python3.8" ]; then
   # use python 3.8 if available
   sudo update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1
+  sudo ln -s /usr/bin/python3.8 /usr/bin/python3.7
   echo "python calls python3.8"
 else
   echo "!!! FAIL !!!"
diff --git a/home.admin/config.scripts/bonus.btcpayserver.sh b/home.admin/config.scripts/bonus.btcpayserver.sh
index 172907463..3da8e0fcd 100644
--- a/home.admin/config.scripts/bonus.btcpayserver.sh
+++ b/home.admin/config.scripts/bonus.btcpayserver.sh
@@ -275,7 +275,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     sudo -u btcpay git clone https://github.com/dgarage/NBXplorer.git 2>/dev/null
     cd NBXplorer
     # check https://github.com/dgarage/NBXplorer/releases
-    sudo -u btcpay git reset --hard v2.1.24
+    sudo -u btcpay git reset --hard v2.1.34
     # from the build.sh with path
     sudo -u btcpay /home/btcpay/dotnet/dotnet build -c Release NBXplorer/NBXplorer.csproj
 
@@ -350,9 +350,9 @@ EOF
     sudo -u btcpay git clone https://github.com/btcpayserver/btcpayserver.git 2>/dev/null
     cd btcpayserver
     # check https://github.com/btcpayserver/btcpayserver/releases
-    # sudo -u btcpay git reset --hard v1.0.4.2
+    sudo -u btcpay git reset --hard v1.0.5.2
     # use latest commit (v1.0.4.4+) to fix build with latest dotNet
-    sudo -u btcpay git checkout f2bb24f6ab6d402af8214c67f84e08116eb650e7
+    # sudo -u btcpay git checkout f2bb24f6ab6d402af8214c67f84e08116eb650e7
     # from the build.sh with path
     sudo -u btcpay /home/btcpay/dotnet/dotnet build -c Release /home/btcpay/btcpayserver/BTCPayServer/BTCPayServer.csproj
 
diff --git a/home.admin/config.scripts/bonus.electrumwallet.sh b/home.admin/config.scripts/bonus.electrumwallet.sh
new file mode 100644
index 000000000..d77777877
--- /dev/null
+++ b/home.admin/config.scripts/bonus.electrumwallet.sh
@@ -0,0 +1,91 @@
+# Download and run this script to the Linux desktop:
+
+# Download
+# wget https://raw.githubusercontent.com/openoms/bitcoin-tutorials/master/electrs/electrum_wallet.sh 
+# Run:
+# bash electrum_wallet.sh
+
+echo "
+Enter the version of Electrum Wallet to install. 
+
+Find the latest version number at:
+https://electrum.org/#download
+
+For example: '3.3.8' or '4.0.0b0'"
+read electrumVersion
+
+echo "
+Install dependencies: python3-pyqt5 and libsecp256k1-0
+"
+sudo apt-get install -y python3-pyqt5 libsecp256k1-0
+
+echo "
+Download the package: 	
+https://download.electrum.org/$electrumVersion/Electrum-$electrumVersion.tar.gz
+"
+rm -f Electrum-$electrumVersion.tar.gz.*
+wget https://download.electrum.org/$electrumVersion/Electrum-$electrumVersion.tar.gz
+
+echo "
+Verify signature
+"
+rm -f ThomasV.asc
+wget https://raw.githubusercontent.com/spesmilo/electrum/master/pubkeys/ThomasV.asc
+gpg --import ThomasV.asc
+wget https://download.electrum.org/$electrumVersion/Electrum-$electrumVersion.tar.gz.asc
+verifyResult=$(gpg --verify Electrum-$electrumVersion.tar.gz.asc 2>&1)
+goodSignature=$(echo ${verifyResult} | grep 'Good signature' -c)
+echo "goodSignature(${goodSignature})"
+if [ ${goodSignature} -lt 1 ]; then
+  echo ""
+  echo "!!! BUILD FAILED --> PGP Verify not OK / signature(${goodSignature})"
+  exit 1
+fi
+
+echo "
+Installing with the command:
+python3 -m pip install --user Electrum-$electrumVersion.tar.gz[fast]
+"
+# Run without installing: 	tar -xvf Electrum-$electrumVersion.tar.gz
+# python3 Electrum-$electrumVersion/run_electrum
+# Install with PIP: 	
+sudo apt-get install -y python3-setuptools python3-pip
+python3 -m pip install --user Electrum-$electrumVersion.tar.gz[fast]
+
+isInPath=$(echo $PATH | grep -c ~/.local/bin)
+if [ $isInPath -eq 0 ]; then
+  echo ""
+  echo "add install dir to PATH"
+  PATH=$PATH:~/.local/bin
+  touch ~/.profile
+  export PATH
+  echo "PATH=$PATH" | tee -a ~/.profile
+else 
+  echo ""
+  echo "The install dir is already in the PATH"
+fi
+
+echo "
+To start use:
+'electrum --oneserver --server YOUR_ELECTRUM_SERVER_IP:50002:s'
+
+To start with your custom server now and save the setting:
+type the LAN_IP_ADDRESS of your Electrum Server followed by [ENTER]:"
+read RASPIBLITZ_IP
+
+echo "
+Make the oneserver config persist (editing ~/.electrum/config)
+"
+electrum setconfig oneserver true
+electrum setconfig server $RASPIBLITZ_IP:50002:s
+
+echo "
+To run with the chosen server, just use:
+'electrum'
+
+To change the preset server:
+edit the file ~/.electrum/config and change:
+\"server\": \"<your__ IP_domain_or_dynDNS>:50002:s\"
+"
+
+electrum --oneserver --server $RASPIBLITZ_IP:50002:s 
\ No newline at end of file
diff --git a/home.admin/config.scripts/bonus.joinmarket.sh b/home.admin/config.scripts/bonus.joinmarket.sh
index fb0d43a97..293601d8e 100644
--- a/home.admin/config.scripts/bonus.joinmarket.sh
+++ b/home.admin/config.scripts/bonus.joinmarket.sh
@@ -100,7 +100,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
 
     sudo -u joinmarket git clone https://github.com/Joinmarket-Org/joinmarket-clientserver
     cd joinmarket-clientserver
-    git reset --hard v0.6.2
+    git reset --hard v0.6.3.1
 
     # set up jmvenv 
     sudo apt install -y virtualenv
diff --git a/home.admin/config.scripts/ip2t.sh b/home.admin/config.scripts/ip2t.sh
new file mode 100644
index 000000000..e69de29bb