diff --git a/README.md b/README.md
index 83da146..d3b148a 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,6 @@ Which isn't ideal, but I don't know how to do this more elegantly.
 
 # Possible additions:
 
-* emby: [dockerhub](https://hub.docker.com/r/emby/embyserver) [official](https://emby.media/)
 * mailtrain: https://hub.docker.com/r/mailtrain/mailtrain
 * portus: https://hub.docker.com/r/opensuse/portus/
 * silverpeas: https://hub.docker.com/_/silverpeas
diff --git a/heimdall/docker-compose.yml b/heimdall/docker-compose.yml
index e717ed5..e0cd4ff 100644
--- a/heimdall/docker-compose.yml
+++ b/heimdall/docker-compose.yml
@@ -5,9 +5,12 @@ version: "3"
 # Heimdall (Homepage)
 # 
 # DockerHub: https://hub.docker.com/r/linuxserver/heimdall
+# Offical Website: https://heimdall.site/
 #
-# SAMPLE ENV
-# <intentionally blank>
+# SAMPLE .env
+# VERSION=latest
+# TZ=America/Vancouver
+# PORT=8000
 #
 # NOTES
 #
@@ -21,15 +24,15 @@ version: "3"
 
 services:
   heimdall:
-    image: linuxserver/heimdall:2.5.6
+    image: linuxserver/heimdall:${VERSION:-latest}
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=America/Vancouver
+      - TZ=${TZ:-America/Vancouver}
     volumes:
       - ./data:/config
     restart: unless-stopped
     #ports:
-    #  - "8000:80"
+    #  - "${PORT:-80}:80"
 
 
diff --git a/jellyfin/docker-compose.yml b/jellyfin/docker-compose.yml
new file mode 100644
index 0000000..f2be125
--- /dev/null
+++ b/jellyfin/docker-compose.yml
@@ -0,0 +1,41 @@
+---
+version: "3"
+
+###########################################################################################################################
+# Jellyfin
+# 
+# LINKS
+# * [DockerHub](https://hub.docker.com/_/mariadb/)
+# * [Docs](https://jellyfin.org/docs/)
+#
+# Notes:
+# Static Ports
+# * 8096/tcp is used by default for HTTP traffic. You can change this in the dashboard.
+# * 8920/tcp is used by default for HTTPS traffic. You can change this in the dashboard.
+# * 1900/udp is used for service auto-discovery. This is not configurable.
+# * 7359/udp is also used for auto-discovery. This is not configurable.
+#
+# SAMPLE ENV
+# <blank>
+###########################################################################################################################
+
+services:
+
+  jellyfin:
+    image: jellyfin/jellyfin:latest
+    restart: always
+    volumes:
+      - ./data/config:/config
+      - ./data/cache:/cache
+      - ./data/content/media:/media
+      - ./data/content/books:/books
+      - ./data/content/movies:/movies
+      - ./data/content/music:/music
+      - ./data/content/musicvideos:/musicvideos
+      - ./data/content/photos:/photos
+      - ./data/content/shows:/shows
+    ports: 
+      - "8096:8096"
+    restart: unless-stopped
+    environment:
+      - JELLYFIN_PublishedServerUrl=http://localhost:8000