diff --git a/komodo/arr/m3u-editor/.env.sample b/komodo/arr/m3u-editor/.env.sample
new file mode 100644
index 0000000..c0dd073
--- /dev/null
+++ b/komodo/arr/m3u-editor/.env.sample
@@ -0,0 +1,21 @@
+# Docker image tag for m3u-editor
+IMAGE_TAG=latest
+
+# Application URL and port
+APP_URL=http://localhost
+APP_PORT=36400
+
+# Postgres configuration
+PG_DATABASE=m3ue
+PG_USER=m3ue
+PG_PASSWORD=changeme
+PG_PORT=5432
+
+# Redis configuration
+REDIS_PORT=36790
+REDIS_HOST=localhost
+
+# M3U proxy configuration
+M3U_PROXY_TOKEN=changeme
+M3U_PROXY_PORT=38085
+M3U_PROXY_HOST=localhost
\ No newline at end of file
diff --git a/komodo/arr/m3u-editor/compose.yaml b/komodo/arr/m3u-editor/compose.yaml
new file mode 100644
index 0000000..f849300
--- /dev/null
+++ b/komodo/arr/m3u-editor/compose.yaml
@@ -0,0 +1,66 @@
+services:
+  m3u-editor:
+    image: sparkison/m3u-editor:${IMAGE_TAG:-latest}
+    container_name: m3u-editor
+    environment:
+      # Timezone
+      - TZ=Etc/UTC
+
+      # Application URL (change to your domain or IP)
+      - APP_URL=${APP_URL:-http://localhost}
+      - APP_PORT=${APP_PORT:-36400}
+
+      # Postgres Configuration
+      - ENABLE_POSTGRES=true # Use embedded Postgres, disable to use your own Postgres service
+      - PG_DATABASE=${PG_DATABASE:-m3ue}
+      - PG_USER=${PG_USER:-m3ue}
+      - PG_PASSWORD=${PG_PASSWORD:-changeme}
+      - PG_PORT=${PG_PORT:-5432}
+
+      # Database Connection (m3u-editor)
+      - DB_CONNECTION=pgsql
+      - DB_HOST=localhost
+      - DB_PORT=${PG_PORT:-5432}
+      - DB_DATABASE=${PG_DATABASE:-m3ue}
+      - DB_USERNAME=${PG_USER:-m3ue}
+      - DB_PASSWORD=${PG_PASSWORD:-changeme}
+
+      # Redis configuration
+      - REDIS_ENABLED=true # Enable embedded Redis
+      - REDIS_SERVER_PORT=${REDIS_PORT:-36790}
+      - REDIS_HOST=${REDIS_HOST:-localhost}
+      - REDIS_PASSWORD=${M3U_PROXY_TOKEN:-changeme} # Must match what start-container sets
+
+      # M3U Proxy Configuration (External)
+      - M3U_PROXY_ENABLED=true # Use embedded m3u-proxy instance
+      - M3U_PROXY_PORT=${M3U_PROXY_PORT:-38085}
+      - M3U_PROXY_HOST=${M3U_PROXY_HOST:-localhost} # Internal network hostname of m3u-proxy container
+      - M3U_PROXY_TOKEN=${M3U_PROXY_TOKEN:-changeme}
+    volumes:
+      # Persistent configuration data
+      - data:/var/www/config
+
+      # PostgreSQL data persistence
+      - pgdata:/var/lib/postgresql/data
+
+      # User-uploaded assets (logos, images, etc.)
+      # Without this, uploaded assets are lost on container recreation
+      - storage:/var/www/html/storage/app/public
+    restart: unless-stopped
+    ports:
+      - "${APP_PORT:-36400}:${APP_PORT:-36400}" # Main application port
+      # - "${PG_PORT:-5432}:${PG_PORT:-5432}"  # Uncomment to expose PostgreSQL
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://127.0.0.1:${APP_PORT:-36400}/up" ]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 60s
+volumes:
+  pgdata:
+    driver: local
+  storage:
+    driver: local
+  data:
+    driver: local
+  
\ No newline at end of file
diff --git a/komodo/arr/tv-headend/.env.sample b/komodo/arr/tv-headend/.env.sample
deleted file mode 100644
index e69de29..0000000
diff --git a/komodo/arr/tv-headend/compose.yaml b/komodo/arr/tv-headend/compose.yaml
deleted file mode 100644
index 6d0e6c7..0000000
--- a/komodo/arr/tv-headend/compose.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-services:
-  tvheadend:
-    image: lscr.io/linuxserver/tvheadend:latest
-    container_name: tvheadend
-    environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
-      - TZ=${TZ:-Etc/UTC}
-      # - RUN_OPTS= #optional
-    volumes:
-      - tvheadend:/config
-      - tvheadend-recordings:/recordings
-    ports:
-      - 9981:9981
-      - 9982:9982
-    # devices:
-      # - /dev/dri:/dev/dri #optional
-      # - /dev/dvb:/dev/dvb #optional
-    restart: unless-stopped
-
-volumes:
-  tvheadend:
-  tvheadend-recordings:
\ No newline at end of file