diff --git a/ct/calibre-web.sh b/ct/calibre-web.sh
index 7e07b20d5..00d96e3df 100644
--- a/ct/calibre-web.sh
+++ b/ct/calibre-web.sh
@@ -35,10 +35,11 @@ function update_script() {
     msg_ok "Stopped Service"
 
     msg_info "Backing up Data"
-    cp -r /opt/calibre-web/app.db /opt/calibre-web/app.db_backup 2>/dev/null
+    cp -r /opt/calibre-web/app.db /opt/app.db_backup
+    cp -r /opt/calibre-web/data /opt/data_backup
     msg_ok "Backed up Data"
 
-    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "calibre-web" "janeczku/calibre-web" "tarball" "latest" "/opt/calibre-web"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "calibre-web" "janeczku/calibre-web" "prebuild" "latest" "/opt/calibre-web" "calibre-web*.tar.gz"
     setup_uv
 
     msg_info "Installing Dependencies"
@@ -46,14 +47,12 @@ function update_script() {
     $STD uv venv
     $STD uv pip install --python /opt/calibre-web/.venv/bin/python --no-cache-dir --upgrade pip setuptools wheel
     $STD uv pip install --python /opt/calibre-web/.venv/bin/python --no-cache-dir -r requirements.txt
-    if [[ -f optional-requirements.txt ]]; then
-      $STD uv pip install --python /opt/calibre-web/.venv/bin/python --no-cache-dir -r optional-requirements.txt
-    fi
     msg_ok "Installed Dependencies"
 
     msg_info "Restoring Data"
-    cp /opt/calibre-web/app.db_backup /opt/calibre-web/app.db 2>/dev/null
-    rm -f /opt/calibre-web/app.db_backup
+    cp /opt/app.db_backup /opt/calibre-web/app.db 2>/dev/null
+    cp -r /opt/data_backup /opt/calibre-web/data 2>/dev/null
+    rm -rf /opt/app.db_backup /opt/data_backup
     msg_ok "Restored Data"
 
     msg_info "Starting Service"
diff --git a/install/calibre-web-install.sh b/install/calibre-web-install.sh
index 63d671d60..7c7e85bdd 100644
--- a/install/calibre-web-install.sh
+++ b/install/calibre-web-install.sh
@@ -29,7 +29,7 @@ msg_info "Installing Calibre (for eBook conversion)"
 $STD apt install -y calibre
 msg_ok "Installed Calibre"
 
-fetch_and_deploy_gh_release "calibre-web" "janeczku/calibre-web" "tarball" "latest" "/opt/calibre-web"
+fetch_and_deploy_gh_release "calibre-web" "janeczku/calibre-web" "prebuild" "latest" "/opt/calibre-web" "calibre-web*.tar.gz"
 setup_uv
 
 msg_info "Installing Python Dependencies"
@@ -37,9 +37,6 @@ cd /opt/calibre-web
 $STD uv venv
 $STD uv pip install --python /opt/calibre-web/.venv/bin/python --no-cache-dir --upgrade pip setuptools wheel
 $STD uv pip install --python /opt/calibre-web/.venv/bin/python --no-cache-dir -r requirements.txt
-if [[ -f optional-requirements.txt ]]; then
-  $STD uv pip install --python /opt/calibre-web/.venv/bin/python --no-cache-dir -r optional-requirements.txt
-fi
 msg_ok "Installed Python Dependencies"
 
 msg_info "Creating Service"