diff --git a/apps/joplin/3.5.13/.env.sample b/apps/joplin/3.5.13/.env.sample
new file mode 100644
index 000000000..ef537d8cd
--- /dev/null
+++ b/apps/joplin/3.5.13/.env.sample
@@ -0,0 +1,9 @@
+CONTAINER_NAME="joplin"
+PANEL_APP_PORT_HTTP=40339
+PANEL_APP_PORT_HTTPS=40340
+PUID=1000
+PGID=1000
+CUSTOM_USER=admin
+PASSWORD=
+TZ=Asia/Shanghai
+SHM_SIZE=1gb
diff --git a/apps/joplin/3.5.13/data.yml b/apps/joplin/3.5.13/data.yml
new file mode 100644
index 000000000..cc6a0b463
--- /dev/null
+++ b/apps/joplin/3.5.13/data.yml
@@ -0,0 +1,124 @@
+additionalProperties:
+  formFields:
+    - default: 40339
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      label:
+        en: Port
+        zh: 端口
+        zh-hant: 埠
+        ja: ポート
+        ko: 포트
+        ru: Порт
+        ms: Port
+        pt-br: Porta
+      required: true
+      rule: paramPort
+      type: number
+    - default: 40340
+      envKey: PANEL_APP_PORT_HTTPS
+      labelEn: HTTPS Port
+      labelZh: HTTPS 端口
+      label:
+        en: HTTPS Port
+        zh: HTTPS 端口
+        zh-hant: HTTPS 埠
+        ja: HTTPS ポート
+        ko: HTTPS 포트
+        ru: HTTPS порт
+        ms: Port HTTPS
+        pt-br: Porta HTTPS
+      required: true
+      rule: paramPort
+      type: number
+    - default: 1000
+      envKey: PUID
+      labelEn: PUID
+      labelZh: PUID
+      label:
+        en: PUID
+        zh: PUID
+        zh-hant: PUID
+        ja: PUID
+        ko: PUID
+        ru: PUID
+        ms: PUID
+        pt-br: PUID
+      required: true
+      type: number
+    - default: 1000
+      envKey: PGID
+      labelEn: PGID
+      labelZh: PGID
+      label:
+        en: PGID
+        zh: PGID
+        zh-hant: PGID
+        ja: PGID
+        ko: PGID
+        ru: PGID
+        ms: PGID
+        pt-br: PGID
+      required: true
+      type: number
+    - default: admin
+      envKey: CUSTOM_USER
+      labelEn: Basic Auth Username
+      labelZh: 访问用户名（Basic Auth）
+      label:
+        en: Basic Auth Username
+        zh: 访问用户名（Basic Auth）
+        zh-hant: 存取使用者名稱（Basic Auth）
+        ja: ベーシック認証ユーザー名
+        ko: 기본 인증 사용자명
+        ru: Имя пользователя (Basic Auth)
+        ms: Nama pengguna (Basic Auth)
+        pt-br: Usuário (Basic Auth)
+      required: true
+      type: text
+    - default: ""
+      envKey: PASSWORD
+      labelEn: Basic Auth Password
+      labelZh: 访问密码（Basic Auth）
+      label:
+        en: Basic Auth Password
+        zh: 访问密码（Basic Auth）
+        zh-hant: 存取密碼（Basic Auth）
+        ja: ベーシック認証パスワード
+        ko: 기본 인증 비밀번호
+        ru: Пароль (Basic Auth)
+        ms: Kata laluan (Basic Auth)
+        pt-br: Senha (Basic Auth)
+      required: true
+      type: password
+    - default: Asia/Shanghai
+      envKey: TZ
+      labelEn: Timezone
+      labelZh: 时区
+      label:
+        en: Timezone
+        zh: 时区
+        zh-hant: 時區
+        ja: タイムゾーン
+        ko: 시간대
+        ru: Часовой пояс
+        ms: Zon waktu
+        pt-br: Fuso horário
+      required: true
+      type: text
+    - default: "1gb"
+      envKey: SHM_SIZE
+      labelEn: Shared memory size
+      labelZh: 共享内存大小（shm）
+      label:
+        en: Shared memory size
+        zh: 共享内存大小（shm）
+        zh-hant: 共享記憶體大小（shm）
+        ja: 共有メモリサイズ（shm）
+        ko: 공유 메모리 크기(shm)
+        ru: Размер общей памяти (shm)
+        ms: Saiz memori kongsi (shm)
+        pt-br: Tamanho da memória compartilhada (shm)
+      required: true
+      type: text
diff --git a/apps/joplin/3.5.13/docker-compose.yml b/apps/joplin/3.5.13/docker-compose.yml
new file mode 100644
index 000000000..01d007ebb
--- /dev/null
+++ b/apps/joplin/3.5.13/docker-compose.yml
@@ -0,0 +1,30 @@
+services:
+  joplin:
+    image: "linuxserver/joplin:3.5.13"
+    container_name: ${CONTAINER_NAME}
+    labels:
+      createdBy: "Apps"
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:3000"
+      - "${PANEL_APP_PORT_HTTPS}:3001"
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+      - CUSTOM_USER=${CUSTOM_USER}
+      - PASSWORD=${PASSWORD}
+    volumes:
+      - "joplin-config:/config"
+    shm_size: ${SHM_SIZE}
+    restart: always
+    networks:
+      - 1panel-network
+
+networks:
+  1panel-network:
+    external: true
+    name: 1panel-network
+
+volumes:
+  joplin-config:
+    name: joplin-config
diff --git a/apps/joplin/3.5.13/scripts/uninstall.sh b/apps/joplin/3.5.13/scripts/uninstall.sh
new file mode 100644
index 000000000..ab8a8d674
--- /dev/null
+++ b/apps/joplin/3.5.13/scripts/uninstall.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker-compose down --volumes
diff --git a/apps/joplin/README.md b/apps/joplin/README.md
new file mode 100644
index 000000000..fc906f905
--- /dev/null
+++ b/apps/joplin/README.md
@@ -0,0 +1,28 @@
+# Joplin（浏览器版）
+
+Joplin 是一款开源笔记应用。随时记录想法，并可在任何设备上安全访问。
+
+这是一个通过浏览器访问的 Joplin 容器化版本（基于 LinuxServer 镜像）。
+
+- 应用 Key：`joplin`
+- 上游：
+  - Joplin：<https://github.com/laurent22/joplin>
+  - LinuxServer 镜像：<https://github.com/linuxserver/docker-joplin>
+
+## 访问方式
+
+- HTTP：`http://<服务器IP>:<PANEL_APP_PORT_HTTP>`（默认 3000）
+- HTTPS（自签名证书）：`https://<服务器IP>:<PANEL_APP_PORT_HTTPS>`（默认 3001）
+
+## 密码访问（Basic Auth）
+
+该镜像支持通过环境变量启用 **Basic HTTP Auth**：
+
+- `CUSTOM_USER`：用户名
+- `PASSWORD`：密码
+
+> 安全提示：该容器 GUI 内含终端且具备高权限能力，不建议直接暴露公网；如需公网访问，建议放在反向代理后并增加更强的认证与访问控制。
+
+## 数据存储
+
+使用 Docker **named volume**：`joplin-config` 持久化到容器内的 `/config`。
diff --git a/apps/joplin/data.yml b/apps/joplin/data.yml
new file mode 100644
index 000000000..8cb38f8d6
--- /dev/null
+++ b/apps/joplin/data.yml
@@ -0,0 +1,30 @@
+name: Joplin（浏览器版）
+tags:
+  - Tool
+title: Joplin（浏览器版）
+description: Joplin（浏览器版）
+additionalProperties:
+  key: joplin
+  name: Joplin（浏览器版）
+  tags:
+    - Tool
+  shortDescZh: Joplin（浏览器版）
+  shortDescEn: Joplin (browser)
+  description:
+    en: Joplin (browser)
+    zh: Joplin（浏览器版）
+    zh-hant: Joplin（瀏覽器版）
+    ja: Joplin（ブラウザ版）
+    ko: Joplin(브라우저)
+    ru: Joplin (в браузере)
+    ms: Joplin (pelayar)
+    pt-br: Joplin (navegador)
+  type: tool
+  crossVersionUpdate: true
+  limit: 1
+  recommend: 0
+  website: https://joplinapp.org
+  github: https://github.com/laurent22/joplin
+  document: https://github.com/linuxserver/docker-joplin
+  architectures:
+    - amd64
diff --git a/apps/joplin/latest/.env.sample b/apps/joplin/latest/.env.sample
new file mode 100644
index 000000000..ef537d8cd
--- /dev/null
+++ b/apps/joplin/latest/.env.sample
@@ -0,0 +1,9 @@
+CONTAINER_NAME="joplin"
+PANEL_APP_PORT_HTTP=40339
+PANEL_APP_PORT_HTTPS=40340
+PUID=1000
+PGID=1000
+CUSTOM_USER=admin
+PASSWORD=
+TZ=Asia/Shanghai
+SHM_SIZE=1gb
diff --git a/apps/joplin/latest/data.yml b/apps/joplin/latest/data.yml
new file mode 100644
index 000000000..cc6a0b463
--- /dev/null
+++ b/apps/joplin/latest/data.yml
@@ -0,0 +1,124 @@
+additionalProperties:
+  formFields:
+    - default: 40339
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      label:
+        en: Port
+        zh: 端口
+        zh-hant: 埠
+        ja: ポート
+        ko: 포트
+        ru: Порт
+        ms: Port
+        pt-br: Porta
+      required: true
+      rule: paramPort
+      type: number
+    - default: 40340
+      envKey: PANEL_APP_PORT_HTTPS
+      labelEn: HTTPS Port
+      labelZh: HTTPS 端口
+      label:
+        en: HTTPS Port
+        zh: HTTPS 端口
+        zh-hant: HTTPS 埠
+        ja: HTTPS ポート
+        ko: HTTPS 포트
+        ru: HTTPS порт
+        ms: Port HTTPS
+        pt-br: Porta HTTPS
+      required: true
+      rule: paramPort
+      type: number
+    - default: 1000
+      envKey: PUID
+      labelEn: PUID
+      labelZh: PUID
+      label:
+        en: PUID
+        zh: PUID
+        zh-hant: PUID
+        ja: PUID
+        ko: PUID
+        ru: PUID
+        ms: PUID
+        pt-br: PUID
+      required: true
+      type: number
+    - default: 1000
+      envKey: PGID
+      labelEn: PGID
+      labelZh: PGID
+      label:
+        en: PGID
+        zh: PGID
+        zh-hant: PGID
+        ja: PGID
+        ko: PGID
+        ru: PGID
+        ms: PGID
+        pt-br: PGID
+      required: true
+      type: number
+    - default: admin
+      envKey: CUSTOM_USER
+      labelEn: Basic Auth Username
+      labelZh: 访问用户名（Basic Auth）
+      label:
+        en: Basic Auth Username
+        zh: 访问用户名（Basic Auth）
+        zh-hant: 存取使用者名稱（Basic Auth）
+        ja: ベーシック認証ユーザー名
+        ko: 기본 인증 사용자명
+        ru: Имя пользователя (Basic Auth)
+        ms: Nama pengguna (Basic Auth)
+        pt-br: Usuário (Basic Auth)
+      required: true
+      type: text
+    - default: ""
+      envKey: PASSWORD
+      labelEn: Basic Auth Password
+      labelZh: 访问密码（Basic Auth）
+      label:
+        en: Basic Auth Password
+        zh: 访问密码（Basic Auth）
+        zh-hant: 存取密碼（Basic Auth）
+        ja: ベーシック認証パスワード
+        ko: 기본 인증 비밀번호
+        ru: Пароль (Basic Auth)
+        ms: Kata laluan (Basic Auth)
+        pt-br: Senha (Basic Auth)
+      required: true
+      type: password
+    - default: Asia/Shanghai
+      envKey: TZ
+      labelEn: Timezone
+      labelZh: 时区
+      label:
+        en: Timezone
+        zh: 时区
+        zh-hant: 時區
+        ja: タイムゾーン
+        ko: 시간대
+        ru: Часовой пояс
+        ms: Zon waktu
+        pt-br: Fuso horário
+      required: true
+      type: text
+    - default: "1gb"
+      envKey: SHM_SIZE
+      labelEn: Shared memory size
+      labelZh: 共享内存大小（shm）
+      label:
+        en: Shared memory size
+        zh: 共享内存大小（shm）
+        zh-hant: 共享記憶體大小（shm）
+        ja: 共有メモリサイズ（shm）
+        ko: 공유 메모리 크기(shm)
+        ru: Размер общей памяти (shm)
+        ms: Saiz memori kongsi (shm)
+        pt-br: Tamanho da memória compartilhada (shm)
+      required: true
+      type: text
diff --git a/apps/joplin/latest/docker-compose.yml b/apps/joplin/latest/docker-compose.yml
new file mode 100644
index 000000000..e8e4ab4a9
--- /dev/null
+++ b/apps/joplin/latest/docker-compose.yml
@@ -0,0 +1,30 @@
+services:
+  joplin:
+    image: "linuxserver/joplin:latest"
+    container_name: ${CONTAINER_NAME}
+    labels:
+      createdBy: "Apps"
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:3000"
+      - "${PANEL_APP_PORT_HTTPS}:3001"
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+      - CUSTOM_USER=${CUSTOM_USER}
+      - PASSWORD=${PASSWORD}
+    volumes:
+      - "joplin-config:/config"
+    shm_size: ${SHM_SIZE}
+    restart: always
+    networks:
+      - 1panel-network
+
+networks:
+  1panel-network:
+    external: true
+    name: 1panel-network
+
+volumes:
+  joplin-config:
+    name: joplin-config
diff --git a/apps/joplin/latest/scripts/uninstall.sh b/apps/joplin/latest/scripts/uninstall.sh
new file mode 100644
index 000000000..ab8a8d674
--- /dev/null
+++ b/apps/joplin/latest/scripts/uninstall.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker-compose down --volumes
diff --git a/apps/joplin/logo.png b/apps/joplin/logo.png
new file mode 100644
index 000000000..99bb2ff13
Binary files /dev/null and b/apps/joplin/logo.png differ