diff --git a/.env b/.env
index 157e94f..30c697d 100644
--- a/.env
+++ b/.env
@@ -28,6 +28,23 @@ REDIS_HOSTNAME=immich_redis
 
 UPLOAD_LOCATION=/mnt/Data/Pictures/immich
 
+###################################################################################
+# Typesense
+###################################################################################
+TYPESENSE_API_KEY=5dff4d5be4994bdcbf517a2a87a1569e
+# TYPESENSE_ENABLED=false
+# TYPESENSE_URL uses base64 encoding for the nodes json.
+# Example JSON that was used:
+# [
+#      { 'host': 'typesense-1.example.net', 'port': '443', 'protocol': 'https' },
+#      { 'host': 'typesense-2.example.net', 'port': '443', 'protocol': 'https' },
+#      { 'host': 'typesense-3.example.net', 'port': '443', 'protocol': 'https' },
+#  ]
+# TYPESENSE_URL=ha://WwogICAgeyAnaG9zdCc6ICd0eXBlc2Vuc2UtMS5leGFtcGxlLm5ldCcsICdwb3J0JzogJzQ0MycsICdwcm90b2NvbCc6ICdodHRwcycgfSwKICAgIHsgJ2hvc3QnOiAndHlwZXNlb
+nNlLTIuZXhhbXBsZS5uZXQnLCAncG9ydCc6ICc0NDMnLCAncHJvdG9jb2wnOiAnaHR0cHMnIH0sCiAgICB7ICdob3N0JzogJ3R5cGVzZW5zZS0zLmV4YW1wbGUubmV0JywgJ3BvcnQnOiAnNDQzJywgJ3Byb3RvY29sJzogJ2h0dHBzJyB9LApd
+
+
+
 ###################################################################################
 # Log message level - [simple|verbose]
 ###################################################################################
@@ -73,6 +90,6 @@ PUBLIC_LOGIN_PAGE_MESSAGE=
 # Note: immich-microservices is bound to 3002, but no references are made
 ####################################################################################
 
-IMMICH_WEB_URL=http://immich-web:3000
-IMMICH_SERVER_URL=http://immich-server:3001
-IMMICH_MACHINE_LEARNING_URL=http://immich-machine-learning:3003
+IMMICH_WEB_URL=http://immich_web:3000
+IMMICH_SERVER_URL=http://immich_server:3001
+IMMICH_MACHINE_LEARNING_URL=http://immich_machine_learning:3003
diff --git a/composes/docker-compose.immich.override.yml b/composes/docker-compose.immich.override.yml
index f470ee3..82e40b2 100644
--- a/composes/docker-compose.immich.override.yml
+++ b/composes/docker-compose.immich.override.yml
@@ -27,6 +27,10 @@ services:
     networks:
           homenet:
 
+  typesense:
+    networks:
+      homenet:
+
   redis:
     networks:
           homenet:
diff --git a/composes/docker-compose.immich.yml b/composes/docker-compose.immich.yml
index 627fe1f..b825653 100644
--- a/composes/docker-compose.immich.yml
+++ b/composes/docker-compose.immich.yml
@@ -3,57 +3,60 @@ version: "3.8"
 services:
   immich-server:
     container_name: immich_server
-    image: altran1502/immich-server:release
+    image: ghcr.io/immich-app/immich-server:release
     entrypoint: ["/bin/sh", "./start-server.sh"]
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
     env_file:
       - .env
-    environment:
-      - NODE_ENV=production
     depends_on:
       - redis
       - database
+      - typesense
     restart: always
 
   immich-microservices:
     container_name: immich_microservices
-    image: altran1502/immich-server:release
+    image: ghcr.io/immich-app/immich-server:release
     entrypoint: ["/bin/sh", "./start-microservices.sh"]
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
     env_file:
       - .env
-    environment:
-      - NODE_ENV=production
     depends_on:
       - redis
       - database
+      - typesense
     restart: always
 
   immich-machine-learning:
     container_name: immich_machine_learning
-    image: altran1502/immich-machine-learning:release
-    entrypoint: ["/bin/sh", "./entrypoint.sh"]
+    image: ghcr.io/immich-app/immich-machine-learning:release
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
+      - model-cache:/cache
     env_file:
       - .env
-    environment:
-      - NODE_ENV=production
-    depends_on:
-      - database
     restart: always
 
   immich-web:
     container_name: immich_web
-    image: altran1502/immich-web:release
+    image: ghcr.io/immich-app/immich-web:release
     entrypoint: ["/bin/sh", "./entrypoint.sh"]
     env_file:
       - .env
+    restart: always
+
+  typesense:
+    container_name: immich_typesense
+    image: typesense/typesense:0.24.0
     environment:
-      # Rename these values for svelte public interface
-      - PUBLIC_IMMICH_SERVER_URL=${IMMICH_SERVER_URL}
+      - TYPESENSE_API_KEY=${TYPESENSE_API_KEY}
+      - TYPESENSE_DATA_DIR=/data
+    logging:
+      driver: none
+    volumes:
+      - tsdata:/data
     restart: always
 
   redis:
@@ -77,7 +80,7 @@ services:
 
   immich-proxy:
     container_name: immich_proxy
-    image: altran1502/immich-proxy:release
+    image: ghcr.io/immich-app/immich-proxy:release
     environment:
       # Make sure these values get passed through from the env file
       - IMMICH_SERVER_URL
@@ -92,4 +95,6 @@ services:
 
 volumes:
   pgdata:
+  model-cache:
+  tsdata:
 
diff --git a/envfiles/immich b/envfiles/immich
index 157e94f..30c697d 100644
--- a/envfiles/immich
+++ b/envfiles/immich
@@ -28,6 +28,23 @@ REDIS_HOSTNAME=immich_redis
 
 UPLOAD_LOCATION=/mnt/Data/Pictures/immich
 
+###################################################################################
+# Typesense
+###################################################################################
+TYPESENSE_API_KEY=5dff4d5be4994bdcbf517a2a87a1569e
+# TYPESENSE_ENABLED=false
+# TYPESENSE_URL uses base64 encoding for the nodes json.
+# Example JSON that was used:
+# [
+#      { 'host': 'typesense-1.example.net', 'port': '443', 'protocol': 'https' },
+#      { 'host': 'typesense-2.example.net', 'port': '443', 'protocol': 'https' },
+#      { 'host': 'typesense-3.example.net', 'port': '443', 'protocol': 'https' },
+#  ]
+# TYPESENSE_URL=ha://WwogICAgeyAnaG9zdCc6ICd0eXBlc2Vuc2UtMS5leGFtcGxlLm5ldCcsICdwb3J0JzogJzQ0MycsICdwcm90b2NvbCc6ICdodHRwcycgfSwKICAgIHsgJ2hvc3QnOiAndHlwZXNlb
+nNlLTIuZXhhbXBsZS5uZXQnLCAncG9ydCc6ICc0NDMnLCAncHJvdG9jb2wnOiAnaHR0cHMnIH0sCiAgICB7ICdob3N0JzogJ3R5cGVzZW5zZS0zLmV4YW1wbGUubmV0JywgJ3BvcnQnOiAnNDQzJywgJ3Byb3RvY29sJzogJ2h0dHBzJyB9LApd
+
+
+
 ###################################################################################
 # Log message level - [simple|verbose]
 ###################################################################################
@@ -73,6 +90,6 @@ PUBLIC_LOGIN_PAGE_MESSAGE=
 # Note: immich-microservices is bound to 3002, but no references are made
 ####################################################################################
 
-IMMICH_WEB_URL=http://immich-web:3000
-IMMICH_SERVER_URL=http://immich-server:3001
-IMMICH_MACHINE_LEARNING_URL=http://immich-machine-learning:3003
+IMMICH_WEB_URL=http://immich_web:3000
+IMMICH_SERVER_URL=http://immich_server:3001
+IMMICH_MACHINE_LEARNING_URL=http://immich_machine_learning:3003