diff --git a/pi-hole-dhcp/2024.07.0/data.yml b/pi-hole-dhcp/2024.07.0/data.yml
new file mode 100644
index 000000000..419bd4716
--- /dev/null
+++ b/pi-hole-dhcp/2024.07.0/data.yml
@@ -0,0 +1,111 @@
+additionalProperties:
+  formFields:
+    - default: "/home/pihole"
+      edit: true
+      envKey: PIHOLE_ROOT_PATH
+      labelZh: 数据持久化路径
+      labelEn: Data persistence path
+      required: true
+      type: text
+    - default: 8080
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelZh: WebUI 端口
+      labelEn: WebUI port
+      required: true
+      rule: paramPort
+      type: number
+    - default: ""
+      edit: true
+      envKey: WEBPASSWORD
+      labelZh: WebUI 密码
+      labelEn: WebUI password
+      required: true
+      type: text
+    - default: "all"
+      edit: true
+      envKey: DNSMASQ_LISTENING
+      labelZh: 监听地址
+      labelEn: Listening address
+      required: true
+      type: select
+      values:
+        - label: all
+          value: "all"
+        - label: local
+          value: "local"
+        - label: single
+          value: "single"
+    - default: "127.0.0.1"
+      edit: true
+      envKey: FTLCONF_LOCAL_IPV4
+      labelZh: 本地 IPv4 地址
+      labelEn: Local IPv4 address
+      required: true
+      type: text
+    - default: "1.1.1.1;8.8.8.8;114.114.114.114;"
+      edit: true
+      envKey: PIHOLE_DNS_
+      labelZh: 上游 DNS 服务器
+      labelEn: Upstream DNS server
+      required: true
+      type: text
+    - default: ""
+      edit: true
+      envKey: DHCP_START
+      labelZh: DHCP 起始地址
+      labelEn: DHCP start address
+      required: true
+      type: text
+    - default: ""
+      edit: true
+      envKey: DHCP_END
+      labelZh: DHCP 结束地址
+      labelEn: DHCP end address
+      required: true
+      type: text
+    - default: ""
+      edit: true
+      envKey: DHCP_ROUTER
+      labelZh: DHCP 路由/网关 IP
+      labelEn: DHCP router/gateway IP
+      required: true
+      type: text
+    - default: 24
+      edit: true
+      envKey: DHCP_LEASETIME
+      labelZh: DHCP 租约时间
+      labelEn: DHCP lease time
+      required: true
+      type: number
+    - default: "lan"
+      edit: true
+      envKey: PIHOLE_DOMAIN
+      labelZh: DHCP 域名
+      labelEn: DHCP domain
+      required: true
+      type: text
+    - default: "true"
+      edit: true
+      envKey: IPv6
+      labelZh: IPv6 支持
+      labelEn: IPv6 support
+      required: true
+      type: select
+      values:
+        - label: 开启 IPV6
+          value: "true"
+        - label: 关闭 IPV6
+          value: "false"
+    - default: "true"
+      edit: true
+      envKey: DHCP_IPv6
+      labelZh: DHCP IPv6 支持
+      labelEn: DHCP IPv6 support
+      required: true
+      type: select
+      values:
+        - label: 开启 DHCP IPV6
+          value: "true"
+        - label: 关闭 DHCP IPV6
+          value: "false"
diff --git a/pi-hole-dhcp/2024.07.0/docker-compose.yml b/pi-hole-dhcp/2024.07.0/docker-compose.yml
new file mode 100644
index 000000000..b8072aaa9
--- /dev/null
+++ b/pi-hole-dhcp/2024.07.0/docker-compose.yml
@@ -0,0 +1,27 @@
+networks:
+  1panel-network:
+    external: true
+
+services:
+  pihole:
+    image: pihole/pihole:2024.07.0
+    container_name: ${CONTAINER_NAME}
+    labels:
+      createdBy: "Apps"
+    restart: always
+    network_mode: host
+    expose:
+      - 67/udp
+      - 53
+      - 53/udp
+      - ${PANEL_APP_PORT_HTTP}
+    env_file:
+      - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
+      - ${ENV_FILE:-/etc/1panel/envs/default.env}
+    volumes:
+      - ${PIHOLE_ROOT_PATH}/pihole:/etc/pihole
+      - ${PIHOLE_ROOT_PATH}/dnsmasq.d:/etc/dnsmasq.d
+    environment:
+      - WEB_PORT=${PANEL_APP_PORT_HTTP}
+      - TZ=Asia/Shanghai
+      - DHCP_ACTIVE=true
diff --git a/pi-hole-dhcp/2024.07.0/envs/default.env b/pi-hole-dhcp/2024.07.0/envs/default.env
new file mode 100644
index 000000000..cd05f46e6
--- /dev/null
+++ b/pi-hole-dhcp/2024.07.0/envs/default.env
@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+ENV_FILE=.env
diff --git a/pi-hole-dhcp/2024.07.0/envs/global.env b/pi-hole-dhcp/2024.07.0/envs/global.env
new file mode 100644
index 000000000..e10989fe4
--- /dev/null
+++ b/pi-hole-dhcp/2024.07.0/envs/global.env
@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+TZ=Asia/Shanghai
diff --git a/pi-hole-dhcp/2024.07.0/scripts/init.sh b/pi-hole-dhcp/2024.07.0/scripts/init.sh
new file mode 100644
index 000000000..07fb8c3fe
--- /dev/null
+++ b/pi-hole-dhcp/2024.07.0/scripts/init.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  sed -i '/^GLOBAL_ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/pi-hole-dhcp/2024.07.0/scripts/uninstall.sh b/pi-hole-dhcp/2024.07.0/scripts/uninstall.sh
new file mode 100644
index 000000000..c86c4fbca
--- /dev/null
+++ b/pi-hole-dhcp/2024.07.0/scripts/uninstall.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/pi-hole-dhcp/2024.07.0/scripts/upgrade.sh b/pi-hole-dhcp/2024.07.0/scripts/upgrade.sh
new file mode 100644
index 000000000..07fb8c3fe
--- /dev/null
+++ b/pi-hole-dhcp/2024.07.0/scripts/upgrade.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  sed -i '/^GLOBAL_ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/pi-hole-dhcp/README.md b/pi-hole-dhcp/README.md
new file mode 100644
index 000000000..be1cc8a95
--- /dev/null
+++ b/pi-hole-dhcp/README.md
@@ -0,0 +1,23 @@
+# Pi-hole (DHCP)
+
+Pi-hole 是一个 Linux 网络级别的广告和互联网追踪器拦截应用程序，充当一个 DNS 沉洞 以及可选的 DHCP 服务器，旨在用于私有网络。
+
+![Pi-hole](https://file.lifebus.top/imgs/pi_hole_cover.png)
+
+![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue)
+
+## 简介
+
+Pi-hole 是一个 Linux 网络级广告和互联网跟踪器阻止应用程序，它充当 DNS 沉洞和可选的 DHCP
+服务器，旨在在专用网络上使用。它专为具有网络功能的低功耗嵌入式设备（例如 Raspberry Pi）而设计，但几乎可以安装在任何 Linux
+机器上。
+
+## 安装说明
+
+> 当前应用提供 DHCP 功能，且运行在 `Host` 模式下，因此需要关闭宿主机的 DHCP 服务。
+>
+> 请提前关闭宿主机的 `80` `53` `67` 端口占用。
+
+---
+
+![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png)
diff --git a/pi-hole-dhcp/data.yml b/pi-hole-dhcp/data.yml
new file mode 100644
index 000000000..7f8b37905
--- /dev/null
+++ b/pi-hole-dhcp/data.yml
@@ -0,0 +1,14 @@
+additionalProperties:
+  key: pi-hole-dhcp
+  name: Pi-hole (DHCP)
+  tags:
+    - WebSite
+    - Local
+  shortDescZh: DNS 沉洞服务器
+  shortDescEn: DNS Sinkhole Server
+  type: website
+  crossVersionUpdate: true
+  limit: 0
+  website: https://pi-hole.net/
+  github: https://github.com/pi-hole/pi-hole/
+  document: https://docs.pi-hole.net/
diff --git a/pi-hole-dhcp/logo.png b/pi-hole-dhcp/logo.png
new file mode 100644
index 000000000..2512e2b9c
Binary files /dev/null and b/pi-hole-dhcp/logo.png differ
diff --git a/pi-hole/2024.07.0/data.yml b/pi-hole/2024.07.0/data.yml
new file mode 100644
index 000000000..056e3eb86
--- /dev/null
+++ b/pi-hole/2024.07.0/data.yml
@@ -0,0 +1,38 @@
+additionalProperties:
+  formFields:
+    - default: "/home/pihole"
+      edit: true
+      envKey: PIHOLE_ROOT_PATH
+      labelZh: 数据持久化路径
+      labelEn: Data persistence path
+      required: true
+      type: text
+    - default: 8080
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelZh: WebUI 端口
+      labelEn: WebUI port
+      required: true
+      rule: paramPort
+      type: number
+    - default: ""
+      edit: true
+      envKey: WEBPASSWORD
+      labelZh: WebUI 密码
+      labelEn: WebUI password
+      required: true
+      type: text
+    - default: "127.0.0.1"
+      edit: true
+      envKey: FTLCONF_LOCAL_IPV4
+      labelZh: 本地 IPv4 地址
+      labelEn: Local IPv4 address
+      required: true
+      type: text
+    - default: "1.1.1.1;8.8.8.8;114.114.114.114;"
+      edit: true
+      envKey: PIHOLE_DNS_
+      labelZh: 上游 DNS 服务器
+      labelEn: Upstream DNS server
+      required: true
+      type: text
diff --git a/pi-hole/2024.07.0/docker-compose.yml b/pi-hole/2024.07.0/docker-compose.yml
new file mode 100644
index 000000000..301ad1e1b
--- /dev/null
+++ b/pi-hole/2024.07.0/docker-compose.yml
@@ -0,0 +1,25 @@
+networks:
+  1panel-network:
+    external: true
+
+services:
+  pihole:
+    image: pihole/pihole:2024.07.0
+    container_name: ${CONTAINER_NAME}
+    labels:
+      createdBy: "Apps"
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:80
+      - ${PANEL_APP_PORT_DNS}:53
+      - ${PANEL_APP_PORT_DNS}:53/udp
+    env_file:
+      - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
+      - ${ENV_FILE:-/etc/1panel/envs/default.env}
+    volumes:
+      - ${PIHOLE_ROOT_PATH}/pihole:/etc/pihole
+      - ${PIHOLE_ROOT_PATH}/dnsmasq.d:/etc/dnsmasq.d
+    environment:
+      - TZ=Asia/Shanghai
diff --git a/pi-hole/2024.07.0/envs/default.env b/pi-hole/2024.07.0/envs/default.env
new file mode 100644
index 000000000..cd05f46e6
--- /dev/null
+++ b/pi-hole/2024.07.0/envs/default.env
@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+ENV_FILE=.env
diff --git a/pi-hole/2024.07.0/envs/global.env b/pi-hole/2024.07.0/envs/global.env
new file mode 100644
index 000000000..e10989fe4
--- /dev/null
+++ b/pi-hole/2024.07.0/envs/global.env
@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+TZ=Asia/Shanghai
diff --git a/pi-hole/2024.07.0/scripts/init.sh b/pi-hole/2024.07.0/scripts/init.sh
new file mode 100644
index 000000000..07fb8c3fe
--- /dev/null
+++ b/pi-hole/2024.07.0/scripts/init.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  sed -i '/^GLOBAL_ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/pi-hole/2024.07.0/scripts/uninstall.sh b/pi-hole/2024.07.0/scripts/uninstall.sh
new file mode 100644
index 000000000..c86c4fbca
--- /dev/null
+++ b/pi-hole/2024.07.0/scripts/uninstall.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/pi-hole/2024.07.0/scripts/upgrade.sh b/pi-hole/2024.07.0/scripts/upgrade.sh
new file mode 100644
index 000000000..07fb8c3fe
--- /dev/null
+++ b/pi-hole/2024.07.0/scripts/upgrade.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  sed -i '/^GLOBAL_ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/pi-hole/README.md b/pi-hole/README.md
new file mode 100644
index 000000000..1bc52d78a
--- /dev/null
+++ b/pi-hole/README.md
@@ -0,0 +1,17 @@
+# Pi-hole
+
+Pi-hole 是一个 Linux 网络级别的广告和互联网追踪器拦截应用程序，充当一个 DNS 沉洞 以及可选的 DHCP 服务器，旨在用于私有网络。
+
+![Pi-hole](https://file.lifebus.top/imgs/pi_hole_cover.png)
+
+![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue)
+
+## 简介
+
+Pi-hole 是一个 Linux 网络级广告和互联网跟踪器阻止应用程序，它充当 DNS 沉洞和可选的 DHCP
+服务器，旨在在专用网络上使用。它专为具有网络功能的低功耗嵌入式设备（例如 Raspberry Pi）而设计，但几乎可以安装在任何 Linux
+机器上。
+
+---
+
+![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png)
diff --git a/pi-hole/data.yml b/pi-hole/data.yml
new file mode 100644
index 000000000..786e672b6
--- /dev/null
+++ b/pi-hole/data.yml
@@ -0,0 +1,14 @@
+additionalProperties:
+  key: pi-hole
+  name: Pi-hole
+  tags:
+    - WebSite
+    - Local
+  shortDescZh: DNS 沉洞服务器
+  shortDescEn: DNS Sinkhole Server
+  type: website
+  crossVersionUpdate: true
+  limit: 0
+  website: https://pi-hole.net/
+  github: https://github.com/pi-hole/pi-hole/
+  document: https://docs.pi-hole.net/
diff --git a/pi-hole/logo.png b/pi-hole/logo.png
new file mode 100644
index 000000000..2512e2b9c
Binary files /dev/null and b/pi-hole/logo.png differ