diff --git a/Images/emby.png b/Images/emby.png
new file mode 100644
index 0000000..1f4a9f1
Binary files /dev/null and b/Images/emby.png differ
diff --git a/Template/template.json b/Template/template.json
index d74a298..4306cbb 100644
--- a/Template/template.json
+++ b/Template/template.json
@@ -51,6 +51,57 @@
       }
     ]
   },
+  {
+    "type": 1,
+    "title": "Emby",
+    "name": "Emby",
+    "description": "Emby organizes video, music, live TV, and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone emby Media Server.",
+    "logo": "https://raw.githubusercontent.com/SelfhostedPro/selfhosted_templates/master/Images/emby.png",
+    "image": "linuxserver/emby:latest",
+    "categories": [
+      "Video",
+      "Music",
+      "Photos"
+    ],
+    "platform": "linux",
+    "restart_policy": "unless-stopped",
+    "ports": [
+      "8096:8096/tcp",
+      "8920:8920/tcp"
+    ],
+    "volumes": [
+      {
+        "container": "/config",
+        "bind": "/portainer/Files/AppData/Config/Emby"
+      },
+      {
+        "container": "/data/tvshows",
+        "bind": "/portainer/TV"
+      },
+      {
+        "container": "/data/movies",
+        "bind": "/portainer/Movies"
+      }
+    ],
+    "env": [
+      {
+        "name": "PUID",
+        "label": "PUID",
+        "default": "1000",
+        "preset": true
+      },
+      {
+        "name": "PGID",
+        "label": "PGID",
+        "default": "100",
+        "preset": true
+      },
+      {
+        "name": "TZ",
+        "label": "TZ"
+      }
+    ]
+  },
   {
     "type": 1,
     "title": "Jellyfin",
@@ -131,6 +182,7 @@
     "title": "Pi-Hole",
     "name": "Pi-Hole",
     "description": "A Linux network-level advertisement and Internet tracker blocking application which acts as a DNS sinkhole.",
+    "note": "When the installation is complete, navigate to your.ip.goes.here:1010/admin.",
     "logo": "https://raw.githubusercontent.com/SelfhostedPro/selfhosted_templates/master/Images/pihole.png",
     "image": "pihole/pihole:latest",
     "categories": [
@@ -141,10 +193,10 @@
     "restart_policy": "unless-stopped",
     "ports": [
       "53:53/tcp",
-      "81:53/udp",
+      "53:53/udp",
       "67:67/udp",
-      "80:80/tcp",
-      "443:443/tcp"
+      "1010:80/tcp",
+      "4443:443/tcp"
     ],
     "volumes": [
       {