diff --git a/scripts/install.sh b/scripts/install.sh
index 775e3b17..712b51bc 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -47,8 +47,17 @@ log "Script version $SCRIPT_VERSION"
 # Parse args for branch override
 while [[ $# -gt 0 ]]; do
   case $1 in
-    --branch) BRANCH="$2"; shift 2 ;;
-    *) shift ;;
+    --branch=*)
+      BRANCH="${1#*=}"
+      shift
+      ;;
+    --branch)
+      BRANCH="$2"
+      shift 2
+      ;;
+    *)
+      shift
+      ;;
   esac
 done
 
diff --git a/scripts/start_services.sh b/scripts/start_services.sh
index 8d25db68..3c9d179c 100755
--- a/scripts/start_services.sh
+++ b/scripts/start_services.sh
@@ -56,22 +56,20 @@ start_services() {
       fi
 
       # Always attempt to start or restart Lightning.Pub
-      if $SYSTEMCTL_CMD is-active --quiet lightning_pub; then
-        if [ "$PUB_UPGRADE" = "100" ]; then
-          log "${PRIMARY_COLOR}Restarting${RESET_COLOR} ${SECONDARY_COLOR}Lightning.Pub${RESET_COLOR} service..."
-          $SYSTEMCTL_CMD restart lightning_pub
-        else
-          log "${SECONDARY_COLOR}Lightning.Pub${RESET_COLOR} service is already running."
-        fi
-      else
+      if [ "$PUB_UPGRADE" = "100" ]; then
+        log "${PRIMARY_COLOR}Restarting${RESET_COLOR} ${SECONDARY_COLOR}Lightning.Pub${RESET_COLOR} service after upgrade..."
+        $SYSTEMCTL_CMD restart lightning_pub
+      elif [ "$PUB_UPGRADE" = "0" ]; then
         log "${PRIMARY_COLOR}Starting${RESET_COLOR} ${SECONDARY_COLOR}Lightning.Pub${RESET_COLOR} service..."
         $SYSTEMCTL_CMD start lightning_pub
       fi
 
       # Check Lightning.Pub status after attempting to start/restart
-      if ! $SYSTEMCTL_CMD is-active --quiet lightning_pub; then
-        log "Failed to start or restart ${SECONDARY_COLOR}Lightning.Pub${RESET_COLOR}. Please check the logs."
-        exit 1
+      if [ "$PUB_UPGRADE" = "0" ] || [ "$PUB_UPGRADE" = "100" ]; then
+          if ! $SYSTEMCTL_CMD is-active --quiet lightning_pub; then
+            log "Failed to start or restart ${SECONDARY_COLOR}Lightning.Pub${RESET_COLOR}. Please check the logs."
+            exit 1
+          fi
       fi
 
     else