diff --git a/.env b/.env
index 09ef4a6..e705439 100644
--- a/.env
+++ b/.env
@@ -187,6 +187,7 @@ TORBOX_MANAGER_HOSTNAME=tbm.${DOMAIN}
 TRAEFIK_HOSTNAME=traefik.${DOMAIN}
 UPTIME_KUMA_HOSTNAME=status.${DOMAIN}
 VAULTWARDEN_HOSTNAME=vaultwarden.${DOMAIN}
+WEBSTREAMR_HOSTNAME=webstreamr.${DOMAIN}
 YAMTRACK_HOSTNAME=yamtrack.${DOMAIN}
 ZILEAN_HOSTNAME=zilean.${DOMAIN}
 ZIPLINE_HOSTNAME=zipline.${DOMAIN}
diff --git a/apps/authelia/compose.yaml b/apps/authelia/compose.yaml
index c8ffcc6..37aa0fc 100644
--- a/apps/authelia/compose.yaml
+++ b/apps/authelia/compose.yaml
@@ -34,7 +34,8 @@ services:
         ${OMG_TV_STREMIO_ADDON_HOSTNAME},
         ${STREMIO_CATALOG_PROVIDERS_HOSTNAME},
         ${STREMIO_TRAKT_ADDON_HOSTNAME},
-        ${TMDB_ADDON_HOSTNAME}
+        ${TMDB_ADDON_HOSTNAME},
+        ${WEBSTREAMR_HOSTNAME}
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.authelia.rule=Host(`${AUTHELIA_HOSTNAME?}`)"
diff --git a/apps/cloudflare-ddns/compose.yaml b/apps/cloudflare-ddns/compose.yaml
index 08ded6a..28d416e 100644
--- a/apps/cloudflare-ddns/compose.yaml
+++ b/apps/cloudflare-ddns/compose.yaml
@@ -86,6 +86,7 @@ services:
         ${TRAEFIK_HOSTNAME},
         ${UPTIME_KUMA_HOSTNAME},
         ${VAULTWARDEN_HOSTNAME},
+        ${WEBSTREAMR_HOSTNAME},
         ${YAMTRACK_HOSTNAME},
         ${ZILEAN_HOSTNAME},
         ${ZIPLINE_HOSTNAME},
diff --git a/apps/webstreamr/.env b/apps/webstreamr/.env
new file mode 100644
index 0000000..71e0cc1
--- /dev/null
+++ b/apps/webstreamr/.env
@@ -0,0 +1,29 @@
+#---------------------------------------
+# WebStreamr Configuration
+#---------------------------------------
+
+# Manifest details
+MANIFEST_ID=webstreamr
+MANIFEST_NAME=WebStreamr
+# Set custom HTML for the configuration page
+# CONFIGURATION_DESCRIPTION=
+
+#---------------------------------------
+# API Configuration
+#---------------------------------------
+
+# Set a TMDB Access token here
+TMDB_ACCESS_TOKEN=
+
+#---------------------------------------
+# Network Configuration
+#---------------------------------------
+
+# Set a proxy URL to use for all HTTP requests
+# e.g. http://warp:1080
+# ALL_PROXY=
+
+# Set a URL to a FlareSolverr/Byparr instance
+# e.g. http://byparr:8191/v1
+# FLARESOLVERR_ENDPOINT=
+
diff --git a/apps/webstreamr/compose.yaml b/apps/webstreamr/compose.yaml
new file mode 100644
index 0000000..2991fa4
--- /dev/null
+++ b/apps/webstreamr/compose.yaml
@@ -0,0 +1,36 @@
+services:
+  webstreamr:
+    image: webstreamr
+    container_name: webstreamr
+    restart: unless-stopped
+    build:
+      context: https://github.com/webstreamr/webstreamr.git
+      dockerfile: Dockerfile
+    expose:
+      - 51546
+    env_file:
+      - .env
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.webstreamr.rule=Host(`${WEBSTREAMR_HOSTNAME?}`)"
+      - "traefik.http.routers.webstreamr.entrypoints=websecure"
+      - "traefik.http.routers.webstreamr.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.webstreamr.middlewares=authelia@docker"
+      - "traefik.http.services.webstreamr.loadbalancer.server.port=51546"
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "wget",
+          "--quiet",
+          "--tries=1",
+          "--spider",
+          "http://localhost:51546/manifest.json",
+        ]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 60s
+    profiles:
+      - webstreamr
+      - all
diff --git a/compose.yaml b/compose.yaml
index 96df917..6933006 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -81,6 +81,7 @@ include:
   - apps/vaultwarden/compose.yaml
   - apps/warp/compose.yaml
   - apps/watchtower/compose.yaml
+  - apps/webstreamr/compose.yaml
   - apps/wests-scripts/compose.yaml
   - apps/yamtrack/compose.yaml
   - apps/zilean/compose.yaml