diff --git a/.env b/.env
index 114bcee..04f1890 100644
--- a/.env
+++ b/.env
@@ -115,7 +115,6 @@ CLOUDFLARE_API_TOKEN=
 # You can modify these values to suit your needs, but ensure that they are unique and do not conflict with other services.
 ACTUAL_BUDGET_HOSTNAME=actual-budget.${DOMAIN?}
 ADDON_MANAGER_HOSTNAME=addon-manager.${DOMAIN?}
-AI_SEARCH_HOSTNAME=ai-search.${DOMAIN?}
 AIOLISTS_HOSTNAME=aiolists.${DOMAIN?}
 AIOSTREAMS_HOSTNAME=aiostreams.${DOMAIN}
 AIOSTREMIO_HOSTNAME=aiostremio.${DOMAIN}
@@ -169,6 +168,7 @@ SONARRANIME_HOSTNAME=anime.sonarr.${DOMAIN}
 SPEEDTEST_TRACKER_HOSTNAME=speedtest-tracker.${DOMAIN}
 STREAMYSTATS_HOSTNAME=streamystats.${DOMAIN}
 STREMIO_ACCOUNT_BOOTSTRAPPER_HOSTNAME=stremio-account-bootstrapper.${DOMAIN?}
+STREMIO_AI_SEARCH_HOSTNAME=ai-search.${DOMAIN?}
 STREMIO_CATALOG_PROVIDERS_HOSTNAME=stremio-catalogues.${DOMAIN}
 STREMIO_JACKETT_HOSTNAME=stremio-jackett.${DOMAIN}
 STREMIO_LETTERBOXD_HOSTNAME=stremio-letterboxd.${DOMAIN}
diff --git a/apps/ai-search/compose.yaml b/apps/ai-search/compose.yaml
deleted file mode 100644
index a6f5db3..0000000
--- a/apps/ai-search/compose.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-services:
-  ai-search:
-    image: ghcr.io/cedya77/stremio-ai-search:latest
-    build: 
-      context: https://github.com/itcon-pty-au/stremio-ai-search.git
-      dockerfile: Dockerfile
-    container_name: ai-search
-    restart: unless-stopped
-    env_file:
-      - .env
-    environment:
-      PORT: 7000 # needed when using community image
-    expose:
-      - 7000
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.ai-search.rule=Host(`${AI_SEARCH_HOSTNAME}`)"
-      - "traefik.http.routers.ai-search.entrypoints=websecure"
-      - "traefik.http.routers.ai-search.tls.certresolver=letsencrypt"
-      - "traefik.http.routers.ai-search.middlewares=authelia@docker"
-      - "traefik.http.services.ai-search.loadbalancer.server.port=7000"
-
-    profiles:
-      - ai-search
-      - stremio
-      - all
diff --git a/apps/cloudflare-ddns/compose.yaml b/apps/cloudflare-ddns/compose.yaml
index 005e662..ae2d379 100644
--- a/apps/cloudflare-ddns/compose.yaml
+++ b/apps/cloudflare-ddns/compose.yaml
@@ -14,7 +14,6 @@ services:
       DOMAINS: >
         ${ACTUAL_BUDGET_HOSTNAME},
         ${ADDON_MANAGER_HOSTNAME},
-        ${AI_SEARCH_HOSTNAME},
         ${AIOLISTS_HOSTNAME},
         ${AIOSTREAMS_HOSTNAME},
         ${AIOSTREMIO_HOSTNAME},
@@ -68,6 +67,7 @@ services:
         ${SPEEDTEST_TRACKER_HOSTNAME},
         ${STREAMYSTATS_HOSTNAME},
         ${STREMIO_ACCOUNT_BOOTSTRAPPER_HOSTNAME},
+        ${STREMIO_AI_SEARCH_HOSTNAME},
         ${STREMIO_CATALOG_PROVIDERS_HOSTNAME},
         ${STREMIO_JACKETT_HOSTNAME},
         ${STREMIO_LETTERBOXD_HOSTNAME},
diff --git a/apps/ai-search/.env b/apps/stremio-ai-search/.env
similarity index 100%
rename from apps/ai-search/.env
rename to apps/stremio-ai-search/.env
diff --git a/apps/stremio-ai-search/compose.yaml b/apps/stremio-ai-search/compose.yaml
new file mode 100644
index 0000000..903b7ec
--- /dev/null
+++ b/apps/stremio-ai-search/compose.yaml
@@ -0,0 +1,25 @@
+services:
+  stremio-ai-search:
+    image: ghcr.io/cedya77/stremio-ai-search:latest
+    build: 
+      context: https://github.com/itcon-pty-au/stremio-ai-search.git
+      dockerfile: Dockerfile
+    container_name: stremio-ai-search
+    restart: unless-stopped
+    env_file:
+      - .env
+    environment:
+      PORT: 7000 # needed when using community image
+    expose:
+      - 7000
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.stremio-ai-search.rule=Host(`${AI_SEARCH_HOSTNAME}`)"
+      - "traefik.http.routers.stremio-ai-search.entrypoints=websecure"
+      - "traefik.http.routers.stremio-ai-search.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.stremio-ai-search.middlewares=authelia@docker"
+      - "traefik.http.services.stremio-ai-search.loadbalancer.server.port=7000"
+    profiles:
+      - stremio-ai-search
+      - stremio
+      - all
diff --git a/compose.yaml b/compose.yaml
index 0b9e9cf..05e8db6 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -57,6 +57,7 @@ include:
   - apps/sshbot/compose.yaml
   - apps/streamystats/compose.yaml
   - apps/stremio-account-bootstrapper/compose.yaml
+  - apps/stremio-ai-search/compose.yaml
   - apps/stremio-catalog-providers/compose.yaml
   - apps/stremio-jackett/compose.yaml
   - apps/stremio-letterboxd/compose.yaml