diff --git a/app-list.png b/app-list.png
index c6be9a92..9478b0a8 100644
Binary files a/app-list.png and b/app-list.png differ
diff --git a/apps/embyserver/README.md b/apps/embyserver/README.md
new file mode 100644
index 00000000..162feb1c
--- /dev/null
+++ b/apps/embyserver/README.md
@@ -0,0 +1,54 @@
+Emby Server
+============
+
+Emby Server is a personal media server with apps on just about every device.
+
+It features a REST-based API with built-in documention to facilitate client development. We also have client libraries for our API to enable rapid development.
+
+## Emby Apps
+
+- [Android Mobile (Play Store)](https://play.google.com/store/apps/details?id=com.mb.android "Android Mobile (Play Store)")
+- [Android Mobile (Amazon)](http://www.amazon.com/Emby-for-Android/dp/B00GVH9O0I "Android Mobile (Amazon)")
+- [Android TV](https://play.google.com/store/apps/details?id=tv.emby.embyatv "Android TV")
+- [Amazon Fire TV](http://www.amazon.com/Emby-for-Fire-TV/dp/B00VVJKTW8 "Amazon Fire TV")
+- [HTML5](http://app.emby.media "HTML5")
+- [iPad](https://itunes.apple.com/us/app/emby/id992180193?ls=1&mt=8 "iPad")
+- [iPhone](https://itunes.apple.com/us/app/emby/id992180193?ls=1&mt=8 "iPhone")
+- [Kodi](http://emby.media/download/ "Kodi")
+- [Media Portal](http://www.team-mediaportal.com/ "Media Portal")
+- [Roku](https://www.roku.com/channels#!details/44191/emby "Roku")
+- [Windows Desktop](http://emby.media/download/ "Windows Desktop")
+- [Windows Media Center](http://emby.media/download/ "Windows Media Center")
+- [Windows Phone](http://www.windowsphone.com/s?appid=f4971ed9-f651-4bf6-84bb-94fd98613b86 "Windows Phone")
+- [Windows 8](http://apps.microsoft.com/windows/en-us/app/media-browser/ad55a2f0-9897-47bd-8944-bed3aefd5d06 "Windows 8.1")
+
+## New Users ##
+
+If you're a new user looking to install Emby Server, please head over to [emby.media](http://www.emby.media/ "emby.media")
+
+## Developer Info ##
+
+[Api Docs](https://github.com/MediaBrowser/MediaBrowser/wiki "Api Workflow")
+
+[How to Build a Server Plugin](https://github.com/MediaBrowser/MediaBrowser/wiki/How-to-build-a-Server-Plugin "How to build a server plugin")
+
+
+## Visit our community: ##
+
+http://emby.media/community
+
+## Images
+
+![Android](https://dl.dropboxusercontent.com/u/4038856/android1.png)
+![Android](https://dl.dropboxusercontent.com/u/4038856/android2.png)
+![Html5](https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/apps/html5.png)
+![iOS](https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/apps/ios_1.jpg)
+![iOS](https://raw.github.com/MediaBrowser/MediaBrowser.Resources/master/apps/ios_2.jpg)
+![Emby Theater](https://raw.github.com/MediaBrowser/MediaBrowser.Resources/master/apps/mbt.png)
+![Emby Theater](https://raw.github.com/MediaBrowser/MediaBrowser.Resources/master/apps/mbt1.png)
+![Windows Phone](https://raw.github.com/MediaBrowser/MediaBrowser.Resources/master/apps/winphone.png)
+![Roku](https://raw.github.com/MediaBrowser/MediaBrowser.Resources/master/apps/roku2.jpg)
+![iOS](https://raw.github.com/MediaBrowser/MediaBrowser.Resources/master/apps/ios_3.jpg)
+![Dashboard](https://raw.github.com/MediaBrowser/MediaBrowser.Resources/master/apps/dashboard.png)
+![iOS](http://i.imgur.com/prrzxMc.jpg)
+![iOS](http://i.imgur.com/c9Vd1w5.jpg)
diff --git a/apps/embyserver/arm32v7/.env.sample b/apps/embyserver/arm32v7/.env.sample
new file mode 100644
index 00000000..b152e7ba
--- /dev/null
+++ b/apps/embyserver/arm32v7/.env.sample
@@ -0,0 +1,6 @@
+CONTAINER_NAME="embyserver"
+DATA_PATH="./data/config"
+MOUNT_PATH2="./data/mnt2"
+MOUNT_PATH="./data/mnt1"
+PANEL_APP_PORT_HTTP="40091"
+PANEL_APP_PORT_HTTPS="40092"
diff --git a/apps/embyserver/arm32v7/data.yml b/apps/embyserver/arm32v7/data.yml
new file mode 100644
index 00000000..863a0740
--- /dev/null
+++ b/apps/embyserver/arm32v7/data.yml
@@ -0,0 +1,39 @@
+additionalProperties:
+    formFields:
+        - default: 40091
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: HTTP Port
+          labelZh: HTTP端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: 40092
+          edit: true
+          envKey: PANEL_APP_PORT_HTTPS
+          labelEn: HTTPS Port
+          labelZh: HTTPS端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: ./data/config
+          edit: true
+          envKey: DATA_PATH
+          labelEn: Data folder path
+          labelZh: 数据文件夹路径
+          required: true
+          type: text
+        - default: ./data/mnt1
+          edit: true
+          envKey: MOUNT_PATH
+          labelEn: Mount folder path
+          labelZh: 挂载文件夹路径
+          required: true
+          type: text
+        - default: ./data/mnt2
+          edit: true
+          envKey: MOUNT_PATH2
+          labelEn: Mount folder path 2
+          labelZh: 挂载文件夹路径2
+          required: true
+          type: text
\ No newline at end of file
diff --git a/apps/embyserver/arm32v7/docker-compose.yml b/apps/embyserver/arm32v7/docker-compose.yml
new file mode 100644
index 00000000..4499f16a
--- /dev/null
+++ b/apps/embyserver/arm32v7/docker-compose.yml
@@ -0,0 +1,26 @@
+version: '3'
+services:
+  emby:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:8096"
+      - "${PANEL_APP_PORT_HTTPS}:8920"
+    volumes:
+      - "${DATA_PATH}:/config"
+      - "${MOUNT_PATH}:/mnt/share1"
+      - "${MOUNT_PATH2}:/mnt/share2"
+    environment:
+      - UID=1000
+      - GID=100
+      - GIDLIST=100
+    #runtime: nvidia # Expose NVIDIA GPUs
+    image: emby/embyserver_arm32v7:latest
+    labels:  
+      createdBy: "Apps"
+
+networks:  
+  1panel-network:  
+    external: true
diff --git a/apps/embyserver/arm64v8/.env.sample b/apps/embyserver/arm64v8/.env.sample
new file mode 100644
index 00000000..b152e7ba
--- /dev/null
+++ b/apps/embyserver/arm64v8/.env.sample
@@ -0,0 +1,6 @@
+CONTAINER_NAME="embyserver"
+DATA_PATH="./data/config"
+MOUNT_PATH2="./data/mnt2"
+MOUNT_PATH="./data/mnt1"
+PANEL_APP_PORT_HTTP="40091"
+PANEL_APP_PORT_HTTPS="40092"
diff --git a/apps/embyserver/arm64v8/data.yml b/apps/embyserver/arm64v8/data.yml
new file mode 100644
index 00000000..863a0740
--- /dev/null
+++ b/apps/embyserver/arm64v8/data.yml
@@ -0,0 +1,39 @@
+additionalProperties:
+    formFields:
+        - default: 40091
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: HTTP Port
+          labelZh: HTTP端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: 40092
+          edit: true
+          envKey: PANEL_APP_PORT_HTTPS
+          labelEn: HTTPS Port
+          labelZh: HTTPS端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: ./data/config
+          edit: true
+          envKey: DATA_PATH
+          labelEn: Data folder path
+          labelZh: 数据文件夹路径
+          required: true
+          type: text
+        - default: ./data/mnt1
+          edit: true
+          envKey: MOUNT_PATH
+          labelEn: Mount folder path
+          labelZh: 挂载文件夹路径
+          required: true
+          type: text
+        - default: ./data/mnt2
+          edit: true
+          envKey: MOUNT_PATH2
+          labelEn: Mount folder path 2
+          labelZh: 挂载文件夹路径2
+          required: true
+          type: text
\ No newline at end of file
diff --git a/apps/embyserver/arm64v8/docker-compose.yml b/apps/embyserver/arm64v8/docker-compose.yml
new file mode 100644
index 00000000..f5ee23f7
--- /dev/null
+++ b/apps/embyserver/arm64v8/docker-compose.yml
@@ -0,0 +1,26 @@
+version: '3'
+services:
+  emby:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:8096"
+      - "${PANEL_APP_PORT_HTTPS}:8920"
+    volumes:
+      - "${DATA_PATH}:/config"
+      - "${MOUNT_PATH}:/mnt/share1"
+      - "${MOUNT_PATH2}:/mnt/share2"
+    environment:
+      - UID=1000
+      - GID=100
+      - GIDLIST=100
+    #runtime: nvidia # Expose NVIDIA GPUs
+    image: emby/embyserver_arm64v8:latest
+    labels:  
+      createdBy: "Apps"
+
+networks:  
+  1panel-network:  
+    external: true
diff --git a/apps/embyserver/data.yml b/apps/embyserver/data.yml
new file mode 100644
index 00000000..f64acb82
--- /dev/null
+++ b/apps/embyserver/data.yml
@@ -0,0 +1,20 @@
+name: Emby Server
+tags:
+    - 工具
+title: Emby 是一个免费的个人媒体服务器
+type: 工具
+description: Emby 是一个免费的个人媒体服务器
+additionalProperties:
+    key: embyserver
+    name: Emby Server
+    tags:
+        - Tool
+    shortDescZh: Emby 是一个免费的个人媒体服务器
+    shortDescEn: Emby is a free personal media server
+    type: tool
+    crossVersionUpdate: true
+    limit: 0
+    recommend: 0
+    website: https://emby.media/
+    github: https://github.com/MediaBrowser/Emby
+    document: https://emby.media/support/articles/Home.html
diff --git a/apps/embyserver/latest/.env.sample b/apps/embyserver/latest/.env.sample
new file mode 100644
index 00000000..b152e7ba
--- /dev/null
+++ b/apps/embyserver/latest/.env.sample
@@ -0,0 +1,6 @@
+CONTAINER_NAME="embyserver"
+DATA_PATH="./data/config"
+MOUNT_PATH2="./data/mnt2"
+MOUNT_PATH="./data/mnt1"
+PANEL_APP_PORT_HTTP="40091"
+PANEL_APP_PORT_HTTPS="40092"
diff --git a/apps/embyserver/latest/data.yml b/apps/embyserver/latest/data.yml
new file mode 100644
index 00000000..863a0740
--- /dev/null
+++ b/apps/embyserver/latest/data.yml
@@ -0,0 +1,39 @@
+additionalProperties:
+    formFields:
+        - default: 40091
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: HTTP Port
+          labelZh: HTTP端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: 40092
+          edit: true
+          envKey: PANEL_APP_PORT_HTTPS
+          labelEn: HTTPS Port
+          labelZh: HTTPS端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: ./data/config
+          edit: true
+          envKey: DATA_PATH
+          labelEn: Data folder path
+          labelZh: 数据文件夹路径
+          required: true
+          type: text
+        - default: ./data/mnt1
+          edit: true
+          envKey: MOUNT_PATH
+          labelEn: Mount folder path
+          labelZh: 挂载文件夹路径
+          required: true
+          type: text
+        - default: ./data/mnt2
+          edit: true
+          envKey: MOUNT_PATH2
+          labelEn: Mount folder path 2
+          labelZh: 挂载文件夹路径2
+          required: true
+          type: text
\ No newline at end of file
diff --git a/apps/embyserver/latest/docker-compose.yml b/apps/embyserver/latest/docker-compose.yml
new file mode 100644
index 00000000..e09eda8f
--- /dev/null
+++ b/apps/embyserver/latest/docker-compose.yml
@@ -0,0 +1,26 @@
+version: '3'
+services:
+  emby:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:8096"
+      - "${PANEL_APP_PORT_HTTPS}:8920"
+    volumes:
+      - "${DATA_PATH}:/config"
+      - "${MOUNT_PATH}:/mnt/share1"
+      - "${MOUNT_PATH2}:/mnt/share2"
+    environment:
+      - UID=1000
+      - GID=100
+      - GIDLIST=100
+    #runtime: nvidia # Expose NVIDIA GPUs
+    image: emby/embyserver:latest
+    labels:  
+      createdBy: "Apps"
+
+networks:  
+  1panel-network:  
+    external: true
diff --git a/apps/embyserver/logo.png b/apps/embyserver/logo.png
new file mode 100644
index 00000000..50441767
Binary files /dev/null and b/apps/embyserver/logo.png differ