Update versions.json

ct/2fauth.sh

@@ -57,6 +57,15 @@ function update_script() {
     $STD composer install --no-dev --prefer-dist
     php artisan 2fauth:install
     $STD systemctl restart nginx
+
+    msg_info "Cleaning Up"
+    if dpkg -l | grep -q 'php8.2'; then
+      $STD apt remove --purge -y php8.2*
+    fi
+    $STD apt -y autoremove
+    $STD apt -y autoclean
+    $STD apt -y clean
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/adventurelog.sh

@@ -62,7 +62,6 @@ function update_script() {
     cd /opt/adventurelog/frontend || exit
     $STD pnpm i
     $STD pnpm build
-    rm -rf /opt/adventurelog-backup
     msg_ok "Updated ${APP}"
 
     msg_info "Starting Services"
@@ -70,6 +69,10 @@ function update_script() {
     systemctl start adventurelog-backend
     systemctl start adventurelog-frontend
     msg_ok "Services Started"
+
+    msg_info "Cleaning Up"
+    rm -rf /opt/adventurelog-backup
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/apache-tika.sh

@@ -38,13 +38,15 @@ function update_script() {
     curl -fsSL -o tika-server-standard-${RELEASE}.jar "https://dlcdn.apache.org/tika/${RELEASE}/tika-server-standard-${RELEASE}.jar"
     mv --force tika-server-standard.jar tika-server-standard-prev-version.jar
     mv tika-server-standard-${RELEASE}.jar tika-server-standard.jar
-    rm -rf /opt/apache-tika/tika-server-standard-prev-version.jar
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP} to v${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start apache-tika
     msg_ok "Started Service"
+    msg_info "Cleaning Up"
+    rm -rf /opt/apache-tika/tika-server-standard-prev-version.jar
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/authelia.sh

@@ -31,11 +31,15 @@ function update_script() {
   fi
 
   if check_for_gh_release "authelia" "authelia/authelia"; then
-    $STD apt update
-    $STD apt -y upgrade
+    $STD apt-get update
+    $STD apt-get -y upgrade
 
     fetch_and_deploy_gh_release "authelia" "authelia/authelia" "binary"
 
+    msg_info "Cleaning Up"
+    $STD apt-get -y autoremove
+    $STD apt-get -y autoclean
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/backrest.sh

@@ -39,13 +39,16 @@ function update_script() {
     curl -fsSL "https://github.com/garethgeorge/backrest/releases/download/v${RELEASE}/backrest_Linux_x86_64.tar.gz" -o "$temp_file"
     tar xzf $temp_file -C /opt/backrest/bin
     chmod +x /opt/backrest/bin/backrest
-    rm -f "$temp_file"
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP} to ${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start backrest
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -f "$temp_file"
+    msg_ok "Cleaned up"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/baikal.sh

@@ -47,12 +47,15 @@ function update_script() {
     chmod -R 755 /opt/baikal/
     cd /opt/baikal
     $STD composer install
-    rm -rf /opt/baikal-backup
     msg_ok "Configured Baikal"
 
     msg_info "Starting Service"
     systemctl start apache2
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -rf /opt/baikal-backup
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/bar-assistant.sh

@@ -54,12 +54,15 @@ function update_script() {
     $STD php artisan route:cache
     $STD php artisan event:cache
     chown -R www-data:www-data /opt/bar-assistant
-    rm -rf /opt/bar-assistant-backup
     msg_ok "Updated Bar-Assistant"
 
     msg_info "Starting nginx"
     systemctl start nginx
     msg_ok "Started nginx"
+
+    msg_info "Cleaning up"
+    rm -rf /opt/bar-assistant-backup
+    msg_ok "Cleaned"
   fi
 
   if check_for_gh_release "vue-salt-rim" "karlomikus/vue-salt-rim"; then
@@ -78,12 +81,15 @@ function update_script() {
     cd /opt/vue-salt-rim
     $STD npm install
     $STD npm run build
-    rm -rf /opt/vue-salt-rim-backup
     msg_ok "Updated Vue Salt Rim"
 
     msg_info "Starting nginx"
     systemctl start nginx
     msg_ok "Started nginx"
+
+    msg_info "Cleaning up"
+    rm -rf /opt/vue-salt-rim-backup
+    msg_ok "Cleaned"
   fi
 
   if check_for_gh_release "meilisearch" "meilisearch/meilisearch"; then

ct/bookstack.sh

@@ -57,12 +57,15 @@ function update_script() {
     chmod -R 755 /opt/bookstack /opt/bookstack/bootstrap/cache /opt/bookstack/public/uploads /opt/bookstack/storage
     chmod -R 775 /opt/bookstack/storage /opt/bookstack/bootstrap/cache /opt/bookstack/public/uploads
     chmod -R 640 /opt/bookstack/.env
-    rm -rf /opt/bookstack-backup
     msg_ok "Configured BookStack"
 
     msg_info "Starting Apache2"
     systemctl start apache2
     msg_ok "Started Apache2"
+
+    msg_info "Cleaning Up"
+    rm -rf /opt/bookstack-backup
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/dispatcharr.sh

@@ -109,7 +109,6 @@ function update_script() {
     fi
     $STD uv run python manage.py migrate --noinput
     $STD uv run python manage.py collectstatic --noinput
-    rm -f /tmp/dispatcharr_db_*.sql
     msg_ok "Migrations Complete"
 
     msg_info "Starting Services"
@@ -118,6 +117,10 @@ function update_script() {
     systemctl start dispatcharr-celerybeat
     systemctl start dispatcharr-daphne
     msg_ok "Started Services"
+
+    msg_info "Cleaning up"
+    rm -f /tmp/dispatcharr_db_*.sql
+    msg_ok "Cleanup completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/docker.sh

@@ -76,6 +76,11 @@ function update_script() {
       portainer/agent
     msg_ok "Updated Portainer Agent"
   fi
+
+  msg_info "Cleaning up"
+  $STD apt-get -y autoremove
+  $STD apt-get -y autoclean
+  msg_ok "Cleanup complete"
   msg_ok "Updated successfully!"
   exit
 }

ct/documenso.sh

@@ -50,13 +50,16 @@ function update_script() {
     $STD turbo run build --filter=@documenso/remix
     $STD npm run prisma:migrate-deploy
     $STD turbo daemon stop
-    rm -rf /opt/v${RELEASE}.zip
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP}"
 
     msg_info "Starting Service"
     systemctl start documenso
     msg_ok "Started Service"
+
+    msg_info "Cleaning Up"
+    rm -rf /opt/v${RELEASE}.zip
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/emqx.sh

@@ -47,13 +47,16 @@ function update_script() {
 
     msg_info "Installing EMQX"
     $STD apt-get install -y "$DEB_FILE"
-    rm -f "$DEB_FILE"
-    echo "$RELEASE" >~/.emqx
     msg_ok "Installed EMQX v${RELEASE}"
 
     msg_info "Starting EMQX"
     systemctl start emqx
+    echo "$RELEASE" >~/.emqx
     msg_ok "Started EMQX"
+
+    msg_info "Cleaning Up"
+    rm -f "$DEB_FILE"
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. EMQX is already at v${RELEASE}"

ct/fileflows.sh

@@ -48,13 +48,16 @@ function update_script() {
     temp_file=$(mktemp)
     curl -fsSL https://fileflows.com/downloads/zip -o "$temp_file"
     $STD unzip -o -d /opt/fileflows "$temp_file"
-    rm -rf "$temp_file"
-    rm -rf "$backup_filename"
     msg_ok "Updated $APP to latest version"
 
     msg_info "Starting Service"
     systemctl start fileflows
     msg_ok "Started Service"
+
+    msg_info "Cleaning Up"
+    rm -rf "$temp_file"
+    rm -rf "$backup_filename"
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at latest version"

ct/ghostfolio.sh

@@ -56,6 +56,10 @@ function update_script() {
     msg_info "Starting Service"
     systemctl start ghostfolio
     msg_ok "Started Service"
+
+    msg_info "Cleaning Up"
+    $STD npm cache clean --force
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/jellyseerr.sh

@@ -38,6 +38,11 @@ function update_script() {
         $STD apt-get update
         $STD apt-get -y upgrade
         msg_ok "Updating Packages"
+
+        msg_info "Cleaning up"
+        apt-get -y autoremove
+        apt-get -y autoclean
+        msg_ok "Cleaning up"
     fi
 
     cd /opt/jellyseerr

ct/keycloak.sh

@@ -49,12 +49,15 @@ function update_script() {
     cp -a keycloak.old/conf/. keycloak/conf/
     cp -a keycloak.old/providers/. keycloak/providers/ 2>/dev/null || true
     cp -a keycloak.old/themes/. keycloak/themes/ 2>/dev/null || true
-    rm -rf keycloak.old
     msg_ok "Updated Keycloak"
 
     msg_info "Restarting Service"
     systemctl restart keycloak
     msg_ok "Restarted Service"
+
+    msg_info "Cleaning up"
+    rm -rf keycloak.old
+    msg_ok "Cleanup complete"
     msg_ok "Updated successfully!"
   fi
   exit

ct/koillection.sh

@@ -50,12 +50,15 @@ function update_script() {
     $STD yarn install
     $STD yarn build
     chown -R www-data:www-data /opt/koillection/public/uploads
-    rm -r /opt/koillection-backup
     msg_ok "Updated Koillection"
 
     msg_info "Starting Service"
     systemctl start apache2
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -r /opt/koillection-backup
+    msg_ok "Cleaned"
     msg_ok "Updated Successfully!"
   fi
   exit

ct/linkwarden.sh

@@ -52,14 +52,17 @@ function update_script() {
     $STD yarn web:build
     $STD yarn prisma:deploy
     [ -d /opt/data.bak ] && mv /opt/data.bak /opt/linkwarden/data
-    rm -rf ~/.cargo/registry ~/.cargo/git ~/.cargo/.package-cache ~/.rustup
-    rm -rf /root/.cache/yarn
-    rm -rf /opt/linkwarden/.next/cache
     msg_ok "Updated ${APP}"
 
     msg_info "Starting Service"
     systemctl start linkwarden
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -rf ~/.cargo/registry ~/.cargo/git ~/.cargo/.package-cache ~/.rustup
+    rm -rf /root/.cache/yarn
+    rm -rf /opt/linkwarden/.next/cache
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/listmonk.sh

@@ -42,12 +42,15 @@ function update_script() {
     mv /opt/listmonk-backup/config.toml /opt/listmonk/config.toml
     mv /opt/listmonk-backup/uploads /opt/listmonk/uploads
     $STD /opt/listmonk/listmonk --upgrade --yes --config /opt/listmonk/config.toml
-    rm -rf /opt/listmonk-backup/
     msg_ok "Configured listmonk"
 
     msg_info "Starting Service"
     systemctl start listmonk
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -rf /opt/listmonk-backup/
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/lubelogger.sh

@@ -53,12 +53,15 @@ function update_script() {
     msg_info "Configuring LubeLogger"
     chmod 700 /opt/lubelogger/CarCareTracker
     cp -rf /tmp/lubeloggerData/* /opt/lubelogger/
-    rm -rf /tmp/lubeloggerData
     msg_ok "Configured LubeLogger"
 
     msg_info "Starting Service"
     systemctl start lubelogger
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -rf /tmp/lubeloggerData
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/lyrionmusicserver.sh

@@ -38,9 +38,15 @@ function update_script() {
     curl -fsSL -o "$DEB_FILE" "$DEB_URL"
     $STD apt install "$DEB_FILE" -y
     systemctl restart lyrion
-    $STD rm -f "$DEB_FILE"
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to ${RELEASE}"
+
+    msg_info "Cleaning up"
+    $STD rm -f "$DEB_FILE"
+    $STD apt -y autoremove
+    $STD apt -y autoclean
+    $STD apt -y clean
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "$APP is already up to date (${RELEASE})"

ct/minio.sh

@@ -55,13 +55,17 @@ function update_script() {
     mv /usr/local/bin/minio /usr/local/bin/minio_bak
     curl -fsSL "https://dl.min.io/server/minio/release/linux-amd64/minio" -o /usr/local/bin/minio
     chmod +x /usr/local/bin/minio
-    rm -f /usr/local/bin/minio_bak
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP}"
 
     msg_info "Starting Service"
     systemctl start minio
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -f /usr/local/bin/minio_bak
+    msg_ok "Cleaned"
+
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/monica.sh

@@ -52,12 +52,15 @@ function update_script() {
     $STD php artisan monica:update --force
     chown -R www-data:www-data /opt/monica
     chmod -R 775 /opt/monica/storage
-    rm -r /opt/monica-backup
     msg_ok "Configured monica"
 
     msg_info "Starting Service"
     systemctl start apache2
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -r /opt/monica-backup
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/netbox.sh

@@ -57,14 +57,17 @@ function update_script() {
     fi
 
     $STD /opt/netbox/upgrade.sh
-    rm -r "/opt/v${RELEASE}.zip"
-    rm -r /opt/netbox-backup
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start netbox netbox-rq
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -r "/opt/v${RELEASE}.zip"
+    rm -r /opt/netbox-backup
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/nextpvr.sh

@@ -41,12 +41,15 @@ function update_script() {
     cd /opt
     curl -fsSL "https://nextpvr.com/nextpvr-helper.deb" -o $(basename "https://nextpvr.com/nextpvr-helper.deb")
     $STD dpkg -i nextpvr-helper.deb
-  rm -rf /opt/nextpvr-helper.deb
     msg_ok "Updated ${APP}"
 
     msg_info "Starting Service"
     systemctl start nextpvr-server
     msg_ok "Started Service"
+
+    msg_info "Cleaning Up"
+    rm -rf /opt/nextpvr-helper.deb
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
     exit
 }

ct/nxwitness.sh

@@ -42,13 +42,17 @@ function update_script() {
     export DEBIAN_FRONTEND=noninteractive
     export DEBCONF_NOWARNINGS=yes
     $STD dpkg -i nxwitness-server-$RELEASE-linux_x64.deb
-    rm -f /tmp/nxwitness-server-$RELEASE-linux_x64.deb
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP}"
 
     msg_info "Starting Service"
     systemctl start networkoptix-root-tool networkoptix-mediaserver
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -f /tmp/nxwitness-server-$RELEASE-linux_x64.deb
+    msg_ok "Cleaned"
+
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/odoo.sh

@@ -50,13 +50,17 @@ function update_script() {
     msg_info "Updating ${APP} to ${LATEST_VERSION}"
     curl -fsSL https://nightly.odoo.com/${RELEASE}/nightly/deb/odoo_${RELEASE}.latest_all.deb -o /opt/odoo.deb
     $STD apt install -y /opt/odoo.deb
-    rm -f /opt/odoo.deb
     echo "$LATEST_VERSION" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP} to ${LATEST_VERSION}"
 
-    msg_info "Starting Service"
+    msg_info "Starting ${APP} service"
     systemctl start odoo
     msg_ok "Started Service"
+
+    msg_info "Cleaning Up"
+    rm -f /opt/odoo.deb
+    msg_ok "Cleaned"
+
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${LATEST_VERSION}"

ct/ollama.sh

@@ -43,13 +43,16 @@ function update_script() {
     mkdir -p /usr/local/lib/ollama
     tar -xzf "${TMP_TAR}" -C /usr/local/lib/ollama
     ln -sf /usr/local/lib/ollama/bin/ollama /usr/local/bin/ollama
-    rm -f "${TMP_TAR}"
     echo "${RELEASE}" >/opt/Ollama_version.txt
     msg_ok "Updated Ollama to ${RELEASE}"
 
     msg_info "Starting Services"
     systemctl start ollama
     msg_ok "Started Services"
+
+    msg_info "Cleaning Up"
+    rm -f "${TMP_TAR}"
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. Ollama is already at ${RELEASE}"

ct/onedev.sh

@@ -39,14 +39,17 @@ function update_script() {
     tar -xzf onedev-latest.tar.gz
     $STD /opt/onedev-latest/bin/upgrade.sh /opt/onedev
     RELEASE=$(cat /opt/onedev/release.properties | grep "version" | cut -d'=' -f2)
-    rm -rf /opt/onedev-latest
-    rm -rf /opt/onedev-latest.tar.gz
     echo "${RELEASE}" >"/opt/${APP}_version.txt"
     msg_ok "Updated ${APP} to v${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start onedev
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -rf /opt/onedev-latest
+    rm -rf /opt/onedev-latest.tar.gz
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}."

ct/paperless-ai.sh

@@ -65,14 +65,17 @@ EOF
     $STD pip install --no-cache-dir -r requirements.txt
     mkdir -p data/chromadb
     $STD npm install
-    rm -rf /opt/v${RELEASE}.zip
-    rm -rf /opt/paperless-ai_bak
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start paperless-ai
     msg_ok "Started Service"
+
+    msg_info "Cleaning Up"
+    rm -rf /opt/v${RELEASE}.zip
+    rm -rf /opt/paperless-ai_bak
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/paperless-gpt.sh

@@ -47,13 +47,16 @@ function update_script() {
         export CC=musl-gcc
         CGO_ENABLED=1 go build -tags musl -o /dev/null github.com/mattn/go-sqlite3
         CGO_ENABLED=1 go build -tags musl -o paperless-gpt .
-    rm -f $temp_file
         echo "${RELEASE}" >"/opt/paperless-gpt_version.txt"
         msg_ok "Updated Paperless-GPT to ${RELEASE}"
 
         msg_info "Starting Service"
         systemctl start paperless-gpt
         msg_ok "Started Service"
+
+        msg_info "Cleaning Up"
+        rm -f $temp_file
+        msg_ok "Cleanup Completed"
         msg_ok "Updated successfully!"
     else
         msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/part-db.sh

@@ -52,14 +52,17 @@ function update_script() {
     $STD php bin/console cache:clear
     $STD php bin/console doctrine:migrations:migrate -n
     chown -R www-data:www-data /opt/partdb
-    rm -r "/opt/v${RELEASE}.zip"
-    rm -r /opt/partdb-backup
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start apache2
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -r "/opt/v${RELEASE}.zip"
+    rm -r /opt/partdb-backup
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/pelican-panel.sh

@@ -67,7 +67,6 @@ function update_script() {
     $STD php artisan migrate --seed --force
     chown -R www-data:www-data /opt/pelican-panel
     chmod -R 755 /opt/pelican-panel/storage /opt/pelican-panel/bootstrap/cache/
-    rm -rf "/opt/pelican-panel/panel.tar.gz"
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
@@ -75,6 +74,10 @@ function update_script() {
     $STD php artisan queue:restart
     $STD php artisan up
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -rf "/opt/pelican-panel/panel.tar.gz"
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/pterodactyl-panel.sh

@@ -70,7 +70,6 @@ EOF
     $STD php artisan migrate --seed --force --no-interaction
     chown -R www-data:www-data /opt/pterodactyl-panel/*
     chmod -R 755 /opt/pterodactyl-panel/storage /opt/pterodactyl-panel/bootstrap/cache/
-    rm -rf "/opt/pterodactyl-panel/panel.tar.gz"
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
@@ -78,6 +77,10 @@ EOF
     $STD php artisan queue:restart
     $STD php artisan up
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -rf "/opt/pterodactyl-panel/panel.tar.gz"
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/rdtclient.sh

@@ -43,11 +43,14 @@ function update_script() {
       $STD apt remove --purge -y dotnet-sdk-8.0
       $STD apt install -y dotnet-sdk-9.0
     fi
-    rm -rf /opt/rdtc-backup
 
     msg_info "Starting Service"
     systemctl start rdtc
     msg_ok "Started Service"
+
+    msg_info "Cleaning Up"
+    rm -rf /opt/rdtc-backup
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/reactive-resume.sh

@@ -54,7 +54,6 @@ function update_script() {
     cd /tmp
     curl -fsSL https://dl.min.io/server/minio/release/linux-amd64/minio.deb -o minio.deb
     $STD dpkg -i minio.deb
-    rm -f /tmp/minio.deb
     msg_ok "Updated Minio"
 
     msg_info "Updating Browserless (Patience)"
@@ -76,12 +75,16 @@ function update_script() {
     $STD npm run build:function
     $STD npm prune production
     mv /opt/browserless.env /opt/browserless/.env
-    rm -f "$brwsr_tmp"
     msg_ok "Updated Browserless"
 
     msg_info "Restarting services"
     systemctl start minio Reactive-Resume browserless
     msg_ok "Restarted services"
+
+    msg_info "Cleaning Up"
+    rm -f /tmp/minio.deb
+    rm -f "$brwsr_tmp"
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/revealjs.sh

@@ -41,12 +41,15 @@ function update_script() {
     $STD npm install
     cp -f /opt/index.html /opt/revealjs
     sed -i '25s/localhost/0.0.0.0/g' /opt/revealjs/gulpfile.js
-    rm -f /opt/index.html
     msg_ok "Updated $APP"
 
     msg_info "Starting Service"
     systemctl start revealjs
     msg_ok "Started Service"
+
+    msg_info "Cleaning Up"
+    rm -f /opt/index.html
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/slskd.sh

@@ -61,12 +61,15 @@ function update_script() {
   $STD pip install -r requirements.txt
   mv /opt/config.ini.bak /opt/soularr/config.ini
   mv /opt/run.sh.bak /opt/soularr/run.sh
-  rm -rf /tmp/main.zip
   msg_ok "Updated soularr"
 
   msg_info "Starting soularr timer"
   systemctl start soularr.timer
   msg_ok "Started soularr timer"
+
+  msg_info "Cleaning Up"
+  rm -rf /tmp/main.zip
+  msg_ok "Cleanup Completed"
   exit
 }
 

ct/spoolman.sh

@@ -43,13 +43,17 @@ function update_script() {
     cd spoolman
     $STD pip3 install -r requirements.txt
     curl -fsSL "https://raw.githubusercontent.com/Donkie/Spoolman/master/.env.example" -o ".env"
-    rm -rf /opt/spoolman.zip
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP} to ${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start spoolman
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -rf /opt/spoolman.zip
+    msg_ok "Cleaned"
+
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/tandoor.sh

@@ -64,13 +64,16 @@ EOF
     cd /opt/tandoor
     $STD /opt/tandoor/.venv/bin/python manage.py migrate
     $STD /opt/tandoor/.venv/bin/python manage.py collectstatic --no-input
-    rm -rf /opt/tandoor.bak
     msg_ok "Updated Trandoor"
 
     msg_info "Starting Service"
     systemctl start tandoor
     systemctl reload nginx
     msg_ok "Started Service"
+
+    msg_info "Cleaning Up"
+    rm -rf /opt/tandoor.bak
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/tasmocompiler.sh

@@ -45,13 +45,16 @@ function update_script() {
     export NODE_OPTIONS=--openssl-legacy-provider
     $STD npm i
     $STD yarn build
-    rm -r "/opt/v${RELEASE}.tar.gz"
-    echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated TasmoCompiler"
 
     msg_info "Starting Service"
     systemctl start tasmocompiler
     msg_ok "Started Service"
+
+    echo "${RELEASE}" >/opt/${APP}_version.txt
+    msg_info "Cleaning up"
+    rm -r "/opt/v${RELEASE}.tar.gz"
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/tdarr.sh

@@ -37,8 +37,11 @@ function update_script() {
   $STD unzip Tdarr_Updater.zip
   chmod +x Tdarr_Updater
   $STD ./Tdarr_Updater
-  rm -rf /opt/tdarr/Tdarr_Updater.zip
   msg_ok "Updated Tdarr"
+
+  msg_info "Cleaning up"
+  rm -rf /opt/tdarr/Tdarr_Updater.zip
+  msg_ok "Cleaned up"
   msg_ok "Updated successfully!"
   exit
 }

ct/technitiumdns.sh

@@ -38,8 +38,11 @@ function update_script() {
     msg_info "Updating Technitium DNS"
     curl -fsSL "https://download.technitium.com/dns/DnsServerPortable.tar.gz" -o /opt/DnsServerPortable.tar.gz
     $STD tar zxvf /opt/DnsServerPortable.tar.gz -C /opt/technitium/dns/
-    rm -f /opt/DnsServerPortable.tar.gz
     msg_ok "Updated Technitium DNS"
+
+    msg_info "Cleaning up"
+    rm -f /opt/DnsServerPortable.tar.gz
+    msg_ok "Cleaned up"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required.  Technitium DNS is already at v${RELEASE}."

ct/teddycloud.sh

@@ -41,12 +41,15 @@ function update_script() {
 
     msg_info "Restoring data"
     cp -R /opt/teddycloud_bak/certs /opt/teddycloud_bak/config /opt/teddycloud_bak/data /opt/teddycloud
-    rm -rf /opt/teddycloud_bak
     msg_ok "Data restored"
 
     msg_info "Starting Service"
     systemctl start teddycloud
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -rf /opt/teddycloud_bak
+    msg_ok "Cleaned up"
     msg_ok "Updated successfully!"
   fi
   exit

ct/tianji.sh

@@ -43,7 +43,7 @@ function update_script() {
 
     fetch_and_deploy_gh_release "tianji" "msgbyte/tianji"
 
-    msg_info "Updating Tianji"
+    msg_info "Updating ${APP}"
     cd /opt/tianji
     export NODE_OPTIONS="--max_old_space_size=4096"
     $STD pnpm install --filter @tianji/client... --config.dedupe-peer-dependents=false --frozen-lockfile
@@ -55,11 +55,7 @@ function update_script() {
     mv /opt/.env /opt/tianji/src/server/.env
     cd src/server
     $STD pnpm db:migrate:apply
-    rm -rf /opt/tianji_bak
-    rm -rf /opt/tianji/src/client
-    rm -rf /opt/tianji/website
-    rm -rf /opt/tianji/reporter
-    msg_ok "Updated Tianji"
+    msg_ok "Updated ${APP}"
 
     msg_info "Updating AppRise"
     $STD uv pip install apprise cryptography --system
@@ -68,6 +64,13 @@ function update_script() {
     msg_info "Starting Service"
     systemctl start tianji
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -rf /opt/tianji_bak
+    rm -rf /opt/tianji/src/client
+    rm -rf /opt/tianji/website
+    rm -rf /opt/tianji/reporter
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/traccar.sh

@@ -50,12 +50,18 @@ function update_script() {
     mv /opt/traccar.xml /opt/traccar/conf
     [[ -d /opt/data ]] && mv /opt/data /opt/traccar
     [[ -d /opt/media ]] && mv /opt/media /opt/traccar
-    [ -f README.txt ] || [ -f traccar.run ] && rm -f README.txt traccar.run
     msg_ok "Data restored"
 
     msg_info "Starting Service"
     systemctl start traccar
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    [ -f README.txt ] || [ -f traccar.run ] && rm -f README.txt traccar.run
+    $STD apt -y autoremove
+    $STD apt -y autoclean
+    $STD apt -y clean
+    msg_ok "Cleaned up"
     msg_ok "Updated successfully!"
   fi
   exit

ct/trilium.sh

@@ -55,9 +55,15 @@ function update_script() {
     msg_info "Restoring Database"
     mkdir -p "$(dirname "${DB_RESTORE_PATH}")"
     cp -r /opt/trilium_backup/$(basename "${DB_PATH}") "${DB_RESTORE_PATH}"
-    rm -rf /opt/trilium_backup
     msg_ok "Restored Database"
 
+    msg_info "Cleaning up"
+    rm -rf /opt/trilium_backup
+    $STD apt -y autoremove
+    $STD apt -y autoclean
+    $STD apt -y clean
+    msg_ok "Cleaned"
+
     msg_info "Starting Service"
     systemctl start trilium
     sleep 1

ct/uhf.sh

@@ -43,6 +43,12 @@ function update_script() {
     msg_info "Starting Service"
     systemctl start uhf-server
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    $STD apt -y autoremove
+    $STD apt -y autoclean
+    $STD apt -y clean
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/vaultwarden.sh

@@ -57,9 +57,12 @@ function update_script() {
     else
       cp target/release/vaultwarden /opt/vaultwarden/bin/
     fi
-    cd ~ && rm -rf vaultwarden
     msg_ok "Updated VaultWarden"
 
+    msg_info "Cleaning up"
+    cd ~ && rm -rf vaultwarden
+    msg_ok "Cleaned"
+
     msg_info "Starting Service"
     systemctl start vaultwarden
     msg_ok "Started Service"
@@ -74,9 +77,12 @@ function update_script() {
     msg_info "Updating Web-Vault to $WVRELEASE"
     $STD curl -fsSLO https://github.com/dani-garcia/bw_web_builds/releases/download/"$WVRELEASE"/bw_web_"$WVRELEASE".tar.gz
     $STD tar -zxf bw_web_"$WVRELEASE".tar.gz -C /opt/vaultwarden/
-    rm bw_web_"$WVRELEASE".tar.gz
     msg_ok "Updated Web-Vault"
 
+    msg_info "Cleaning up"
+    rm bw_web_"$WVRELEASE".tar.gz
+    msg_ok "Cleaned"
+
     msg_info "Starting Service"
     systemctl start vaultwarden
     msg_ok "Started Service"

ct/vikunja.sh

@@ -39,13 +39,16 @@ function update_script() {
     curl -fsSL "https://dl.vikunja.io/vikunja/$RELEASE/vikunja-$RELEASE-amd64.deb" -o $(basename "https://dl.vikunja.io/vikunja/$RELEASE/vikunja-$RELEASE-amd64.deb")
     export DEBIAN_FRONTEND=noninteractive
     $STD dpkg -i vikunja-"$RELEASE"-amd64.deb
-    rm -rf /opt/vikunja-"$RELEASE"-amd64.deb
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP}"
 
     msg_info "Starting Service"
     systemctl start vikunja
     msg_ok "Started Service"
+
+    msg_info "Cleaning Up"
+    rm -rf /opt/vikunja-"$RELEASE"-amd64.deb
+    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/wastebin.sh

@@ -73,13 +73,16 @@ EOF
     cp -f wastebin* /opt/wastebin/
     chmod +x /opt/wastebin/wastebin
     chmod +x /opt/wastebin/wastebin-ctl
-    rm -f "$temp_file"
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated Wastebin"
 
     msg_info "Starting Wastebin"
     systemctl start wastebin
     msg_ok "Started Wastebin"
+
+    msg_info "Cleaning Up"
+    rm -f "$temp_file"
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/watchyourlan.sh

@@ -37,7 +37,10 @@ function update_script() {
     fetch_and_deploy_gh_release "watchyourlan" "aceberg/WatchYourLAN" "binary"
     cp -R config.yaml /data/config.yaml
     sed -i 's|/etc/watchyourlan/config.yaml|/data/config.yaml|' /lib/systemd/system/watchyourlan.service
+
+    msg_info "Cleaning up"
     rm ~/config.yaml
+    msg_ok "Cleaned up"
 
     msg_info "Starting service"
     systemctl enable -q --now watchyourlan

ct/wger.sh

@@ -45,13 +45,16 @@ function update_script() {
     $STD python3 manage.py collectstatic --no-input
     $STD yarn install
     $STD yarn build:css:sass
-    rm -rf "$temp_file"
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start wger
     msg_ok "Started Service"
+
+    msg_info "Cleaning Up"
+    rm -rf "$temp_file"
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/wikijs.sh

@@ -54,12 +54,15 @@ function update_script() {
     msg_info "Restoring Data"
     cp -R /opt/wikijs-backup/* /opt/wikijs
     $SQLITE_INSTALL && $STD npm rebuild sqlite3
-    rm -rf /opt/wikijs-backup
     msg_ok "Restored Data"
 
     msg_info "Starting Service"
     systemctl start wikijs
     msg_ok "Started Service"
+
+    msg_info "Cleaning Up"
+    rm -rf /opt/wikijs-backup
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/wizarr.sh

@@ -56,12 +56,15 @@ function update_script() {
     if ! grep -q 'frozen' /opt/wizarr/start.sh; then
       sed -i 's/run/& --frozen/' /opt/wizarr/start.sh
     fi
-    rm -rf "$BACKUP_FILE"
     msg_ok "Updated Wizarr"
 
     msg_info "Starting Service"
     systemctl start wizarr
     msg_ok "Started Service"
+
+    msg_info "Cleaning Up"
+    rm -rf "$BACKUP_FILE"
+    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/zabbix.sh

@@ -59,7 +59,6 @@ function update_script() {
     xargs -I{} echo "https://repo.zabbix.com/zabbix/{}/release/debian/pool/main/z/zabbix-release/zabbix-release_latest+debian13_all.deb")" \
     -o /tmp/zabbix-release_latest+debian13_all.deb
   $STD dpkg -i zabbix-release_latest+debian13_all.deb
-  rm -rf /tmp/zabbix-release_latest+debian13_all.deb
   $STD apt update
 
   $STD apt install --only-upgrade zabbix-server-pgsql zabbix-frontend-php php8.4-pgsql
@@ -89,6 +88,13 @@ function update_script() {
   systemctl start "$AGENT_SERVICE"
   systemctl restart apache2
   msg_ok "Started Services"
+
+  msg_info "Cleaning Up"
+  rm -rf /tmp/zabbix-release_latest+debian13_all.deb
+  $STD apt -y autoremove
+  $STD apt -y autoclean
+  $STD apt -y clean
+  msg_ok "Cleaned"
   msg_ok "Updated successfully!"
   exit
 }

ct/zigbee2mqtt.sh

@@ -50,12 +50,15 @@ function update_script() {
     grep -q "^packageImportMethod" ./pnpm-workspace.yaml || echo "packageImportMethod: hardlink" >> ./pnpm-workspace.yaml
     $STD pnpm install --frozen-lockfile
     $STD pnpm build
-    rm -rf /opt/z2m_backup
     msg_ok "Updated Zigbee2MQTT"
 
     msg_info "Starting Service"
     systemctl start zigbee2mqtt
     msg_ok "Started Service"
+
+    msg_info "Cleaning up"
+    rm -rf /opt/z2m_backup
+    msg_ok "Cleaned up"
     msg_ok "Updated successfully!"
   fi
   exit

install/phpipam-install.sh

@@ -17,7 +17,7 @@ msg_info "Installing Dependencies"
 $STD apt install -y fping
 msg_ok "Installed Dependencies"
 
-PHP_VERSION="8.3" PHP_APACHE="YES" PHP_FPM="YES" PHP_MODULE="pdo,pdo-mysql,gmp,snmp,ldap,apcu" setup_php
+PHP_VERSION="8.3" PHP_APACHE="YES" PHP_FPM="YES" PHP_MODULE="mysql,gmp,snmp,ldap,apcu" setup_php
 
 msg_info "Installing PHP-PEAR"
 $STD apt install -y \

misc/tools.func

@@ -3628,15 +3628,11 @@ function setup_php() {
   local CURRENT_PHP=""
   CURRENT_PHP=$(is_tool_installed "php" 2>/dev/null) || true
 
-  # CRITICAL: If wrong version is installed, remove it FIRST before any pinning
-  if [[ -n "$CURRENT_PHP" && "$CURRENT_PHP" != "$PHP_VERSION" ]]; then
-    msg_info "Removing conflicting PHP ${CURRENT_PHP} (need ${PHP_VERSION})"
-    stop_all_services "php.*-fpm"
-    $STD apt-get purge -y "php*" 2>/dev/null || true
-    $STD apt-get autoremove -y 2>/dev/null || true
-  fi
+  # Scenario 1: Already at target version - just update packages
+  if [[ -n "$CURRENT_PHP" && "$CURRENT_PHP" == "$PHP_VERSION" ]]; then
+    msg_info "Update PHP $PHP_VERSION"
 
-  # NOW create pinning for the desired version
+    # Ensure pinning exists even for updates (prevent unwanted version changes)
     mkdir -p /etc/apt/preferences.d
     cat <<EOF >/etc/apt/preferences.d/php-pin
 Package: php${PHP_VERSION}*
@@ -3648,12 +3644,58 @@ Pin: release o=packages.sury.org-php
 Pin-Priority: -1
 EOF
 
-  # Setup repository
+    # Ensure Sury repo is available
+    if [[ ! -f /etc/apt/sources.list.d/php.sources ]]; then
+      manage_tool_repository "php" "$PHP_VERSION" "" "https://packages.sury.org/debsuryorg-archive-keyring.deb" || {
+        msg_error "Failed to setup PHP repository"
+        return 1
+      }
+    fi
+
+    ensure_apt_working || return 1
+    $STD apt-get update
+
+    # Perform upgrade with retry logic (non-fatal if fails)
+    upgrade_packages_with_retry "php${PHP_VERSION}" || true
+
+    cache_installed_version "php" "$PHP_VERSION"
+    msg_ok "Update PHP $PHP_VERSION"
+  else
+    # Scenario 2: Different version installed - clean upgrade
+    if [[ -n "$CURRENT_PHP" && "$CURRENT_PHP" != "$PHP_VERSION" ]]; then
+      msg_info "Upgrade PHP from $CURRENT_PHP to $PHP_VERSION"
+      # Stop and disable ALL PHP-FPM versions
+      stop_all_services "php.*-fpm"
+    else
+      msg_info "Setup PHP $PHP_VERSION"
+    fi
+
+    # Create APT pinning BEFORE any repo changes to ensure correct version is selected
+    mkdir -p /etc/apt/preferences.d
+    cat <<EOF >/etc/apt/preferences.d/php-pin
+Package: php${PHP_VERSION}*
+Pin: version ${PHP_VERSION}.*
+Pin-Priority: 1001
+
+Package: php[0-9].*
+Pin: release o=packages.sury.org-php
+Pin-Priority: -1
+EOF
+
+    # Prepare repository (cleanup + validation)
     prepare_repository_setup "php" "deb.sury.org-php" || {
       msg_error "Failed to prepare PHP repository"
       return 1
     }
 
+    # Remove ALL conflicting PHP versions (critical for version enforcement)
+    if [[ -n "$CURRENT_PHP" && "$CURRENT_PHP" != "$PHP_VERSION" ]]; then
+      msg_info "Removing PHP ${CURRENT_PHP}"
+      $STD apt-get purge -y "php${CURRENT_PHP}*" "libapache2-mod-php${CURRENT_PHP}*" 2>/dev/null || true
+      $STD apt-get autoremove -y 2>/dev/null || true
+    fi
+
+    # Setup Sury repository
     manage_tool_repository "php" "$PHP_VERSION" "" "https://packages.sury.org/debsuryorg-archive-keyring.deb" || {
       msg_error "Failed to setup PHP repository"
       return 1
@@ -3661,6 +3703,7 @@ EOF
 
     ensure_apt_working || return 1
     $STD apt-get update
+  fi
 
   # Get available PHP version from repository
   local AVAILABLE_PHP_VERSION=""
@@ -3671,16 +3714,39 @@ EOF
     return 1
   fi
 
-  # Build module list - without version pinning (preferences.d handles it)
-  local MODULE_LIST="php${PHP_VERSION}"
+  # Build module list with version constraints
+  local MODULE_LIST="php${PHP_VERSION}=${AVAILABLE_PHP_VERSION}-*"
+  local FAILED_MODULES=()
+  local INSTALLED_MODULES=()
 
   IFS=',' read -ra MODULES <<<"$COMBINED_MODULES"
   for mod in "${MODULES[@]}"; do
-    MODULE_LIST+=" php${PHP_VERSION}-${mod}"
+    local pkg_name="php${PHP_VERSION}-${mod}"
+    if apt-cache search "^${pkg_name}\$" 2>/dev/null | grep -q "^${pkg_name}"; then
+      MODULE_LIST+=" ${pkg_name}=${AVAILABLE_PHP_VERSION}-*"
+      INSTALLED_MODULES+=("${pkg_name}")
+    else
+      FAILED_MODULES+=("${pkg_name}")
+    fi
   done
 
   if [[ "$PHP_FPM" == "YES" ]]; then
-    MODULE_LIST+=" php${PHP_VERSION}-fpm"
+    local fpm_pkg="php${PHP_VERSION}-fpm"
+    if apt-cache search "^${fpm_pkg}\$" 2>/dev/null | grep -q "^${fpm_pkg}"; then
+      MODULE_LIST+=" ${fpm_pkg}=${AVAILABLE_PHP_VERSION}-*"
+      INSTALLED_MODULES+=("${fpm_pkg}")
+    else
+      FAILED_MODULES+=("${fpm_pkg}")
+    fi
+  fi
+
+  # Only warn if there are genuinely missing modules
+  if [[ ${#FAILED_MODULES[@]} -gt 0 ]]; then
+    msg_warn "Modules not available for PHP ${PHP_VERSION}: ${FAILED_MODULES[*]}"
+  fi
+
+  if [[ ${#INSTALLED_MODULES[@]} -gt 0 ]]; then
+    msg_info "Will install modules: ${INSTALLED_MODULES[*]}"
   fi
 
   # install apache2 with PHP support if requested
@@ -3691,47 +3757,34 @@ EOF
         msg_error "Failed to install Apache"
         return 1
       }
-      install_packages_with_retry "libapache2-mod-php${PHP_VERSION}" || {
+      install_packages_with_retry "libapache2-mod-php${PHP_VERSION}=${AVAILABLE_PHP_VERSION}-*" || {
         msg_warn "Failed to install libapache2-mod-php${PHP_VERSION}, continuing without Apache module"
       }
     fi
   fi
 
-  # Install PHP packages (pinning via preferences.d ensures correct version)
-  msg_info "Installing PHP ${PHP_VERSION} packages"
+  # Install PHP packages with explicit version constraints
+  msg_info "Installing PHP ${PHP_VERSION} packages (version ${AVAILABLE_PHP_VERSION})"
   if ! install_packages_with_retry $MODULE_LIST; then
-    msg_warn "Failed to install PHP packages, attempting individual installation"
-
-    # Install main package first (critical)
+    msg_warn "Failed to install PHP packages with version constraints, attempting without version pins"
     install_packages_with_retry "php${PHP_VERSION}" || {
       msg_error "Failed to install php${PHP_VERSION}"
       return 1
     }
 
-    # Try to install Apache module individually if requested
-    if [[ "$PHP_APACHE" == "YES" ]]; then
-      install_packages_with_retry "libapache2-mod-php${PHP_VERSION}" || {
-        msg_warn "Could not install libapache2-mod-php${PHP_VERSION}"
-      }
-    fi
-
-    # Try to install modules individually - skip those that don't exist
+    # Try to install modules individually without version constraint
     for pkg in "${MODULES[@]}"; do
-      if apt-cache search "^php${PHP_VERSION}-${pkg}\$" 2>/dev/null | grep -q "^php${PHP_VERSION}-${pkg}"; then
       install_packages_with_retry "php${PHP_VERSION}-${pkg}" || {
         msg_warn "Could not install php${PHP_VERSION}-${pkg}"
       }
-      fi
     done
 
     if [[ "$PHP_FPM" == "YES" ]]; then
-      if apt-cache search "^php${PHP_VERSION}-fpm\$" 2>/dev/null | grep -q "^php${PHP_VERSION}-fpm"; then
       install_packages_with_retry "php${PHP_VERSION}-fpm" || {
         msg_warn "Could not install php${PHP_VERSION}-fpm"
       }
     fi
   fi
-  fi
   cache_installed_version "php" "$PHP_VERSION"
 
   # Patch all relevant php.ini files