diff --git a/CHANGES.md b/CHANGES.md
index 6f2a99c8..f6fc8aa4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@
 - New: Run C-lightning backup-compact regularly [issue](https://github.com/rootzoll/raspiblitz/issues/2869)
 - New: Switch LNbits between lnd & c-lightning [issue](https://github.com/rootzoll/raspiblitz/issues/2556)
 - New: Tallycoin Connect [details](https://github.com/djbooth007/tallycoin_connect#readme)
+- New: Helipad (Podcasting 2.0 Boostagram reader) [details](https://github.com/Podcastindex-org/helipad)
 - New: Migration from Citadel to RaspiBlitz [details](https://github.com/rootzoll/raspiblitz/issues/2642)
 - New: Bitcoinminds.org local on RaspiBlitz [details](https://github.com/raulcano/bitcoinminds)
 - New: JoinMarket Web UI v0.0.3 (CLI install of the first public alpha release) [details](https://github.com/joinmarket-webui/joinmarket-webui/releases/tag/v0.0.3)
diff --git a/home.admin/00settingsMenuServices.sh b/home.admin/00settingsMenuServices.sh
index a9416ff6..99e80293 100755
--- a/home.admin/00settingsMenuServices.sh
+++ b/home.admin/00settingsMenuServices.sh
@@ -417,7 +417,7 @@ else
 fi
 
 # Helipad
-choice="off"; check=$(echo "${CHOICES}" | grep -c "d")
+choice="off"; check=$(echo "${CHOICES}" | grep -c "f")
 if [ ${check} -eq 1 ]; then choice="on"; fi
 if [ "${helipad}" != "${choice}" ]; then
   echo "Helipad setting changed .."
diff --git a/home.admin/config.scripts/bonus.helipad.sh b/home.admin/config.scripts/bonus.helipad.sh
index 3e57548b..078de4f3 100644
--- a/home.admin/config.scripts/bonus.helipad.sh
+++ b/home.admin/config.scripts/bonus.helipad.sh
@@ -64,11 +64,6 @@ Activate TOR to access the web interface from outside your local network.
   exit 0
 fi
 
-# add default value to raspi config if needed
-if ! grep -Eq "^helipad=" /mnt/hdd/raspiblitz.conf; then
-  echo "helipad=off" >> /mnt/hdd/raspiblitz.conf
-fi
-
 # stop services
 echo "making sure services are not running"
 sudo systemctl stop helipad 2>/dev/null
@@ -178,13 +173,13 @@ WantedBy=multi-user.target
 
     sudo systemctl enable helipad
 
-    # setting value in raspiblitz config
-    sudo sed -i "s/^helipad=.*/helipad=on/g" /mnt/hdd/raspiblitz.conf
+    # setting value in raspiblitz conf
+    /home/admin/config.scripts/blitz.conf.sh set helipad "on"
 
     # Hidden Service for Helipad if Tor is active
     if [ "${runBehindTor}" = "on" ]; then
         # make sure to keep in sync with internet.tor.sh script
-        /home/admin/config.scripts/internet.hiddenservice.sh helipad 80 $HELIPAD_HTTP_PORT 443 $HELIPAD_HTTPS_PORT
+        /home/admin/config.scripts/tor.onion-service.sh helipad 80 $HELIPAD_HTTP_PORT 443 $HELIPAD_HTTPS_PORT
     fi
 
     source /home/admin/raspiblitz.info
@@ -258,13 +253,13 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then
 
   # Hidden Service if Tor is active
   if [ "${runBehindTor}" = "on" ]; then
-    /home/admin/config.scripts/internet.hiddenservice.sh off helipad
+    /home/admin/config.scripts/tor.onion-service.sh off helipad
   fi
 
   echo "OK Helipad removed."
 
   # setting value in raspi blitz config
-  sudo sed -i "s/^helipad=.*/helipad=off/g" /mnt/hdd/raspiblitz.conf
+  /home/admin/config.scripts/blitz.conf.sh set helipad "off"
 
   exit 0
 fi
\ No newline at end of file
diff --git a/home.admin/config.scripts/tor.network.sh b/home.admin/config.scripts/tor.network.sh
index ed38b829..e61d7f1b 100755
--- a/home.admin/config.scripts/tor.network.sh
+++ b/home.admin/config.scripts/tor.network.sh
@@ -127,7 +127,7 @@ case "$1" in
       sudo -u sphinxrelay bash -c "echo '${toraddress}' > /home/sphinxrelay/sphinx-relay/dist/toraddress.txt"
     fi
     if [ "${helipad}" = "on" ]; then
-    /home/admin/config.scripts/internet.hiddenservice.sh helipad 2112 2113
+    /home/admin/config.scripts/tor.onion-service.sh helipad 2112 2113
     fi
 
     echo "Setup logrotate"