diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..13566b81
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/blueprints/emby/docker-compose.yml b/blueprints/emby/docker-compose.yml
new file mode 100644
index 00000000..1b7cb15a
--- /dev/null
+++ b/blueprints/emby/docker-compose.yml
@@ -0,0 +1,20 @@
+version: "2.3"
+services:
+  emby:
+    image: emby/embyserver
+    # Uncomment to enable DLNA and Wake-on-Lan
+    # network_mode: host
+    environment:
+      - UID=1000 # The UID to run emby as (default: 2)
+      - GID=100 # The GID to run emby as (default 2)
+      - GIDLIST=100 # A comma-separated list of additional GIDs to run emby as (default: 2)
+    volumes:
+      - /emby/programdata:/config # Configuration directory
+      - /emby/series:/mnt/share1 # Media directory
+      - /emby/movies:/mnt/share2 # Media directory
+    ports:
+      - 8096 # HTTP port
+      - 8920 # HTTPS port
+    devices:
+      - /dev/dri:/dev/dri # VAAPI/NVDEC/NVENC render nodes
+    restart: on-failure
\ No newline at end of file
diff --git a/blueprints/emby/emby.png b/blueprints/emby/emby.png
new file mode 100644
index 00000000..f79b4c3f
Binary files /dev/null and b/blueprints/emby/emby.png differ
diff --git a/blueprints/emby/template.toml b/blueprints/emby/template.toml
new file mode 100644
index 00000000..604b170b
--- /dev/null
+++ b/blueprints/emby/template.toml
@@ -0,0 +1,12 @@
+[variables]
+main_domain = "${domain}"
+api_domain = "${domain}"
+
+[config]
+env = []
+mounts = []
+
+[[config.domains]]
+serviceName = "emby"
+port = 8096
+host = "${main_domain}"
diff --git a/meta.json b/meta.json
index 66d591a9..88d36ab8 100644
--- a/meta.json
+++ b/meta.json
@@ -1537,6 +1537,22 @@
       "analytics"
     ]
   },
+  {
+    "id": "emby",
+    "name": "Emby",
+    "version": "4.9.1.17",
+    "description": "Emby Server is a personal media server with apps on just about every device.",
+    "logo": "emby.png",
+    "links": {
+      "github": "https://github.com/MediaBrowser/Emby",
+      "website": "https://emby.media/",
+      "docs": "https://emby.media/support/articles/Home.html"
+    },
+    "tags": [
+      "media",
+      "media system"
+    ]
+  },
   {
     "id": "erpnext",
     "name": "ERPNext",