diff --git a/scripts/install.sh b/scripts/install.sh
index d026ea19..014405bb 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -13,6 +13,8 @@ log() {
 }
 
 SCRIPT_VERSION="0.1.0"
+REPO_URL="https://github.com/shocknet/Lightning.Pub/tarball/master"
+BASE_URL="https://raw.githubusercontent.com/shocknet/Lightning.Pub/master/scripts/"
 
 cleanup() {
     echo "Cleaning up temporary files..."
@@ -27,7 +29,6 @@ log_error() {
     exit $2
 }
 
-BASE_URL="https://raw.githubusercontent.com/shocknet/Lightning.Pub/master/scripts/"
 
 modules=(
   "utils"
@@ -75,7 +76,7 @@ else
 
  install_nodejs || log_error "Failed to install Node.js" 1
 
- install_lightning_pub || log_error "Failed to install Lightning.Pub" 1
+ install_lightning_pub "$REPO_URL" || log_error "Failed to install Lightning.Pub" 1
 
   log "Starting services..."
   start_services $lnd_status $pub_upgrade_status || log_error "Failed to start services" 1
diff --git a/scripts/install_lightning_pub.sh b/scripts/install_lightning_pub.sh
index 3ef62a84..d29a61ea 100755
--- a/scripts/install_lightning_pub.sh
+++ b/scripts/install_lightning_pub.sh
@@ -1,8 +1,14 @@
 #!/bin/bash
 
 install_lightning_pub() {
+  local REPO_URL="$1"
   local upgrade_status=0
 
+  if [ -z "$REPO_URL" ]; then
+    log "REPO_URL missing"
+    return 1
+  fi
+
   if [ "$EUID" -eq 0 ]; then
     USER_HOME=$(getent passwd ${SUDO_USER} | cut -d: -f6)
     USER_NAME=$SUDO_USER
@@ -35,7 +41,6 @@ install_lightning_pub() {
 #  fi
 
   log "${PRIMARY_COLOR}Installing${RESET_COLOR} ${SECONDARY_COLOR}Lightning.Pub${RESET_COLOR}..."
-  REPO_URL="https://github.com/shocknet/Lightning.Pub/tarball/master"
   
   sudo -u $USER_NAME wget -q $REPO_URL -O $USER_HOME/lightning_pub.tar.gz > /dev/null 2>&1 || {
     log "${PRIMARY_COLOR}Failed to download Lightning.Pub.${RESET_COLOR}"