diff --git a/ct/npmplus.sh b/ct/npmplus.sh
deleted file mode 100644
index 9e3b0917..00000000
--- a/ct/npmplus.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func)
-# Copyright (c) 2021-2025 community-scripts ORG
-# Author: MickLesk (CanbiZ)
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/ZoeyVid/NPMplus
-
-APP="NPMplus"
-var_tags="${var_tags:-proxy;nginx}"
-var_cpu="${var_cpu:-1}"
-var_ram="${var_ram:-512}"
-var_disk="${var_disk:-3}"
-var_os="${var_os:-alpine}"
-var_version="${var_version:-3.21}"
-var_unprivileged="${var_unprivileged:-1}"
-
-header_info "$APP"
-variables
-color
-catch_errors
-
-function update_script() {
-  UPD=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UPDATE MODE" --radiolist --cancel-button Exit-Script "Spacebar = Select" 14 60 2 \
-    "1" "Check for Alpine Updates" OFF \
-    "2" "Update NPMplus Docker Container" ON \
-    3>&1 1>&2 2>&3)
-
-  header_info "$APP"
-
-  case "$UPD" in
-  "1")
-    msg_info "Updating Alpine OS"
-    $STD apk -U upgrade
-    msg_ok "System updated"
-    exit
-    ;;
-  "2")
-    msg_info "Updating NPMplus Container"
-    cd /opt
-    msg_info "Pulling latest container image"
-    $STD docker compose pull
-    msg_info "Recreating container"
-    $STD docker compose up -d
-    msg_ok "NPMplus container updated"
-    exit
-    ;;
-  esac
-  exit 0
-}
-
-start
-build_container
-description
-
-msg_ok "Completed Successfully!\n"
-echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
-echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}https://${IP}:81${CL}"
diff --git a/install/wallabag-install.sh b/install/wallabag-install.sh
index b9f1c5d7..351e8537 100644
--- a/install/wallabag-install.sh
+++ b/install/wallabag-install.sh
@@ -14,52 +14,46 @@ update_os
 
 msg_info "Installing Dependencies (Patience)"
 $STD apt-get install -y \
-    curl \
-    git \
-    unzip \
-    sudo \
-    make \
-    php8.2 \
-    php8.2-{cli,common,bcmath,intl,fpm,tidy,xml,mysql,mbstring,zip,gd,curl} \
-    composer \
-    apache2 \
-    libapache2-mod-php \
-    redis \
-    mariadb-server
+  make \
+  apache2 \
+  libapache2-mod-php \
+  redis
 msg_ok "Installed Dependencies"
 
+setup_mariadb
+PHP_VERSION="8.3" PHP_APACHE="YES" PHP_FPM="YES" PHP_MODULE="bcmath,bz2,cli,exif,common,curl,tidy,fpm,gd,intl,mbstring,xml,mysql,zip" setup_php
+setup_composer
+
 msg_info "Setting up Database"
 DB_NAME=wallabag_db
 DB_USER=wallabag
 DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
 SECRET_KEY="$(openssl rand -base64 32 | tr -dc 'a-zA-Z0-9' | cut -c1-32)"
-$STD mysql -u root -e "CREATE DATABASE $DB_NAME;"
-$STD mysql -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
-$STD mysql -u root -e "GRANT ALL PRIVILEGES ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
+$STD mariadb -u root -e "CREATE DATABASE $DB_NAME;"
+$STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
+$STD mariadb -u root -e "GRANT ALL PRIVILEGES ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
 {
-    echo "Wallabag Credentials"
-    echo "Database User: $DB_USER"
-    echo "Database Password: $DB_PASS"
-    echo "Database Name: $DB_NAME"
-} >> ~/wallabag.creds
+  echo "Wallabag Credentials"
+  echo "Database User: $DB_USER"
+  echo "Database Password: $DB_PASS"
+  echo "Database Name: $DB_NAME"
+} >>~/wallabag.creds
 msg_ok "Set up Database"
 
+fetch_and_deploy_gh_release "wallabag" "wallabag/wallabag" "prebuild" "latest" "/opt/wallabag" "wallabag-*.tar.gz"
+
 msg_info "Installing Wallabag (Patience)"
-RELEASE=$(curl -s https://api.github.com/repos/wallabag/wallabag/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-wget -q "https://github.com/wallabag/wallabag/archive/refs/tags/${RELEASE}.zip"
-unzip -q ${RELEASE}.zip
-mv wallabag-${RELEASE} /opt/wallabag
 cd /opt/wallabag
 useradd -d /opt/wallabag -s /bin/bash -M wallabag
 chown -R wallabag:wallabag /opt/wallabag
 mv /opt/wallabag/app/config/parameters.yml.dist /opt/wallabag/app/config/parameters.yml
 sed -i \
-    -e 's|database_name: wallabag|database_name: wallabag_db|' \
-    -e 's|database_port: ~|database_port: 3306|' \
-    -e 's|database_user: root|database_user: wallabag|' \
-    -e 's|database_password: ~|database_password: '"$DB_PASS"'|' \
-    -e 's|secret: .*|secret: '"$SECRET_KEY"'|' \
-    /opt/wallabag/app/config/parameters.yml
+  -e 's|database_name: wallabag|database_name: wallabag_db|' \
+  -e 's|database_port: ~|database_port: 3306|' \
+  -e 's|database_user: root|database_user: wallabag|' \
+  -e 's|database_password: ~|database_password: '"$DB_PASS"'|' \
+  -e 's|secret: .*|secret: '"$SECRET_KEY"'|' \
+  /opt/wallabag/app/config/parameters.yml
 
 export COMPOSER_ALLOW_SUPERUSER=1
 sudo -u wallabag make install --no-interaction
@@ -72,7 +66,7 @@ msg_info "Setting up Virtual Host"
 cat <<EOF >/etc/nginx/conf.d/wallabag.conf
 server {
     root /opt/wallabag/web;
-    server_name $IPADDRESS; 
+    server_name $IPADDRESS;
 
     location / {
         # try to serve file directly, fallback to app.php