diff --git a/frontend/public/json/pihole-exporter.json b/frontend/public/json/pihole-exporter.json
new file mode 100644
index 000000000..c94dc167c
--- /dev/null
+++ b/frontend/public/json/pihole-exporter.json
@@ -0,0 +1,46 @@
+{
+  "name": "Pi-Hole Exporter",
+  "slug": "pihole-exporter",
+  "categories": [
+    9
+  ],
+  "date_created": "2025-12-08",
+  "type": "addon",
+  "updateable": true,
+  "privileged": false,
+  "interface_port": 9617,
+  "documentation": "https://github.com/eko/pihole-exporter",
+  "website": "https://github.com/eko/pihole-exporter",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@master/webp/pi-hole.webp",
+  "config_path": "/opt/pihole-exporter.env",
+  "description": "A Prometheus exporter for PI-Hole's Raspberry PI ad blocker",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "tools/addon/pihole-exporter.sh",
+      "resources": {
+        "cpu": null,
+        "ram": null,
+        "hdd": null,
+        "os": null,
+        "version": null
+      }
+    },
+    {
+      "type": "alpine",
+      "script": "tools/addon/pihole-exporter.sh",
+      "resources": {
+        "cpu": null,
+        "ram": null,
+        "hdd": null,
+        "os": null,
+        "version": null
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": null,
+    "password": null
+  },
+  "notes": []
+}
diff --git a/tools/addon/pihole-exporter.sh b/tools/addon/pihole-exporter.sh
new file mode 100644
index 000000000..ff6944181
--- /dev/null
+++ b/tools/addon/pihole-exporter.sh
@@ -0,0 +1,145 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2025 community-scripts ORG
+# Author: CrazyWolf13
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://github.com/eko/pihole-exporter/
+
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/core.func)
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/tools.func)
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func)
+
+VERBOSE=${var_verbose:-no}
+APP="pihole-exporter"
+APP_TYPE="tools"
+INSTALL_PATH="/opt/pihole-exporter/"
+CONFIG_PATH="/opt/pihole.env"
+header_info
+ensure_usr_local_bin_persist
+get_current_ip &>/dev/null
+
+# OS Detection
+if [[ -f "/etc/alpine-release" ]]; then
+  OS="Alpine"
+  SERVICE_PATH="/etc/init.d/pihole-exporter"
+elif grep -qE 'ID=debian|ID=ubuntu' /etc/os-release; then
+  OS="Debian"
+  SERVICE_PATH="/etc/systemd/system/pihole-exporter.service"
+else
+  echo -e "${CROSS} Unsupported OS detected. Exiting."
+  exit 1
+fi
+
+# Existing installation
+if [[ -f "$INSTALL_PATH" ]]; then
+  echo -e "${YW}⚠️ pihole-exporter is already installed.${CL}"
+  echo -n "Uninstall ${APP}? (y/N): "
+  read -r uninstall_prompt
+  if [[ "${uninstall_prompt,,}" =~ ^(y|yes)$ ]]; then
+    msg_info "Uninstalling pihole-exporter"
+    if [[ "$OS" == "Debian" ]]; then
+      systemctl disable --now pihole-exporter.service &>/dev/null
+      rm -f "$SERVICE_PATH"
+    else
+      rc-service pihole-exporter stop &>/dev/null
+      rc-update del pihole-exporter &>/dev/null
+      rm -f "$SERVICE_PATH"
+    fi
+    rm -f "$INSTALL_PATH" "$CONFIG_PATH" ~/.pihole-exporter
+    msg_ok "${APP} has been uninstalled."
+    exit 0
+  fi
+
+  echo -n "Update pihole-exporter? (y/N): "
+  read -r update_prompt
+  if [[ "${update_prompt,,}" =~ ^(y|yes)$ ]]; then
+    if check_for_gh_release "pihole-exporter" "eko/pihole-exporter"; then
+      fetch_and_deploy_gh_release "pihole-exporter" "eko/pihole-exporter"
+      setup_go
+      msg_info "Updating pihole-exporter"
+      cd /opt/pihole-exporter/
+      /usr/local/bin/go build -o ./pihole-exporter
+      msg_ok "Updated Successfully!"
+    fi
+    exit 0
+  else
+    echo -e "${YW}⚠️ Update skipped. Exiting.${CL}"
+    exit 0
+  fi
+fi
+
+echo -e "${YW}⚠️ pihole-exporter is not installed.${CL}"
+echo -n "Enter URL of pihole, example: (http://127.0.0.1): "
+read -rs pihole_HOSTNAME
+
+echo -n "Enter pihole password: "
+read -er pihole_PASSWORD
+
+echo -n "Do you want to skip TLS-Verification (if using a self-signed Certificate on Pi-Hole) [y/N]: "
+read -rs pihole_SKIP_TLS
+echo ""
+if ! [[ "${pihole_SKIP_TLS,,}" =~ ^(y|yes)$ ]]; then
+  pihole_SKIP_TLS="true"
+fi
+
+fetch_and_deploy_gh_release "pihole-exporter" "eko/pihole-exporter" "tarball" "latest"
+setup_go
+msg_info "Installing pihole-exporter on ${OS}"
+cd /opt/pihole-exporter/
+/usr/local/bin/go build -o ./pihole-exporter
+msg_ok "Installed pihole-exporter"
+
+msg_info "Creating configuration"
+cat <<EOF >"$CONFIG_PATH"
+# https://github.com/eko/pihole-exporter/?tab=readme-ov-file#available-cli-options
+PIHOLE_PASSWORD="${pihole_PASSWORD}"
+PIHOLE_hostname="${pihole_HOSTNAME}"
+SKIP_TLS_VERIFICATION="${pihole_SKIP_TLS}"
+EOF
+msg_ok "Created configuration"
+
+msg_info "Creating service"
+if [[ "$OS" == "Debian" ]]; then
+  cat <<EOF >"$SERVICE_PATH"
+[Unit]
+Description=pihole-exporter
+After=network.target
+
+[Service]
+User=root
+WorkingDirectory=/opt/pihole-exporter
+EnvironmentFile=$CONFIG_PATH
+ExecStart=/opt/pihole-exporter/pihole-exporter
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+EOF
+  systemctl enable -q --now pihole-exporter
+else
+  cat <<EOF >"$SERVICE_PATH"
+#!/sbin/openrc-run
+
+command="$INSTALL_PATH"
+command_args=""
+command_background=true
+directory="/opt/pihole-exporter"
+pidfile="/opt/pihole-exporter/pidfile"
+
+depend() {
+    need net
+}
+
+start_pre() {
+    if [ -f "$CONFIG_PATH" ]; then
+        export \$(grep -v '^#' $CONFIG_PATH | xargs)
+    fi
+}
+EOF
+  chmod +x "$SERVICE_PATH"
+  rc-update add pihole-exporter default &>/dev/null
+  rc-service pihole-exporter start &>/dev/null
+fi
+msg_ok "Service created successfully"
+
+echo -e "${CM} ${GN}${APP} is reachable at: ${BL}http://$CURRENT_IP:9617/metrics${CL}"
diff --git a/tools/addon/qbittorrent-exporter.sh b/tools/addon/qbittorrent-exporter.sh
index 29e1dff90..970c49a0f 100644
--- a/tools/addon/qbittorrent-exporter.sh
+++ b/tools/addon/qbittorrent-exporter.sh
@@ -3,6 +3,7 @@
 # Copyright (c) 2021-2025 community-scripts ORG
 # Author: CrazyWolf13
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://github.com/martabal/qbittorrent-exporter
 
 source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/core.func)
 source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/tools.func)
@@ -53,7 +54,7 @@ if [[ -f "$INSTALL_PATH" ]]; then
   read -r update_prompt
   if [[ "${update_prompt,,}" =~ ^(y|yes)$ ]]; then
     if check_for_gh_release "qbittorrent-exporter" "martabal/qbittorrent-exporter"; then
-      fetch_and_deploy_gh_release "qbittorrent-exporter" "martabal/qbittorrent-exporter" 
+      fetch_and_deploy_gh_release "qbittorrent-exporter" "martabal/qbittorrent-exporter"
       setup_go
       msg_info "Updating qbittorrent-exporter"
       cd /opt/qbittorrent-exporter/src
@@ -66,9 +67,9 @@ if [[ -f "$INSTALL_PATH" ]]; then
     exit 0
   fi
 fi
- 
+
 echo -e "${YW}⚠️ qbittorrent-exporter is not installed.${CL}"
-echo -n "Enter URL of qbittorrent example: (http://192.168.1.10:8080): "
+echo -n "Enter URL of qbittorrent, example: (http://127.0.0.1:8080): "
 read -er QBITTORRENT_BASE_URL
 
 echo -n "Enter qbittorrent username: "
@@ -85,7 +86,7 @@ if ! [[ "${install_prompt,,}" =~ ^(y|yes)$ ]]; then
   exit 0
 fi
 
-fetch_and_deploy_gh_release "qbittorrent-exporter" "martabal/qbittorrent-exporter" "tarball" "v1.12.0"
+fetch_and_deploy_gh_release "qbittorrent-exporter" "martabal/qbittorrent-exporter" "tarball" "latest"
 setup_go
 msg_info "Installing qbittorrent-exporter on ${OS}"
 cd /opt/qbittorrent-exporter/src
@@ -94,9 +95,10 @@ msg_ok "Installed qbittorrent-exporter"
 
 msg_info "Creating configuration"
 cat <<EOF >"$CONFIG_PATH"
-QBITTORRENT_BASE_URL=${QBITTORRENT_BASE_URL}
-QBITTORRENT_USERNAME=${QBITTORRENT_USERNAME}
-QBITTORRENT_PASSWORD=${QBITTORRENT_PASSWORD}
+# https://github.com/martabal/qbittorrent-exporter?tab=readme-ov-file#parameters
+QBITTORRENT_BASE_URL="${QBITTORRENT_BASE_URL}"
+QBITTORRENT_USERNAME="${QBITTORRENT_USERNAME}"
+QBITTORRENT_PASSWORD="${QBITTORRENT_PASSWORD}"
 EOF
 msg_ok "Created configuration"
 
@@ -117,7 +119,7 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-  systemctl enable --now qbittorrent-exporter &>/dev/null
+  systemctl enable -q --now qbittorrent-exporter
 else
   cat <<EOF >"$SERVICE_PATH"
 #!/sbin/openrc-run