diff --git a/README.md b/README.md
index 816f7b0..dda1816 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ The canonical URL for this repo is https://git.captnemo.in/nemo/nebula/. A mirro
 1. docker: to actually run the services. Catch-all for miscellaneous containers
 2. cloudflare: to manage the DNS.
 3. mysql: to create mysql users and databases.
-4. media: Media related containers (Jackett, Ombi, Radarr, Sonarr, Daapd)
+4. media: Media related containers (Jackett, Lidarr, Radarr, Sonarr, Daapd)
 5. Monitoring: Monitoring related resources (Cadvisor, Grafana, NodeExporter, Prometheus, Transmission-Exporter)
 6. Gitea: Just git.captnemo.in
 7. tt-rss: Tiny-Tiny RSS Web reader
diff --git a/docker/conf/traefik.toml b/docker/conf/traefik.toml
index 0fdfe9a..c3b6a74 100644
--- a/docker/conf/traefik.toml
+++ b/docker/conf/traefik.toml
@@ -111,7 +111,8 @@ sans = [
   "library.bb8.fun",
   "luke.bb8.fun",
   "monitoring.bb8.fun",
-  "ombi.bb8.fun",
+  # "lidarr.bb8.fun", (TBA)
+  "ombi.bb8.fun", # Unused
   "pics.bb8.fun",
   "radarr.bb8.fun",
   "read.bb8.fun",
diff --git a/media/airsonic.tf b/media/airsonic.tf
index bd05f13..08595ff 100644
--- a/media/airsonic.tf
+++ b/media/airsonic.tf
@@ -45,6 +45,7 @@ resource "docker_container" "airsonic" {
     "PUID=1004",
     "PGID=1003",
     "TZ=Asia/Kolkata",
+    "JAVA_OPTS=-Xmx512m -Xms512m",
   ]
   links = ["${var.links-mariadb}"]
 }
diff --git a/media/lidarr.tf b/media/lidarr.tf
new file mode 100644
index 0000000..6ce7d26
--- /dev/null
+++ b/media/lidarr.tf
@@ -0,0 +1,47 @@
+data "docker_registry_image" "lidarr" {
+  name = "linuxserver/lidarr:latest"
+}
+
+resource "docker_image" "lidarr" {
+  name          = "${data.docker_registry_image.lidarr.name}"
+  pull_triggers = ["${data.docker_registry_image.lidarr.sha256_digest}"]
+}
+
+resource docker_container "lidarr" {
+  name  = "lidarr"
+  image = "${docker_image.lidarr.latest}"
+
+  labels = "${merge(
+    var.traefik-labels, map(
+      "traefik.port", 8686,
+      "traefik.frontend.rule","Host:falcon.${var.domain}"
+  ))}"
+
+  memory                = 512
+  restart               = "unless-stopped"
+  destroy_grace_seconds = 10
+  must_run              = true
+
+  volumes {
+    host_path      = "/mnt/xwing/config/lidarr"
+    container_path = "/config"
+  }
+
+  volumes {
+    host_path      = "/mnt/xwing/media/DL"
+    container_path = "/downloads"
+  }
+
+  volumes {
+    host_path      = "/mnt/xwing/media/Music"
+    container_path = "/music"
+  }
+
+  env = [
+    "PUID=1004",
+    "PGID=1003",
+    "TZ=Asia/Kolkata",
+  ]
+
+  links = ["${var.links-emby}", "${var.links-transmission}"]
+}
diff --git a/media/ombi.tf b/media/ombi.tf
deleted file mode 100644
index 0227eef..0000000
--- a/media/ombi.tf
+++ /dev/null
@@ -1,38 +0,0 @@
-data "docker_registry_image" "ombi" {
-  name = "lsiodev/ombi-preview"
-}
-
-resource "docker_image" "ombi" {
-  name          = "${data.docker_registry_image.ombi.name}"
-  pull_triggers = ["${data.docker_registry_image.ombi.sha256_digest}"]
-}
-
-resource docker_container "ombi" {
-  name  = "ombi"
-  image = "${docker_image.ombi.latest}"
-
-  labels = "${merge(
-    var.traefik-labels, map(
-      "traefik.port", 3579,
-      "traefik.frontend.rule","Host:ombi.${var.domain}"
-  ))}"
-
-  restart               = "unless-stopped"
-  destroy_grace_seconds = 10
-  must_run              = true
-
-  volumes {
-    host_path      = "/mnt/xwing/config/ombi"
-    container_path = "/config"
-  }
-
-  env = [
-    "TZ=Asia/Kolkata",
-  ]
-
-  links = [
-    "${var.links-emby}",
-    "${docker_container.sonarr.name}",
-    "${docker_container.radarr.name}",
-  ]
-}