diff --git a/config.tfvars b/config.tfvars
index 17a51471..706a3ded 100644
Binary files a/config.tfvars and b/config.tfvars differ
diff --git a/stacks/ebooks/main.tf b/stacks/ebooks/main.tf
index 93d95152..4fc154c9 100644
--- a/stacks/ebooks/main.tf
+++ b/stacks/ebooks/main.tf
@@ -627,7 +627,7 @@ module "audiobookshelf_ingress" {
   }
 }
 
-# Book-Search Deployment (renamed from audiobook-search)
+# Book-Search Deployment
 resource "kubernetes_deployment" "book_search" {
   metadata {
     name      = "book-search"
diff --git a/stacks/servarr/audiobook-search/main.tf b/stacks/servarr/audiobook-search/main.tf
deleted file mode 100644
index ae88837b..00000000
--- a/stacks/servarr/audiobook-search/main.tf
+++ /dev/null
@@ -1,138 +0,0 @@
-variable "tls_secret_name" {}
-variable "tier" { type = string }
-variable "audiobookshelf_token" {
-  type      = string
-  sensitive = true
-}
-variable "qbittorrent_password" {
-  type      = string
-  sensitive = true
-}
-variable "mam_email" {
-  type      = string
-  sensitive = true
-  default   = ""
-}
-variable "mam_password" {
-  type      = string
-  sensitive = true
-  default   = ""
-}
-
-resource "kubernetes_deployment" "audiobook_search" {
-  metadata {
-    name      = "audiobook-search"
-    namespace = "servarr"
-    labels = {
-      app  = "audiobook-search"
-      tier = var.tier
-    }
-  }
-  spec {
-    replicas = 1
-    selector {
-      match_labels = {
-        app = "audiobook-search"
-      }
-    }
-    template {
-      metadata {
-        labels = {
-          app = "audiobook-search"
-        }
-      }
-      spec {
-        container {
-          image             = "viktorbarzin/audiobook-search:latest"
-          image_pull_policy = "Always"
-          name  = "audiobook-search"
-
-          port {
-            container_port = 8000
-          }
-          env {
-            name  = "QBITTORRENT_URL"
-            value = "http://qbittorrent.servarr.svc.cluster.local"
-          }
-          env {
-            name  = "QBITTORRENT_PASS"
-            value = var.qbittorrent_password
-          }
-          env {
-            name  = "AUDIOBOOKSHELF_URL"
-            value = "http://audiobookshelf.audiobookshelf.svc.cluster.local"
-          }
-          env {
-            name  = "AUDIOBOOKSHELF_TOKEN"
-            value = var.audiobookshelf_token
-          }
-          env {
-            name  = "MAM_EMAIL"
-            value = var.mam_email
-          }
-          env {
-            name  = "MAM_PASSWORD"
-            value = var.mam_password
-          }
-          resources {
-            requests = {
-              cpu    = "10m"
-              memory = "64Mi"
-            }
-            limits = {
-              memory = "128Mi"
-            }
-          }
-          liveness_probe {
-            http_get {
-              path = "/health"
-              port = 8000
-            }
-            initial_delay_seconds = 10
-            period_seconds        = 30
-          }
-        }
-      }
-    }
-  }
-  lifecycle {
-    ignore_changes = [spec[0].template[0].spec[0].dns_config]
-  }
-}
-
-resource "kubernetes_service" "audiobook_search" {
-  metadata {
-    name      = "audiobook-search"
-    namespace = "servarr"
-    labels = {
-      app = "audiobook-search"
-    }
-  }
-
-  spec {
-    selector = {
-      app = "audiobook-search"
-    }
-    port {
-      name        = "http"
-      port        = 80
-      target_port = 8000
-    }
-  }
-}
-
-module "ingress" {
-  source          = "../../../modules/kubernetes/ingress_factory"
-  namespace       = "servarr"
-  name            = "audiobook-search"
-  tls_secret_name = var.tls_secret_name
-  protected       = true
-  extra_annotations = {
-    "gethomepage.dev/enabled"      = "true"
-    "gethomepage.dev/name"         = "Audiobook Search"
-    "gethomepage.dev/description"  = "Search & download audiobooks"
-    "gethomepage.dev/icon"         = "audiobookshelf.png"
-    "gethomepage.dev/group"        = "Media & Entertainment"
-    "gethomepage.dev/pod-selector" = ""
-  }
-}
diff --git a/stacks/servarr/main.tf b/stacks/servarr/main.tf
index 393dc121..e5349093 100644
--- a/stacks/servarr/main.tf
+++ b/stacks/servarr/main.tf
@@ -115,13 +115,4 @@ module "aiostreams" {
   nfs_server                            = var.nfs_server
 }
 
-# Moved to stacks/ebooks/ namespace
-# module "audiobook_search" {
-#   source               = "./audiobook-search"
-#   tls_secret_name      = var.tls_secret_name
-#   tier                 = local.tiers.aux
-#   audiobookshelf_token = data.kubernetes_secret.eso_secrets.data["audiobookshelf_api_token"]
-#   qbittorrent_password = data.kubernetes_secret.eso_secrets.data["qbittorrent_password"]
-#   mam_email            = data.kubernetes_secret.eso_secrets.data["mam_email"]
-#   mam_password         = data.kubernetes_secret.eso_secrets.data["mam_password"]
-# }
+