diff --git a/ct/flaresolverr.sh b/ct/flaresolverr.sh
index 36f08d1fe..84339b938 100644
--- a/ct/flaresolverr.sh
+++ b/ct/flaresolverr.sh
@@ -23,20 +23,23 @@ function update_script() {
   header_info
   check_container_storage
   check_container_resources
+
   if [[ ! -f /etc/systemd/system/flaresolverr.service ]]; then
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  RELEASE=$(curl -fsSL https://github.com/FlareSolverr/FlareSolverr/releases/latest | grep "title>Release" | cut -d " " -f 4)
-  if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then
-    msg_info "Updating $APP LXC"
+  RELEASE=$(curl -fsSL https://api.github.com/repos/FlareSolverr/FlareSolverr/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4)}')
+  if [[ "${RELEASE}" != "$(cat ~/.flaresolverr 2>/dev/null)" ]] || [[ ! -f ~/.flaresolverr ]]; then
+    msg_info "Stopping service"
     systemctl stop flaresolverr
-    curl -fsSL "https://github.com/FlareSolverr/FlareSolverr/releases/download/$RELEASE/flaresolverr_linux_x64.tar.gz" -o $(basename "https://github.com/FlareSolverr/FlareSolverr/releases/download/$RELEASE/flaresolverr_linux_x64.tar.gz")
-    tar -xzf flaresolverr_linux_x64.tar.gz -C /opt
-    rm flaresolverr_linux_x64.tar.gz
+    msg_ok "Stopped service"
+
+    rm -rf /opt/flaresolverr
+    fetch_and_deploy_gh_release "flaresolverr" "FlareSolverr/FlareSolverr" "prebuild" "latest" "/opt/flaresolverr" "flaresolverr_linux_x64.tar.gz"
+
+    msg_info "Starting service"
     systemctl start flaresolverr
-    echo "${RELEASE}" >/opt/${APP}_version.txt
-    msg_ok "Updated $APP LXC"
+    msg_ok "Started service"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"
   fi
diff --git a/install/flaresolverr-install.sh b/install/flaresolverr-install.sh
index c293545ab..ba1e2292f 100644
--- a/install/flaresolverr-install.sh
+++ b/install/flaresolverr-install.sh
@@ -15,8 +15,9 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y apt-transport-https
-$STD apt-get install -y xvfb
+$STD apt-get install -y \
+  apt-transport-https \
+  xvfb
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Chrome"
@@ -26,13 +27,7 @@ $STD apt update
 $STD apt install -y google-chrome-stable
 msg_ok "Installed Chrome"
 
-msg_info "Installing FlareSolverr"
-RELEASE=$(curl -fsSL https://github.com/FlareSolverr/FlareSolverr/releases/latest | grep "title>Release" | cut -d " " -f 4)
-$STD curl -fsSL "https://github.com/FlareSolverr/FlareSolverr/releases/download/$RELEASE/flaresolverr_linux_x64.tar.gz" -o "flaresolverr_linux_x64.tar.gz"
-$STD tar -xzf flaresolverr_linux_x64.tar.gz -C /opt
-$STD rm flaresolverr_linux_x64.tar.gz
-echo "${RELEASE}" >/opt/"${APPLICATION}"_version.txt
-msg_ok "Installed FlareSolverr"
+fetch_and_deploy_gh_release "flaresolverr" "FlareSolverr/FlareSolverr" "prebuild" "latest" "/opt/flaresolverr" "flaresolverr_linux_x64.tar.gz"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/flaresolverr.service