diff --git a/trains/community/adventurelog/1.0.8/README.md b/trains/community/adventurelog/1.1.0/README.md
similarity index 100%
rename from trains/community/adventurelog/1.0.8/README.md
rename to trains/community/adventurelog/1.1.0/README.md
diff --git a/trains/community/adventurelog/1.0.8/app.yaml b/trains/community/adventurelog/1.1.0/app.yaml
similarity index 92%
rename from trains/community/adventurelog/1.0.8/app.yaml
rename to trains/community/adventurelog/1.1.0/app.yaml
index a10e8935a6..3dc7887bc1 100644
--- a/trains/community/adventurelog/1.0.8/app.yaml
+++ b/trains/community/adventurelog/1.1.0/app.yaml
@@ -23,8 +23,8 @@ keywords:
 - location
 - tracker
 - planner
-lib_version: 2.1.65
-lib_version_hash: f92a9ee78c78fc77f86e7d8b545bd4c605c31c599e2c5da59f1615aa516cb8b5
+lib_version: 2.1.66
+lib_version_hash: 986abcd60fd0cc6277c80d55d2798356ddda1bd6348580ca7198b003571707fa
 maintainers:
 - email: dev@truenas.com
   name: truenas
@@ -51,4 +51,4 @@ sources:
 - https://github.com/seanmorley15/AdventureLog
 title: AdventureLog
 train: community
-version: 1.0.8
+version: 1.1.0
diff --git a/trains/community/adventurelog/1.1.0/app_migrations.yaml b/trains/community/adventurelog/1.1.0/app_migrations.yaml
new file mode 100644
index 0000000000..ea2bfc957b
--- /dev/null
+++ b/trains/community/adventurelog/1.1.0/app_migrations.yaml
@@ -0,0 +1,6 @@
+migrations:
+- file: set_default_postgis_image
+  from:
+    max_version: 1.0.8
+  target:
+    min_version: 1.1.0
diff --git a/trains/community/adventurelog/1.0.8/ix_values.yaml b/trains/community/adventurelog/1.1.0/ix_values.yaml
similarity index 76%
rename from trains/community/adventurelog/1.0.8/ix_values.yaml
rename to trains/community/adventurelog/1.1.0/ix_values.yaml
index 651049b641..8b654997e9 100644
--- a/trains/community/adventurelog/1.0.8/ix_values.yaml
+++ b/trains/community/adventurelog/1.1.0/ix_values.yaml
@@ -8,9 +8,15 @@ images:
   frontend_image:
     repository: ghcr.io/seanmorley15/adventurelog-frontend
     tag: v0.11.0
-  postgis_image:
+  postgis_17_image:
     repository: postgis/postgis
     tag: "17-3.5"
+  postgis_18_image:
+    repository: postgis/postgis
+    tag: "18-3.6"
+  postgres_upgrade_image:
+    repository: ixsystems/postgres-upgrade
+    tag: 1.1.3
 
 consts:
   backend_container_name: backend
diff --git a/trains/community/adventurelog/1.1.0/migrations/set_default_postgis_image b/trains/community/adventurelog/1.1.0/migrations/set_default_postgis_image
new file mode 100755
index 0000000000..95d4265798
--- /dev/null
+++ b/trains/community/adventurelog/1.1.0/migrations/set_default_postgis_image
@@ -0,0 +1,20 @@
+#!/usr/bin/python3
+
+import os
+import sys
+import yaml
+
+
+def migrate(values):
+    if not values["adventurelog"].get("postgres_image_selector"):
+        values["adventurelog"]["postgres_image_selector"] = "postgis_17_image"
+    return values
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        exit(1)
+
+    if os.path.exists(sys.argv[1]):
+        with open(sys.argv[1], "r") as f:
+            print(yaml.dump(migrate(yaml.safe_load(f.read()))))
diff --git a/trains/community/adventurelog/1.0.8/questions.yaml b/trains/community/adventurelog/1.1.0/questions.yaml
similarity index 96%
rename from trains/community/adventurelog/1.0.8/questions.yaml
rename to trains/community/adventurelog/1.1.0/questions.yaml
index 713e49d72d..3b98f32bcd 100644
--- a/trains/community/adventurelog/1.0.8/questions.yaml
+++ b/trains/community/adventurelog/1.1.0/questions.yaml
@@ -26,6 +26,24 @@ questions:
     schema:
       type: dict
       attrs:
+        - variable: postgres_image_selector
+          label: Postgres Image (CAUTION)
+          description: |
+            If you are changing this after the postgres directory has been initialized,</br>
+            STOP! and make sure you have a backup of your data.</br>
+            Changing this will trigger an one way database upgrade.</br>
+            You can only select newer versions of postgres.</br>
+            Selecting an older version will refuse to start.</br>
+            If something goes wrong, you will have to restore from backup.
+          schema:
+            type: string
+            default: postgis_18_image
+            required: true
+            enum:
+              - value: postgis_17_image
+                description: Postgres 17
+              - value: postgis_18_image
+                description: Postgres 18
         - variable: db_password
           label: Database Password
           description: The password for AdventureLog.
diff --git a/trains/community/adventurelog/1.0.8/templates/docker-compose.yaml b/trains/community/adventurelog/1.1.0/templates/docker-compose.yaml
similarity index 97%
rename from trains/community/adventurelog/1.0.8/templates/docker-compose.yaml
rename to trains/community/adventurelog/1.1.0/templates/docker-compose.yaml
index c879a88481..5038257ee0 100644
--- a/trains/community/adventurelog/1.0.8/templates/docker-compose.yaml
+++ b/trains/community/adventurelog/1.1.0/templates/docker-compose.yaml
@@ -7,7 +7,7 @@
 
 {# Postgis #}
 {% set pg_config = {"user": values.consts.db_user, "password": values.adventurelog.db_password, "database": values.consts.db_name, "volume": values.storage.postgres_data} %}
-{% set postgis = tpl.deps.postgres(values.consts.postgis_container_name, "postgis_image", pg_config, perm_container) %}
+{% set postgis = tpl.deps.postgres(values.consts.postgis_container_name, values.adventurelog.postgres_image_selector, pg_config, perm_container) %}
 
 {# Frontend #}
 {% do frontend.set_user(1000, 1000) %}
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/__init__.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/__init__.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/__init__.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/__init__.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/client.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/client.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/client.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/client.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/configs.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/configs.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/configs.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/configs.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/container.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/container.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/container.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/container.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/depends.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/depends.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/depends.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/depends.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deploy.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deploy.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deploy.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deploy.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_elastic.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_elastic.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_elastic.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_elastic.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_mariadb.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_mariadb.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_mariadb.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_mariadb.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_meilisearch.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_meilisearch.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_meilisearch.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_meilisearch.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_mongodb.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_mongodb.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_mongodb.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_mongodb.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_perms.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_perms.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_perms.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_perms.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_postgres.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_postgres.py
similarity index 94%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_postgres.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_postgres.py
index 8269990377..1e6f7471c8 100644
--- a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_postgres.py
+++ b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_postgres.py
@@ -34,6 +34,11 @@ SUPPORTED_REPOS = [
     "pgvector/pgvector",
     "ghcr.io/immich-app/postgres",
 ]
+SUPPORTED_UPGRADE_REPOS = [
+    "postgres",
+    "postgis/postgis",
+    "pgvector/pgvector",
+]
 
 
 def get_major_version(variant: str, tag: str):
@@ -52,15 +57,16 @@ def get_major_version(variant: str, tag: str):
             return x.split("-")[0]
 
     elif variant == "pgvector/pgvector":
-        # 0.8.1-pg17
-        regex = re.compile(r"^\d+\.\d+\.\d+\-pg\d+")
+        # 0.8.1-pg17-trixie
+        regex = re.compile(r"^\d+\.\d+\.\d+\-pg\d+(\-\w+)?")
 
         def oper(x):
-            return x.split("-")[1].lstrip("pg")
+            parts = x.split("-")
+            return parts[1].lstrip("pg")
 
     elif variant == "ghcr.io/immich-app/postgres":
-        # 15-vectorchord0.4.3-pgvectors0.2.0
-        regex = re.compile(r"^\d+\-vectorchord\d+\.\d+\.\d+(\-pgvectors?\d+\.\d+\.\d+)?")
+        # 15-vectorchord0.4.3
+        regex = re.compile(r"^\d+\-vectorchord\d+\.\d+\.\d+")
 
         def oper(x):
             return x.split("-")[0]
@@ -113,7 +119,7 @@ class PostgresContainer:
 
         # eg we don't want to handle upgrades of pg_vector or immich at the moment
         repo = self._get_repo(image)
-        if repo == "postgres":
+        if repo in SUPPORTED_UPGRADE_REPOS:
             self._data_dir = "/var/lib/postgresql"
             target_major_version = self._get_target_version(image)
             # This is the new format upstream Postgres uses/suggests.
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_redis.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_redis.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_redis.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_redis.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_solr.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_solr.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_solr.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_solr.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_tika.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_tika.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/deps_tika.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/deps_tika.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/device.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/device.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/device.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/device.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/device_cgroup_rules.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/device_cgroup_rules.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/device_cgroup_rules.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/device_cgroup_rules.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/devices.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/devices.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/devices.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/devices.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/dns.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/dns.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/dns.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/dns.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/environment.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/environment.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/environment.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/environment.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/error.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/error.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/error.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/error.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/expose.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/expose.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/expose.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/expose.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/extra_hosts.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/extra_hosts.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/extra_hosts.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/extra_hosts.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/formatter.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/formatter.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/formatter.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/formatter.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/functions.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/functions.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/functions.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/functions.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/healthcheck.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/healthcheck.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/healthcheck.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/healthcheck.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/labels.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/labels.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/labels.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/labels.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/notes.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/notes.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/notes.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/notes.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/portals.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/portals.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/portals.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/portals.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/ports.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/ports.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/ports.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/ports.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/render.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/render.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/render.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/render.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/resources.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/resources.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/resources.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/resources.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/restart.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/restart.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/restart.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/restart.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/security_opts.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/security_opts.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/security_opts.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/security_opts.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/storage.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/storage.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/storage.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/storage.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/sysctls.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/sysctls.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/sysctls.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/sysctls.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/__init__.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/__init__.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/__init__.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/__init__.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_build_image.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_build_image.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_build_image.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_build_image.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_configs.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_configs.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_configs.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_configs.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_container.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_container.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_container.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_container.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_depends.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_depends.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_depends.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_depends.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_deps.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_deps.py
similarity index 99%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_deps.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_deps.py
index 2792798b03..197486537a 100644
--- a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_deps.py
+++ b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_deps.py
@@ -537,7 +537,10 @@ def test_add_postgres_with_invalid_tag(mock_values):
 
 
 def test_no_upgrade_container_with_non_postgres_image(mock_values):
-    mock_values["images"]["postgres_image"] = {"repository": "pgvector/pgvector", "tag": "0.8.1-pg17"}
+    mock_values["images"]["postgres_image"] = {
+        "repository": "ghcr.io/immich-app/postgres",
+        "tag": "15-vectorchord0.4.3-pgvectors0.2.0",
+    }
     render = Render(mock_values)
     c1 = render.add_container("test_container", "test_image")
     c1.healthcheck.disable()
@@ -605,7 +608,7 @@ def test_postgres_with_upgrade_container(mock_values):
 
 
 def test_add_mongodb(mock_values):
-    mock_values["images"]["mongodb_image"] = {"repository": "mongodb", "tag": "latest"}
+    mock_values["images"]["mongodb_image"] = {"repository": "mongo", "tag": "latest"}
     render = Render(mock_values)
     c1 = render.add_container("test_container", "test_image")
     c1.healthcheck.disable()
@@ -627,7 +630,7 @@ def test_add_mongodb(mock_values):
     output = render.render()
     assert "devices" not in output["services"]["mongodb_container"]
     assert "reservations" not in output["services"]["mongodb_container"]["deploy"]["resources"]
-    assert output["services"]["mongodb_container"]["image"] == "mongodb:latest"
+    assert output["services"]["mongodb_container"]["image"] == "mongo:latest"
     assert output["services"]["mongodb_container"]["user"] == "568:568"
     assert output["services"]["mongodb_container"]["deploy"]["resources"]["limits"]["cpus"] == "2.0"
     assert output["services"]["mongodb_container"]["deploy"]["resources"]["limits"]["memory"] == "4096M"
@@ -781,7 +784,7 @@ def test_add_meilisearch_unsupported_repo(mock_values):
 
 def test_add_elasticsearch(mock_values):
     mock_values["images"]["elastic_image"] = {
-        "repository": "docker.elastic.co/elasticsearch/elasticsearch",
+        "repository": "elasticsearch",
         "tag": "9.1.2",
     }
     render = Render(mock_values)
@@ -804,7 +807,7 @@ def test_add_elasticsearch(mock_values):
     output = render.render()
     assert "devices" not in output["services"]["elastic_container"]
     assert "reservations" not in output["services"]["elastic_container"]["deploy"]["resources"]
-    assert output["services"]["elastic_container"]["image"] == "docker.elastic.co/elasticsearch/elasticsearch:9.1.2"
+    assert output["services"]["elastic_container"]["image"] == "elasticsearch:9.1.2"
     assert output["services"]["elastic_container"]["user"] == "1000:1000"
     assert output["services"]["elastic_container"]["deploy"]["resources"]["limits"]["cpus"] == "2.0"
     assert output["services"]["elastic_container"]["deploy"]["resources"]["limits"]["memory"] == "4096M"
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_device.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_device.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_device.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_device.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_device_cgroup_rules.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_device_cgroup_rules.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_device_cgroup_rules.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_device_cgroup_rules.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_dns.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_dns.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_dns.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_dns.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_environment.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_environment.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_environment.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_environment.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_expose.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_expose.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_expose.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_expose.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_extra_hosts.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_extra_hosts.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_extra_hosts.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_extra_hosts.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_formatter.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_formatter.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_formatter.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_formatter.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_functions.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_functions.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_functions.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_functions.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_healthcheck.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_healthcheck.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_healthcheck.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_healthcheck.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_labels.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_labels.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_labels.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_labels.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_notes.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_notes.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_notes.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_notes.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_portal.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_portal.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_portal.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_portal.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_ports.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_ports.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_ports.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_ports.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_render.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_render.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_render.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_render.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_resources.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_resources.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_resources.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_resources.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_restart.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_restart.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_restart.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_restart.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_security_opts.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_security_opts.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_security_opts.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_security_opts.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_sysctls.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_sysctls.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_sysctls.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_sysctls.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_validations.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_validations.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_validations.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_validations.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_volumes.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_volumes.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tests/test_volumes.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tests/test_volumes.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tmpfs.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tmpfs.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/tmpfs.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/tmpfs.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/validations.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/validations.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/validations.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/validations.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/volume_mount.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/volume_mount.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/volume_mount.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/volume_mount.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/volume_mount_types.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/volume_mount_types.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/volume_mount_types.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/volume_mount_types.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/volume_sources.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/volume_sources.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/volume_sources.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/volume_sources.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/volume_types.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/volume_types.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/volume_types.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/volume_types.py
diff --git a/trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/volumes.py b/trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/volumes.py
similarity index 100%
rename from trains/community/adventurelog/1.0.8/templates/library/base_v2_1_65/volumes.py
rename to trains/community/adventurelog/1.1.0/templates/library/base_v2_1_66/volumes.py
diff --git a/trains/community/adventurelog/1.0.8/templates/test_values/basic-values.yaml b/trains/community/adventurelog/1.1.0/templates/test_values/basic-values.yaml
similarity index 94%
rename from trains/community/adventurelog/1.0.8/templates/test_values/basic-values.yaml
rename to trains/community/adventurelog/1.1.0/templates/test_values/basic-values.yaml
index c03379ed4a..a0de9eef95 100644
--- a/trains/community/adventurelog/1.0.8/templates/test_values/basic-values.yaml
+++ b/trains/community/adventurelog/1.1.0/templates/test_values/basic-values.yaml
@@ -6,6 +6,7 @@ resources:
 TZ: Etc/UTC
 
 adventurelog:
+  postgres_image_selector: postgis_18_image
   db_password: secret
   backend_url: http://localhost:8080
   frontend_url: http://localhost:8081
diff --git a/trains/community/chatwoot/1.0.29/README.md b/trains/community/chatwoot/1.0.30/README.md
similarity index 100%
rename from trains/community/chatwoot/1.0.29/README.md
rename to trains/community/chatwoot/1.0.30/README.md
diff --git a/trains/community/chatwoot/1.0.29/app.yaml b/trains/community/chatwoot/1.0.30/app.yaml
similarity index 89%
rename from trains/community/chatwoot/1.0.29/app.yaml
rename to trains/community/chatwoot/1.0.30/app.yaml
index f68dc8ed44..f0a1b28f65 100644
--- a/trains/community/chatwoot/1.0.29/app.yaml
+++ b/trains/community/chatwoot/1.0.30/app.yaml
@@ -12,8 +12,8 @@ icon: https://media.sys.truenas.net/apps/chatwoot/icons/icon.svg
 keywords:
 - support
 - live chat
-lib_version: 2.1.65
-lib_version_hash: f92a9ee78c78fc77f86e7d8b545bd4c605c31c599e2c5da59f1615aa516cb8b5
+lib_version: 2.1.66
+lib_version_hash: 986abcd60fd0cc6277c80d55d2798356ddda1bd6348580ca7198b003571707fa
 maintainers:
 - email: dev@truenas.com
   name: truenas
@@ -41,4 +41,4 @@ sources:
 - https://hub.docker.com/r/chatwoot/chatwoot
 title: Chatwoot
 train: community
-version: 1.0.29
+version: 1.0.30
diff --git a/trains/community/chatwoot/1.0.29/ix_values.yaml b/trains/community/chatwoot/1.0.30/ix_values.yaml
similarity index 87%
rename from trains/community/chatwoot/1.0.29/ix_values.yaml
rename to trains/community/chatwoot/1.0.30/ix_values.yaml
index bdd83f78dd..a885a23fa0 100644
--- a/trains/community/chatwoot/1.0.29/ix_values.yaml
+++ b/trains/community/chatwoot/1.0.30/ix_values.yaml
@@ -14,9 +14,12 @@ images:
   postgres_17_image:
     repository: pgvector/pgvector
     tag: 0.8.1-pg17
+  postgres_18_image:
+    repository: pgvector/pgvector
+    tag: 0.8.1-pg18-trixie
   postgres_upgrade_image:
     repository: ixsystems/postgres-upgrade
-    tag: 1.1.2
+    tag: 1.1.3
 
 consts:
   chatwoot_container_name: chatwoot
diff --git a/trains/community/chatwoot/1.0.29/questions.yaml b/trains/community/chatwoot/1.0.30/questions.yaml
similarity index 99%
rename from trains/community/chatwoot/1.0.29/questions.yaml
rename to trains/community/chatwoot/1.0.30/questions.yaml
index f8d9a0760c..406d7747f5 100644
--- a/trains/community/chatwoot/1.0.29/questions.yaml
+++ b/trains/community/chatwoot/1.0.30/questions.yaml
@@ -50,11 +50,13 @@ questions:
             If something goes wrong, you will have to restore from backup.
           schema:
             type: string
-            default: postgres_17_image
+            default: postgres_18_image
             required: true
             enum:
               - value: postgres_17_image
                 description: Postgres 17
+              - value: postgres_18_image
+                description: Postgres 18
         - variable: db_password
           label: Database Password
           description: The password for Chatwoot.
diff --git a/trains/community/chatwoot/1.0.29/templates/docker-compose.yaml b/trains/community/chatwoot/1.0.30/templates/docker-compose.yaml
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/docker-compose.yaml
rename to trains/community/chatwoot/1.0.30/templates/docker-compose.yaml
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/__init__.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/__init__.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/__init__.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/__init__.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/client.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/client.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/client.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/client.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/configs.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/configs.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/configs.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/configs.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/container.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/container.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/container.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/container.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/depends.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/depends.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/depends.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/depends.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deploy.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deploy.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deploy.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deploy.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_elastic.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_elastic.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_elastic.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_elastic.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_mariadb.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_mariadb.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_mariadb.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_mariadb.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_meilisearch.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_meilisearch.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_meilisearch.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_meilisearch.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_mongodb.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_mongodb.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_mongodb.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_mongodb.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_perms.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_perms.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_perms.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_perms.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_postgres.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_postgres.py
similarity index 94%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_postgres.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_postgres.py
index 8269990377..1e6f7471c8 100644
--- a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_postgres.py
+++ b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_postgres.py
@@ -34,6 +34,11 @@ SUPPORTED_REPOS = [
     "pgvector/pgvector",
     "ghcr.io/immich-app/postgres",
 ]
+SUPPORTED_UPGRADE_REPOS = [
+    "postgres",
+    "postgis/postgis",
+    "pgvector/pgvector",
+]
 
 
 def get_major_version(variant: str, tag: str):
@@ -52,15 +57,16 @@ def get_major_version(variant: str, tag: str):
             return x.split("-")[0]
 
     elif variant == "pgvector/pgvector":
-        # 0.8.1-pg17
-        regex = re.compile(r"^\d+\.\d+\.\d+\-pg\d+")
+        # 0.8.1-pg17-trixie
+        regex = re.compile(r"^\d+\.\d+\.\d+\-pg\d+(\-\w+)?")
 
         def oper(x):
-            return x.split("-")[1].lstrip("pg")
+            parts = x.split("-")
+            return parts[1].lstrip("pg")
 
     elif variant == "ghcr.io/immich-app/postgres":
-        # 15-vectorchord0.4.3-pgvectors0.2.0
-        regex = re.compile(r"^\d+\-vectorchord\d+\.\d+\.\d+(\-pgvectors?\d+\.\d+\.\d+)?")
+        # 15-vectorchord0.4.3
+        regex = re.compile(r"^\d+\-vectorchord\d+\.\d+\.\d+")
 
         def oper(x):
             return x.split("-")[0]
@@ -113,7 +119,7 @@ class PostgresContainer:
 
         # eg we don't want to handle upgrades of pg_vector or immich at the moment
         repo = self._get_repo(image)
-        if repo == "postgres":
+        if repo in SUPPORTED_UPGRADE_REPOS:
             self._data_dir = "/var/lib/postgresql"
             target_major_version = self._get_target_version(image)
             # This is the new format upstream Postgres uses/suggests.
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_redis.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_redis.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_redis.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_redis.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_solr.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_solr.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_solr.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_solr.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_tika.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_tika.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/deps_tika.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/deps_tika.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/device.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/device.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/device.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/device.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/device_cgroup_rules.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/device_cgroup_rules.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/device_cgroup_rules.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/device_cgroup_rules.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/devices.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/devices.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/devices.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/devices.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/dns.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/dns.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/dns.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/dns.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/environment.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/environment.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/environment.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/environment.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/error.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/error.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/error.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/error.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/expose.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/expose.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/expose.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/expose.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/extra_hosts.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/extra_hosts.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/extra_hosts.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/extra_hosts.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/formatter.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/formatter.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/formatter.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/formatter.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/functions.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/functions.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/functions.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/functions.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/healthcheck.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/healthcheck.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/healthcheck.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/healthcheck.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/labels.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/labels.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/labels.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/labels.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/notes.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/notes.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/notes.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/notes.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/portals.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/portals.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/portals.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/portals.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/ports.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/ports.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/ports.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/ports.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/render.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/render.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/render.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/render.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/resources.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/resources.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/resources.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/resources.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/restart.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/restart.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/restart.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/restart.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/security_opts.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/security_opts.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/security_opts.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/security_opts.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/storage.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/storage.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/storage.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/storage.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/sysctls.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/sysctls.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/sysctls.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/sysctls.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/__init__.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/__init__.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/__init__.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/__init__.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_build_image.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_build_image.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_build_image.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_build_image.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_configs.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_configs.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_configs.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_configs.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_container.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_container.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_container.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_container.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_depends.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_depends.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_depends.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_depends.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_deps.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_deps.py
similarity index 99%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_deps.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_deps.py
index 2792798b03..197486537a 100644
--- a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_deps.py
+++ b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_deps.py
@@ -537,7 +537,10 @@ def test_add_postgres_with_invalid_tag(mock_values):
 
 
 def test_no_upgrade_container_with_non_postgres_image(mock_values):
-    mock_values["images"]["postgres_image"] = {"repository": "pgvector/pgvector", "tag": "0.8.1-pg17"}
+    mock_values["images"]["postgres_image"] = {
+        "repository": "ghcr.io/immich-app/postgres",
+        "tag": "15-vectorchord0.4.3-pgvectors0.2.0",
+    }
     render = Render(mock_values)
     c1 = render.add_container("test_container", "test_image")
     c1.healthcheck.disable()
@@ -605,7 +608,7 @@ def test_postgres_with_upgrade_container(mock_values):
 
 
 def test_add_mongodb(mock_values):
-    mock_values["images"]["mongodb_image"] = {"repository": "mongodb", "tag": "latest"}
+    mock_values["images"]["mongodb_image"] = {"repository": "mongo", "tag": "latest"}
     render = Render(mock_values)
     c1 = render.add_container("test_container", "test_image")
     c1.healthcheck.disable()
@@ -627,7 +630,7 @@ def test_add_mongodb(mock_values):
     output = render.render()
     assert "devices" not in output["services"]["mongodb_container"]
     assert "reservations" not in output["services"]["mongodb_container"]["deploy"]["resources"]
-    assert output["services"]["mongodb_container"]["image"] == "mongodb:latest"
+    assert output["services"]["mongodb_container"]["image"] == "mongo:latest"
     assert output["services"]["mongodb_container"]["user"] == "568:568"
     assert output["services"]["mongodb_container"]["deploy"]["resources"]["limits"]["cpus"] == "2.0"
     assert output["services"]["mongodb_container"]["deploy"]["resources"]["limits"]["memory"] == "4096M"
@@ -781,7 +784,7 @@ def test_add_meilisearch_unsupported_repo(mock_values):
 
 def test_add_elasticsearch(mock_values):
     mock_values["images"]["elastic_image"] = {
-        "repository": "docker.elastic.co/elasticsearch/elasticsearch",
+        "repository": "elasticsearch",
         "tag": "9.1.2",
     }
     render = Render(mock_values)
@@ -804,7 +807,7 @@ def test_add_elasticsearch(mock_values):
     output = render.render()
     assert "devices" not in output["services"]["elastic_container"]
     assert "reservations" not in output["services"]["elastic_container"]["deploy"]["resources"]
-    assert output["services"]["elastic_container"]["image"] == "docker.elastic.co/elasticsearch/elasticsearch:9.1.2"
+    assert output["services"]["elastic_container"]["image"] == "elasticsearch:9.1.2"
     assert output["services"]["elastic_container"]["user"] == "1000:1000"
     assert output["services"]["elastic_container"]["deploy"]["resources"]["limits"]["cpus"] == "2.0"
     assert output["services"]["elastic_container"]["deploy"]["resources"]["limits"]["memory"] == "4096M"
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_device.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_device.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_device.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_device.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_device_cgroup_rules.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_device_cgroup_rules.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_device_cgroup_rules.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_device_cgroup_rules.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_dns.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_dns.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_dns.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_dns.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_environment.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_environment.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_environment.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_environment.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_expose.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_expose.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_expose.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_expose.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_extra_hosts.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_extra_hosts.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_extra_hosts.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_extra_hosts.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_formatter.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_formatter.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_formatter.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_formatter.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_functions.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_functions.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_functions.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_functions.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_healthcheck.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_healthcheck.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_healthcheck.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_healthcheck.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_labels.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_labels.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_labels.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_labels.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_notes.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_notes.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_notes.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_notes.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_portal.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_portal.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_portal.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_portal.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_ports.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_ports.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_ports.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_ports.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_render.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_render.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_render.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_render.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_resources.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_resources.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_resources.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_resources.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_restart.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_restart.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_restart.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_restart.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_security_opts.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_security_opts.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_security_opts.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_security_opts.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_sysctls.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_sysctls.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_sysctls.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_sysctls.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_validations.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_validations.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_validations.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_validations.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_volumes.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_volumes.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_volumes.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tests/test_volumes.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tmpfs.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tmpfs.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tmpfs.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/tmpfs.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/validations.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/validations.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/validations.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/validations.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/volume_mount.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/volume_mount.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/volume_mount.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/volume_mount.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/volume_mount_types.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/volume_mount_types.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/volume_mount_types.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/volume_mount_types.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/volume_sources.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/volume_sources.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/volume_sources.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/volume_sources.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/volume_types.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/volume_types.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/volume_types.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/volume_types.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/volumes.py b/trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/volumes.py
similarity index 100%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/volumes.py
rename to trains/community/chatwoot/1.0.30/templates/library/base_v2_1_66/volumes.py
diff --git a/trains/community/chatwoot/1.0.29/templates/test_values/basic-values.yaml b/trains/community/chatwoot/1.0.30/templates/test_values/basic-values.yaml
similarity index 94%
rename from trains/community/chatwoot/1.0.29/templates/test_values/basic-values.yaml
rename to trains/community/chatwoot/1.0.30/templates/test_values/basic-values.yaml
index 1783ff14fd..a59e25c1e4 100644
--- a/trains/community/chatwoot/1.0.29/templates/test_values/basic-values.yaml
+++ b/trains/community/chatwoot/1.0.30/templates/test_values/basic-values.yaml
@@ -5,7 +5,7 @@ resources:
 
 chatwoot:
   image_selector: image
-  postgres_image_selector: postgres_17_image
+  postgres_image_selector: postgres_18_image
   db_password: secret
   redis_password: secret
   secret_key_base: secret
diff --git a/trains/community/chatwoot/1.0.29/templates/test_values/ce-values.yaml b/trains/community/chatwoot/1.0.30/templates/test_values/ce-values.yaml
similarity index 94%
rename from trains/community/chatwoot/1.0.29/templates/test_values/ce-values.yaml
rename to trains/community/chatwoot/1.0.30/templates/test_values/ce-values.yaml
index ad9a9b3088..91c4d6366c 100644
--- a/trains/community/chatwoot/1.0.29/templates/test_values/ce-values.yaml
+++ b/trains/community/chatwoot/1.0.30/templates/test_values/ce-values.yaml
@@ -5,7 +5,7 @@ resources:
 
 chatwoot:
   image_selector: ce_image
-  postgres_image_selector: postgres_17_image
+  postgres_image_selector: postgres_18_image
   db_password: secret
   redis_password: secret
   secret_key_base: secret
diff --git a/trains/community/dawarich/1.1.43/README.md b/trains/community/dawarich/1.2.0/README.md
similarity index 100%
rename from trains/community/dawarich/1.1.43/README.md
rename to trains/community/dawarich/1.2.0/README.md
diff --git a/trains/community/dawarich/1.1.43/app.yaml b/trains/community/dawarich/1.2.0/app.yaml
similarity index 90%
rename from trains/community/dawarich/1.1.43/app.yaml
rename to trains/community/dawarich/1.2.0/app.yaml
index 2bf6010c5f..6c6350f2f2 100644
--- a/trains/community/dawarich/1.1.43/app.yaml
+++ b/trains/community/dawarich/1.2.0/app.yaml
@@ -14,8 +14,8 @@ icon: https://media.sys.truenas.net/apps/dawarich/icons/icon.svg
 keywords:
 - location
 - history
-lib_version: 2.1.65
-lib_version_hash: f92a9ee78c78fc77f86e7d8b545bd4c605c31c599e2c5da59f1615aa516cb8b5
+lib_version: 2.1.66
+lib_version_hash: 986abcd60fd0cc6277c80d55d2798356ddda1bd6348580ca7198b003571707fa
 maintainers:
 - email: dev@truenas.com
   name: truenas
@@ -45,4 +45,4 @@ sources:
 - https://github.com/Freika/dawarich
 title: Dawarich
 train: community
-version: 1.1.43
+version: 1.2.0
diff --git a/trains/community/dawarich/1.1.43/app_migrations.yaml b/trains/community/dawarich/1.2.0/app_migrations.yaml
similarity index 75%
rename from trains/community/dawarich/1.1.43/app_migrations.yaml
rename to trains/community/dawarich/1.2.0/app_migrations.yaml
index af4e844a39..e0b2b0b4fd 100644
--- a/trains/community/dawarich/1.1.43/app_migrations.yaml
+++ b/trains/community/dawarich/1.2.0/app_migrations.yaml
@@ -14,3 +14,8 @@ migrations:
     max_version: 1.1.5
   target:
     min_version: 1.1.9
+- file: set_default_postgis_image
+  from:
+    max_version: 1.1.43
+  target:
+    min_version: 1.2.0
diff --git a/trains/community/dawarich/1.1.43/ix_values.yaml b/trains/community/dawarich/1.2.0/ix_values.yaml
similarity index 76%
rename from trains/community/dawarich/1.1.43/ix_values.yaml
rename to trains/community/dawarich/1.2.0/ix_values.yaml
index dce5ef1455..e17794d7a1 100644
--- a/trains/community/dawarich/1.1.43/ix_values.yaml
+++ b/trains/community/dawarich/1.2.0/ix_values.yaml
@@ -5,9 +5,15 @@ images:
   container_utils_image:
     repository: ixsystems/container-utils
     tag: 1.0.2
-  postgis_image:
+  postgis_17_image:
     repository: postgis/postgis
     tag: "17-3.5"
+  postgis_18_image:
+    repository: postgis/postgis
+    tag: "18-3.6"
+  postgres_upgrade_image:
+    repository: ixsystems/postgres-upgrade
+    tag: 1.1.3
   redis_image:
     repository: valkey/valkey
     tag: 9.0.0
diff --git a/trains/community/dawarich/1.1.43/migrations/insert_redis_password_field b/trains/community/dawarich/1.2.0/migrations/insert_redis_password_field
similarity index 100%
rename from trains/community/dawarich/1.1.43/migrations/insert_redis_password_field
rename to trains/community/dawarich/1.2.0/migrations/insert_redis_password_field
diff --git a/trains/community/dawarich/1.1.43/migrations/remove_db_data_field b/trains/community/dawarich/1.2.0/migrations/remove_db_data_field
similarity index 100%
rename from trains/community/dawarich/1.1.43/migrations/remove_db_data_field
rename to trains/community/dawarich/1.2.0/migrations/remove_db_data_field
diff --git a/trains/community/dawarich/1.1.43/migrations/remove_distance_unit_field b/trains/community/dawarich/1.2.0/migrations/remove_distance_unit_field
similarity index 100%
rename from trains/community/dawarich/1.1.43/migrations/remove_distance_unit_field
rename to trains/community/dawarich/1.2.0/migrations/remove_distance_unit_field
diff --git a/trains/community/dawarich/1.2.0/migrations/set_default_postgis_image b/trains/community/dawarich/1.2.0/migrations/set_default_postgis_image
new file mode 100755
index 0000000000..f022e697ce
--- /dev/null
+++ b/trains/community/dawarich/1.2.0/migrations/set_default_postgis_image
@@ -0,0 +1,20 @@
+#!/usr/bin/python3
+
+import os
+import sys
+import yaml
+
+
+def migrate(values):
+    if not values["dawarich"].get("postgres_image_selector"):
+        values["dawarich"]["postgres_image_selector"] = "postgis_17_image"
+    return values
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        exit(1)
+
+    if os.path.exists(sys.argv[1]):
+        with open(sys.argv[1], "r") as f:
+            print(yaml.dump(migrate(yaml.safe_load(f.read()))))
diff --git a/trains/community/dawarich/1.1.43/questions.yaml b/trains/community/dawarich/1.2.0/questions.yaml
similarity index 96%
rename from trains/community/dawarich/1.1.43/questions.yaml
rename to trains/community/dawarich/1.2.0/questions.yaml
index d429094993..bc2c4e5d3d 100644
--- a/trains/community/dawarich/1.1.43/questions.yaml
+++ b/trains/community/dawarich/1.2.0/questions.yaml
@@ -26,6 +26,24 @@ questions:
     schema:
       type: dict
       attrs:
+        - variable: postgres_image_selector
+          label: Postgres Image (CAUTION)
+          description: |
+            If you are changing this after the postgres directory has been initialized,</br>
+            STOP! and make sure you have a backup of your data.</br>
+            Changing this will trigger an one way database upgrade.</br>
+            You can only select newer versions of postgres.</br>
+            Selecting an older version will refuse to start.</br>
+            If something goes wrong, you will have to restore from backup.
+          schema:
+            type: string
+            default: postgis_18_image
+            required: true
+            enum:
+              - value: postgis_17_image
+                description: Postgres 17
+              - value: postgis_18_image
+                description: Postgres 18
         - variable: db_password
           label: Database Password
           description: The password for Dawarich.
diff --git a/trains/community/dawarich/1.1.43/templates/docker-compose.yaml b/trains/community/dawarich/1.2.0/templates/docker-compose.yaml
similarity index 98%
rename from trains/community/dawarich/1.1.43/templates/docker-compose.yaml
rename to trains/community/dawarich/1.2.0/templates/docker-compose.yaml
index 375b5e44f2..6aae9a8615 100644
--- a/trains/community/dawarich/1.1.43/templates/docker-compose.yaml
+++ b/trains/community/dawarich/1.2.0/templates/docker-compose.yaml
@@ -12,7 +12,7 @@
   "database": values.consts.db_name,
   "volume": values.storage.postgres_data,
 } %}
-{% set postgis = tpl.deps.postgres(values.consts.postgis_container_name, "postgis_image", pg_config, perm_container) %}
+{% set postgis = tpl.deps.postgres(values.consts.postgis_container_name, values.dawarich.postgres_image_selector, pg_config, perm_container) %}
 
 {# Redis #}
 {% set redis_config = {
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/__init__.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/__init__.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/__init__.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/__init__.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/client.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/client.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/client.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/client.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/configs.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/configs.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/configs.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/configs.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/container.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/container.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/container.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/container.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/depends.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/depends.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/depends.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/depends.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deploy.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deploy.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deploy.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deploy.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_elastic.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_elastic.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_elastic.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_elastic.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_mariadb.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_mariadb.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_mariadb.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_mariadb.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_meilisearch.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_meilisearch.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_meilisearch.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_meilisearch.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_mongodb.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_mongodb.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_mongodb.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_mongodb.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_perms.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_perms.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_perms.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_perms.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_postgres.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_postgres.py
similarity index 94%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_postgres.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_postgres.py
index 8269990377..1e6f7471c8 100644
--- a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_postgres.py
+++ b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_postgres.py
@@ -34,6 +34,11 @@ SUPPORTED_REPOS = [
     "pgvector/pgvector",
     "ghcr.io/immich-app/postgres",
 ]
+SUPPORTED_UPGRADE_REPOS = [
+    "postgres",
+    "postgis/postgis",
+    "pgvector/pgvector",
+]
 
 
 def get_major_version(variant: str, tag: str):
@@ -52,15 +57,16 @@ def get_major_version(variant: str, tag: str):
             return x.split("-")[0]
 
     elif variant == "pgvector/pgvector":
-        # 0.8.1-pg17
-        regex = re.compile(r"^\d+\.\d+\.\d+\-pg\d+")
+        # 0.8.1-pg17-trixie
+        regex = re.compile(r"^\d+\.\d+\.\d+\-pg\d+(\-\w+)?")
 
         def oper(x):
-            return x.split("-")[1].lstrip("pg")
+            parts = x.split("-")
+            return parts[1].lstrip("pg")
 
     elif variant == "ghcr.io/immich-app/postgres":
-        # 15-vectorchord0.4.3-pgvectors0.2.0
-        regex = re.compile(r"^\d+\-vectorchord\d+\.\d+\.\d+(\-pgvectors?\d+\.\d+\.\d+)?")
+        # 15-vectorchord0.4.3
+        regex = re.compile(r"^\d+\-vectorchord\d+\.\d+\.\d+")
 
         def oper(x):
             return x.split("-")[0]
@@ -113,7 +119,7 @@ class PostgresContainer:
 
         # eg we don't want to handle upgrades of pg_vector or immich at the moment
         repo = self._get_repo(image)
-        if repo == "postgres":
+        if repo in SUPPORTED_UPGRADE_REPOS:
             self._data_dir = "/var/lib/postgresql"
             target_major_version = self._get_target_version(image)
             # This is the new format upstream Postgres uses/suggests.
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_redis.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_redis.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_redis.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_redis.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_solr.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_solr.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_solr.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_solr.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_tika.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_tika.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_tika.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/deps_tika.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/device.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/device.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/device.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/device.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/device_cgroup_rules.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/device_cgroup_rules.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/device_cgroup_rules.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/device_cgroup_rules.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/devices.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/devices.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/devices.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/devices.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/dns.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/dns.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/dns.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/dns.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/environment.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/environment.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/environment.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/environment.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/error.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/error.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/error.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/error.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/expose.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/expose.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/expose.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/expose.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/extra_hosts.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/extra_hosts.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/extra_hosts.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/extra_hosts.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/formatter.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/formatter.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/formatter.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/formatter.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/functions.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/functions.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/functions.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/functions.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/healthcheck.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/healthcheck.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/healthcheck.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/healthcheck.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/labels.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/labels.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/labels.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/labels.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/notes.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/notes.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/notes.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/notes.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/portals.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/portals.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/portals.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/portals.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/ports.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/ports.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/ports.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/ports.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/render.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/render.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/render.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/render.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/resources.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/resources.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/resources.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/resources.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/restart.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/restart.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/restart.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/restart.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/security_opts.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/security_opts.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/security_opts.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/security_opts.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/storage.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/storage.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/storage.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/storage.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/sysctls.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/sysctls.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/sysctls.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/sysctls.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/__init__.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/__init__.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/__init__.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/__init__.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_build_image.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_build_image.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_build_image.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_build_image.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_configs.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_configs.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_configs.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_configs.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_container.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_container.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_container.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_container.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_depends.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_depends.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_depends.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_depends.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_deps.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_deps.py
similarity index 99%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_deps.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_deps.py
index 2792798b03..197486537a 100644
--- a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_deps.py
+++ b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_deps.py
@@ -537,7 +537,10 @@ def test_add_postgres_with_invalid_tag(mock_values):
 
 
 def test_no_upgrade_container_with_non_postgres_image(mock_values):
-    mock_values["images"]["postgres_image"] = {"repository": "pgvector/pgvector", "tag": "0.8.1-pg17"}
+    mock_values["images"]["postgres_image"] = {
+        "repository": "ghcr.io/immich-app/postgres",
+        "tag": "15-vectorchord0.4.3-pgvectors0.2.0",
+    }
     render = Render(mock_values)
     c1 = render.add_container("test_container", "test_image")
     c1.healthcheck.disable()
@@ -605,7 +608,7 @@ def test_postgres_with_upgrade_container(mock_values):
 
 
 def test_add_mongodb(mock_values):
-    mock_values["images"]["mongodb_image"] = {"repository": "mongodb", "tag": "latest"}
+    mock_values["images"]["mongodb_image"] = {"repository": "mongo", "tag": "latest"}
     render = Render(mock_values)
     c1 = render.add_container("test_container", "test_image")
     c1.healthcheck.disable()
@@ -627,7 +630,7 @@ def test_add_mongodb(mock_values):
     output = render.render()
     assert "devices" not in output["services"]["mongodb_container"]
     assert "reservations" not in output["services"]["mongodb_container"]["deploy"]["resources"]
-    assert output["services"]["mongodb_container"]["image"] == "mongodb:latest"
+    assert output["services"]["mongodb_container"]["image"] == "mongo:latest"
     assert output["services"]["mongodb_container"]["user"] == "568:568"
     assert output["services"]["mongodb_container"]["deploy"]["resources"]["limits"]["cpus"] == "2.0"
     assert output["services"]["mongodb_container"]["deploy"]["resources"]["limits"]["memory"] == "4096M"
@@ -781,7 +784,7 @@ def test_add_meilisearch_unsupported_repo(mock_values):
 
 def test_add_elasticsearch(mock_values):
     mock_values["images"]["elastic_image"] = {
-        "repository": "docker.elastic.co/elasticsearch/elasticsearch",
+        "repository": "elasticsearch",
         "tag": "9.1.2",
     }
     render = Render(mock_values)
@@ -804,7 +807,7 @@ def test_add_elasticsearch(mock_values):
     output = render.render()
     assert "devices" not in output["services"]["elastic_container"]
     assert "reservations" not in output["services"]["elastic_container"]["deploy"]["resources"]
-    assert output["services"]["elastic_container"]["image"] == "docker.elastic.co/elasticsearch/elasticsearch:9.1.2"
+    assert output["services"]["elastic_container"]["image"] == "elasticsearch:9.1.2"
     assert output["services"]["elastic_container"]["user"] == "1000:1000"
     assert output["services"]["elastic_container"]["deploy"]["resources"]["limits"]["cpus"] == "2.0"
     assert output["services"]["elastic_container"]["deploy"]["resources"]["limits"]["memory"] == "4096M"
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_device.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_device.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_device.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_device.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_device_cgroup_rules.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_device_cgroup_rules.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_device_cgroup_rules.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_device_cgroup_rules.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_dns.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_dns.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_dns.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_dns.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_environment.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_environment.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_environment.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_environment.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_expose.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_expose.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_expose.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_expose.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_extra_hosts.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_extra_hosts.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_extra_hosts.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_extra_hosts.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_formatter.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_formatter.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_formatter.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_formatter.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_functions.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_functions.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_functions.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_functions.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_healthcheck.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_healthcheck.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_healthcheck.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_healthcheck.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_labels.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_labels.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_labels.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_labels.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_notes.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_notes.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_notes.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_notes.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_portal.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_portal.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_portal.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_portal.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_ports.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_ports.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_ports.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_ports.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_render.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_render.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_render.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_render.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_resources.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_resources.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_resources.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_resources.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_restart.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_restart.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_restart.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_restart.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_security_opts.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_security_opts.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_security_opts.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_security_opts.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_sysctls.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_sysctls.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_sysctls.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_sysctls.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_validations.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_validations.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_validations.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_validations.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_volumes.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_volumes.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tests/test_volumes.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tests/test_volumes.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tmpfs.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tmpfs.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/tmpfs.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/tmpfs.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/validations.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/validations.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/validations.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/validations.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/volume_mount.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/volume_mount.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/volume_mount.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/volume_mount.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/volume_mount_types.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/volume_mount_types.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/volume_mount_types.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/volume_mount_types.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/volume_sources.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/volume_sources.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/volume_sources.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/volume_sources.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/volume_types.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/volume_types.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/volume_types.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/volume_types.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/volumes.py b/trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/volumes.py
similarity index 100%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/volumes.py
rename to trains/community/dawarich/1.2.0/templates/library/base_v2_1_66/volumes.py
diff --git a/trains/community/dawarich/1.1.43/templates/test_values/basic-values.yaml b/trains/community/dawarich/1.2.0/templates/test_values/basic-values.yaml
similarity index 95%
rename from trains/community/dawarich/1.1.43/templates/test_values/basic-values.yaml
rename to trains/community/dawarich/1.2.0/templates/test_values/basic-values.yaml
index 2f257ab664..ba8c6eecf1 100644
--- a/trains/community/dawarich/1.1.43/templates/test_values/basic-values.yaml
+++ b/trains/community/dawarich/1.2.0/templates/test_values/basic-values.yaml
@@ -6,6 +6,7 @@ resources:
 TZ: Etc/UTC
 
 dawarich:
+  postgres_image_selector: postgis_18_image
   db_password: secret
   redis_password: secret
   application_hosts:
diff --git a/trains/community/librechat/1.0.15/README.md b/trains/community/librechat/1.0.16/README.md
similarity index 100%
rename from trains/community/librechat/1.0.15/README.md
rename to trains/community/librechat/1.0.16/README.md
diff --git a/trains/community/librechat/1.0.15/app.yaml b/trains/community/librechat/1.0.16/app.yaml
similarity index 90%
rename from trains/community/librechat/1.0.15/app.yaml
rename to trains/community/librechat/1.0.16/app.yaml
index 7bdcc4d89c..9924fa6815 100644
--- a/trains/community/librechat/1.0.15/app.yaml
+++ b/trains/community/librechat/1.0.16/app.yaml
@@ -15,8 +15,8 @@ keywords:
 - ai
 - librechat
 - open-source
-lib_version: 2.1.65
-lib_version_hash: f92a9ee78c78fc77f86e7d8b545bd4c605c31c599e2c5da59f1615aa516cb8b5
+lib_version: 2.1.66
+lib_version_hash: 986abcd60fd0cc6277c80d55d2798356ddda1bd6348580ca7198b003571707fa
 maintainers:
 - email: dev@truenas.com
   name: truenas
@@ -48,4 +48,4 @@ sources:
 - https://github.com/LibreChat/LibreChat
 title: LibreChat
 train: community
-version: 1.0.15
+version: 1.0.16
diff --git a/trains/community/librechat/1.0.15/ix_values.yaml b/trains/community/librechat/1.0.16/ix_values.yaml
similarity index 89%
rename from trains/community/librechat/1.0.15/ix_values.yaml
rename to trains/community/librechat/1.0.16/ix_values.yaml
index fc7aa66c42..09c3d3f093 100644
--- a/trains/community/librechat/1.0.15/ix_values.yaml
+++ b/trains/community/librechat/1.0.16/ix_values.yaml
@@ -17,9 +17,12 @@ images:
   postgres_17_image:
     repository: pgvector/pgvector
     tag: 0.8.1-pg17
+  postgres_18_image:
+    repository: pgvector/pgvector
+    tag: 0.8.1-pg18-trixie
   postgres_upgrade_image:
     repository: ixsystems/postgres-upgrade
-    tag: 1.1.2
+    tag: 1.1.3
 
 consts:
   librechat_container_name: librechat
diff --git a/trains/community/librechat/1.0.15/questions.yaml b/trains/community/librechat/1.0.16/questions.yaml
similarity index 99%
rename from trains/community/librechat/1.0.15/questions.yaml
rename to trains/community/librechat/1.0.16/questions.yaml
index 1750a4899c..377b2dde28 100644
--- a/trains/community/librechat/1.0.15/questions.yaml
+++ b/trains/community/librechat/1.0.16/questions.yaml
@@ -39,11 +39,13 @@ questions:
             If something goes wrong, you will have to restore from backup.
           schema:
             type: string
-            default: postgres_17_image
+            default: postgres_18_image
             required: true
             enum:
               - value: postgres_17_image
                 description: Postgres 17
+              - value: postgres_18_image
+                description: Postgres 18
         - variable: pg_db_password
           label: Postgres Database Password
           schema:
diff --git a/trains/community/librechat/1.0.15/templates/docker-compose.yaml b/trains/community/librechat/1.0.16/templates/docker-compose.yaml
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/docker-compose.yaml
rename to trains/community/librechat/1.0.16/templates/docker-compose.yaml
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/__init__.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/__init__.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/__init__.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/__init__.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/client.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/client.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/client.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/client.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/configs.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/configs.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/configs.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/configs.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/container.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/container.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/container.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/container.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/depends.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/depends.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/depends.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/depends.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deploy.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deploy.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deploy.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deploy.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_elastic.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_elastic.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_elastic.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_elastic.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_mariadb.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_mariadb.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_mariadb.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_mariadb.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_meilisearch.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_meilisearch.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_meilisearch.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_meilisearch.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_mongodb.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_mongodb.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_mongodb.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_mongodb.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_perms.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_perms.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_perms.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_perms.py
diff --git a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_postgres.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_postgres.py
similarity index 94%
rename from trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_postgres.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_postgres.py
index 8269990377..1e6f7471c8 100644
--- a/trains/community/dawarich/1.1.43/templates/library/base_v2_1_65/deps_postgres.py
+++ b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_postgres.py
@@ -34,6 +34,11 @@ SUPPORTED_REPOS = [
     "pgvector/pgvector",
     "ghcr.io/immich-app/postgres",
 ]
+SUPPORTED_UPGRADE_REPOS = [
+    "postgres",
+    "postgis/postgis",
+    "pgvector/pgvector",
+]
 
 
 def get_major_version(variant: str, tag: str):
@@ -52,15 +57,16 @@ def get_major_version(variant: str, tag: str):
             return x.split("-")[0]
 
     elif variant == "pgvector/pgvector":
-        # 0.8.1-pg17
-        regex = re.compile(r"^\d+\.\d+\.\d+\-pg\d+")
+        # 0.8.1-pg17-trixie
+        regex = re.compile(r"^\d+\.\d+\.\d+\-pg\d+(\-\w+)?")
 
         def oper(x):
-            return x.split("-")[1].lstrip("pg")
+            parts = x.split("-")
+            return parts[1].lstrip("pg")
 
     elif variant == "ghcr.io/immich-app/postgres":
-        # 15-vectorchord0.4.3-pgvectors0.2.0
-        regex = re.compile(r"^\d+\-vectorchord\d+\.\d+\.\d+(\-pgvectors?\d+\.\d+\.\d+)?")
+        # 15-vectorchord0.4.3
+        regex = re.compile(r"^\d+\-vectorchord\d+\.\d+\.\d+")
 
         def oper(x):
             return x.split("-")[0]
@@ -113,7 +119,7 @@ class PostgresContainer:
 
         # eg we don't want to handle upgrades of pg_vector or immich at the moment
         repo = self._get_repo(image)
-        if repo == "postgres":
+        if repo in SUPPORTED_UPGRADE_REPOS:
             self._data_dir = "/var/lib/postgresql"
             target_major_version = self._get_target_version(image)
             # This is the new format upstream Postgres uses/suggests.
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_redis.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_redis.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_redis.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_redis.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_solr.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_solr.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_solr.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_solr.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_tika.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_tika.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/deps_tika.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/deps_tika.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/device.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/device.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/device.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/device.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/device_cgroup_rules.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/device_cgroup_rules.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/device_cgroup_rules.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/device_cgroup_rules.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/devices.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/devices.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/devices.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/devices.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/dns.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/dns.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/dns.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/dns.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/environment.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/environment.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/environment.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/environment.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/error.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/error.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/error.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/error.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/expose.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/expose.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/expose.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/expose.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/extra_hosts.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/extra_hosts.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/extra_hosts.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/extra_hosts.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/formatter.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/formatter.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/formatter.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/formatter.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/functions.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/functions.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/functions.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/functions.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/healthcheck.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/healthcheck.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/healthcheck.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/healthcheck.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/labels.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/labels.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/labels.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/labels.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/notes.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/notes.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/notes.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/notes.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/portals.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/portals.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/portals.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/portals.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/ports.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/ports.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/ports.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/ports.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/render.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/render.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/render.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/render.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/resources.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/resources.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/resources.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/resources.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/restart.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/restart.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/restart.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/restart.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/security_opts.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/security_opts.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/security_opts.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/security_opts.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/storage.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/storage.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/storage.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/storage.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/sysctls.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/sysctls.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/sysctls.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/sysctls.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/__init__.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/__init__.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/__init__.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/__init__.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_build_image.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_build_image.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_build_image.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_build_image.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_configs.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_configs.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_configs.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_configs.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_container.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_container.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_container.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_container.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_depends.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_depends.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_depends.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_depends.py
diff --git a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_deps.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_deps.py
similarity index 99%
rename from trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_deps.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_deps.py
index 2792798b03..197486537a 100644
--- a/trains/community/chatwoot/1.0.29/templates/library/base_v2_1_65/tests/test_deps.py
+++ b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_deps.py
@@ -537,7 +537,10 @@ def test_add_postgres_with_invalid_tag(mock_values):
 
 
 def test_no_upgrade_container_with_non_postgres_image(mock_values):
-    mock_values["images"]["postgres_image"] = {"repository": "pgvector/pgvector", "tag": "0.8.1-pg17"}
+    mock_values["images"]["postgres_image"] = {
+        "repository": "ghcr.io/immich-app/postgres",
+        "tag": "15-vectorchord0.4.3-pgvectors0.2.0",
+    }
     render = Render(mock_values)
     c1 = render.add_container("test_container", "test_image")
     c1.healthcheck.disable()
@@ -605,7 +608,7 @@ def test_postgres_with_upgrade_container(mock_values):
 
 
 def test_add_mongodb(mock_values):
-    mock_values["images"]["mongodb_image"] = {"repository": "mongodb", "tag": "latest"}
+    mock_values["images"]["mongodb_image"] = {"repository": "mongo", "tag": "latest"}
     render = Render(mock_values)
     c1 = render.add_container("test_container", "test_image")
     c1.healthcheck.disable()
@@ -627,7 +630,7 @@ def test_add_mongodb(mock_values):
     output = render.render()
     assert "devices" not in output["services"]["mongodb_container"]
     assert "reservations" not in output["services"]["mongodb_container"]["deploy"]["resources"]
-    assert output["services"]["mongodb_container"]["image"] == "mongodb:latest"
+    assert output["services"]["mongodb_container"]["image"] == "mongo:latest"
     assert output["services"]["mongodb_container"]["user"] == "568:568"
     assert output["services"]["mongodb_container"]["deploy"]["resources"]["limits"]["cpus"] == "2.0"
     assert output["services"]["mongodb_container"]["deploy"]["resources"]["limits"]["memory"] == "4096M"
@@ -781,7 +784,7 @@ def test_add_meilisearch_unsupported_repo(mock_values):
 
 def test_add_elasticsearch(mock_values):
     mock_values["images"]["elastic_image"] = {
-        "repository": "docker.elastic.co/elasticsearch/elasticsearch",
+        "repository": "elasticsearch",
         "tag": "9.1.2",
     }
     render = Render(mock_values)
@@ -804,7 +807,7 @@ def test_add_elasticsearch(mock_values):
     output = render.render()
     assert "devices" not in output["services"]["elastic_container"]
     assert "reservations" not in output["services"]["elastic_container"]["deploy"]["resources"]
-    assert output["services"]["elastic_container"]["image"] == "docker.elastic.co/elasticsearch/elasticsearch:9.1.2"
+    assert output["services"]["elastic_container"]["image"] == "elasticsearch:9.1.2"
     assert output["services"]["elastic_container"]["user"] == "1000:1000"
     assert output["services"]["elastic_container"]["deploy"]["resources"]["limits"]["cpus"] == "2.0"
     assert output["services"]["elastic_container"]["deploy"]["resources"]["limits"]["memory"] == "4096M"
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_device.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_device.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_device.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_device.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_device_cgroup_rules.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_device_cgroup_rules.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_device_cgroup_rules.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_device_cgroup_rules.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_dns.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_dns.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_dns.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_dns.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_environment.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_environment.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_environment.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_environment.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_expose.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_expose.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_expose.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_expose.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_extra_hosts.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_extra_hosts.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_extra_hosts.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_extra_hosts.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_formatter.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_formatter.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_formatter.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_formatter.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_functions.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_functions.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_functions.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_functions.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_healthcheck.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_healthcheck.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_healthcheck.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_healthcheck.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_labels.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_labels.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_labels.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_labels.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_notes.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_notes.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_notes.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_notes.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_portal.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_portal.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_portal.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_portal.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_ports.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_ports.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_ports.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_ports.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_render.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_render.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_render.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_render.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_resources.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_resources.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_resources.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_resources.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_restart.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_restart.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_restart.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_restart.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_security_opts.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_security_opts.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_security_opts.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_security_opts.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_sysctls.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_sysctls.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_sysctls.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_sysctls.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_validations.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_validations.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_validations.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_validations.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_volumes.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_volumes.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tests/test_volumes.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tests/test_volumes.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tmpfs.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tmpfs.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/tmpfs.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/tmpfs.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/validations.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/validations.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/validations.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/validations.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/volume_mount.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/volume_mount.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/volume_mount.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/volume_mount.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/volume_mount_types.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/volume_mount_types.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/volume_mount_types.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/volume_mount_types.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/volume_sources.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/volume_sources.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/volume_sources.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/volume_sources.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/volume_types.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/volume_types.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/volume_types.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/volume_types.py
diff --git a/trains/community/librechat/1.0.15/templates/library/base_v2_1_65/volumes.py b/trains/community/librechat/1.0.16/templates/library/base_v2_1_66/volumes.py
similarity index 100%
rename from trains/community/librechat/1.0.15/templates/library/base_v2_1_65/volumes.py
rename to trains/community/librechat/1.0.16/templates/library/base_v2_1_66/volumes.py
diff --git a/trains/community/librechat/1.0.15/templates/test_values/basic-values.yaml b/trains/community/librechat/1.0.16/templates/test_values/basic-values.yaml
similarity index 96%
rename from trains/community/librechat/1.0.15/templates/test_values/basic-values.yaml
rename to trains/community/librechat/1.0.16/templates/test_values/basic-values.yaml
index 2cd577448a..e72cc986ef 100644
--- a/trains/community/librechat/1.0.15/templates/test_values/basic-values.yaml
+++ b/trains/community/librechat/1.0.16/templates/test_values/basic-values.yaml
@@ -4,7 +4,7 @@ resources:
     memory: 4096
 
 librechat:
-  postgres_image_selector: postgres_17_image
+  postgres_image_selector: postgres_18_image
   pg_db_password: secret
   mongo_db_password: secret
   meilisearch_master_key: secret