diff --git a/ix-dev/stable/home-assistant/app.yaml b/ix-dev/stable/home-assistant/app.yaml
index 1c470d7249..4e89d922fb 100644
--- a/ix-dev/stable/home-assistant/app.yaml
+++ b/ix-dev/stable/home-assistant/app.yaml
@@ -45,4 +45,4 @@ sources:
 - https://github.com/truenas/charts/tree/master/charts/home-assistant
 title: Home Assistant
 train: stable
-version: 1.3.5
+version: 1.4.0
diff --git a/ix-dev/stable/home-assistant/ix_values.yaml b/ix-dev/stable/home-assistant/ix_values.yaml
index 0aba9340e1..135e3498dd 100644
--- a/ix-dev/stable/home-assistant/ix_values.yaml
+++ b/ix-dev/stable/home-assistant/ix_values.yaml
@@ -2,9 +2,12 @@ images:
   image:
     repository: homeassistant/home-assistant
     tag: "2024.12.0"
-  postgres_image:
+  postgres_13_image:
     repository: postgres
     tag: "13.18"
+  postgres_17_image:
+    repository: postgres
+    tag: "17.2"
   yq_image:
     repository: mikefarah/yq
     tag: "4.44.5"
diff --git a/ix-dev/stable/home-assistant/questions.yaml b/ix-dev/stable/home-assistant/questions.yaml
index 5636015161..edb325b77e 100644
--- a/ix-dev/stable/home-assistant/questions.yaml
+++ b/ix-dev/stable/home-assistant/questions.yaml
@@ -29,6 +29,22 @@ 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>
+            If something goes wrong, you will have to restore from backup.
+          schema:
+            type: string
+            default: postgres_13_image
+            required: true
+            enum:
+              - value: postgres_13_image
+                description: Postgres 13
+              - value: postgres_17_image
+                description: Postgres 17
         - variable: db_password
           label: Database Password
           description: The password for Home Assistant.
diff --git a/ix-dev/stable/home-assistant/templates/docker-compose.yaml b/ix-dev/stable/home-assistant/templates/docker-compose.yaml
index 1a8913df54..bcf9766c0f 100644
--- a/ix-dev/stable/home-assistant/templates/docker-compose.yaml
+++ b/ix-dev/stable/home-assistant/templates/docker-compose.yaml
@@ -12,7 +12,12 @@
   "database": values.home_assistant.db_name,
   "volume": values.storage.postgres_data,
 } %}
-{% set postgres = tpl.deps.postgres(values.consts.postgres_container_name, "postgres_image", pg_config, perm_container) %}
+
+{% set postgres = tpl.deps.postgres(
+  values.consts.postgres_container_name,
+  values.home_assistant.postgres_image_selector,
+  pg_config, perm_container
+) %}
 
 {% do init.set_user(0, 0) %}
 {% do init.add_caps(["CHOWN", "FOWNER", "DAC_OVERRIDE"]) %}
diff --git a/ix-dev/stable/home-assistant/templates/test_values/basic-values.yaml b/ix-dev/stable/home-assistant/templates/test_values/basic-values.yaml
index 926e38ae05..af487e2923 100644
--- a/ix-dev/stable/home-assistant/templates/test_values/basic-values.yaml
+++ b/ix-dev/stable/home-assistant/templates/test_values/basic-values.yaml
@@ -6,6 +6,7 @@ resources:
 TZ: Europe/Paris
 
 home_assistant:
+  postgres_image_selector: postgres_17_image
   db_password: db-home-assistant-password
   db_user: home-assistant
   db_name: home-assistant
diff --git a/ix-dev/stable/nextcloud/app.yaml b/ix-dev/stable/nextcloud/app.yaml
index bb0473ec16..5c06bc8262 100644
--- a/ix-dev/stable/nextcloud/app.yaml
+++ b/ix-dev/stable/nextcloud/app.yaml
@@ -66,4 +66,4 @@ sources:
 - https://github.com/truenas/charts/tree/master/charts/nextcloud
 title: Nextcloud
 train: stable
-version: 1.4.16
+version: 1.5.0
diff --git a/ix-dev/stable/nextcloud/ix_values.yaml b/ix-dev/stable/nextcloud/ix_values.yaml
index 0c525f4fe1..57ce494e37 100644
--- a/ix-dev/stable/nextcloud/ix_values.yaml
+++ b/ix-dev/stable/nextcloud/ix_values.yaml
@@ -5,9 +5,12 @@ images:
   nginx_image:
     repository: nginx
     tag: 1.27.3
-  postgres_image:
+  postgres_13_image:
     repository: postgres
     tag: 13.18
+  postgres_17_image:
+    repository: postgres
+    tag: "17.2"
   redis_image:
     repository: bitnami/redis
     tag: 7.4.1
diff --git a/ix-dev/stable/nextcloud/questions.yaml b/ix-dev/stable/nextcloud/questions.yaml
index 1f1360bfe9..e7ef791096 100644
--- a/ix-dev/stable/nextcloud/questions.yaml
+++ b/ix-dev/stable/nextcloud/questions.yaml
@@ -17,6 +17,22 @@ 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>
+            If something goes wrong, you will have to restore from backup.
+          schema:
+            type: string
+            default: postgres_13_image
+            required: true
+            enum:
+              - value: postgres_13_image
+                description: Postgres 13
+              - value: postgres_17_image
+                description: Postgres 17
         - variable: admin_user
           label: Admin User
           description: The admin user for Nextcloud.
diff --git a/ix-dev/stable/nextcloud/templates/docker-compose.yaml b/ix-dev/stable/nextcloud/templates/docker-compose.yaml
index 39002f3eca..a2f796b515 100644
--- a/ix-dev/stable/nextcloud/templates/docker-compose.yaml
+++ b/ix-dev/stable/nextcloud/templates/docker-compose.yaml
@@ -44,7 +44,11 @@
   "database": values.consts.db_name,
   "volume": values.storage.postgres_data,
 } %}
-{% set postgres = tpl.deps.postgres(values.consts.postgres_container_name, "postgres_image", pg_config, perm_container) %}
+{% set postgres = tpl.deps.postgres(
+  values.consts.postgres_container_name,
+  values.nextcloud.postgres_image_selector,
+  pg_config, perm_container
+) %}
 
 {% do tpl.funcs.disallow_chars(values.nextcloud.redis_password, ["&", "@", "#", "%"], "redis_password") %}
 {% set redis_config = {
diff --git a/ix-dev/stable/nextcloud/templates/test_values/basic-values.yaml b/ix-dev/stable/nextcloud/templates/test_values/basic-values.yaml
index 38b059e462..2151f6ad15 100644
--- a/ix-dev/stable/nextcloud/templates/test_values/basic-values.yaml
+++ b/ix-dev/stable/nextcloud/templates/test_values/basic-values.yaml
@@ -4,6 +4,7 @@ resources:
     memory: 4096
 
 nextcloud:
+  postgres_image_selector: postgres_17_image
   admin_user: admin
   admin_password: password
   apt_packages:
diff --git a/ix-dev/stable/nextcloud/templates/test_values/https-values.yaml b/ix-dev/stable/nextcloud/templates/test_values/https-values.yaml
index f0fa7282bf..7a45a938ad 100644
--- a/ix-dev/stable/nextcloud/templates/test_values/https-values.yaml
+++ b/ix-dev/stable/nextcloud/templates/test_values/https-values.yaml
@@ -4,6 +4,7 @@ resources:
     memory: 4096
 
 nextcloud:
+  postgres_image_selector: postgres_17_image
   admin_user: admin
   admin_password: password
   apt_packages:
diff --git a/ix-dev/stable/nextcloud/templates/test_values/no-cron-values.yaml b/ix-dev/stable/nextcloud/templates/test_values/no-cron-values.yaml
index a4b693c64d..dc8046aaeb 100644
--- a/ix-dev/stable/nextcloud/templates/test_values/no-cron-values.yaml
+++ b/ix-dev/stable/nextcloud/templates/test_values/no-cron-values.yaml
@@ -4,6 +4,7 @@ resources:
     memory: 4096
 
 nextcloud:
+  postgres_image_selector: postgres_17_image
   admin_user: admin
   admin_password: password
   apt_packages:
diff --git a/ix-dev/stable/nextcloud/templates/test_values/same-vol-values.yaml b/ix-dev/stable/nextcloud/templates/test_values/same-vol-values.yaml
index eac8fc27d5..0d6f316694 100644
--- a/ix-dev/stable/nextcloud/templates/test_values/same-vol-values.yaml
+++ b/ix-dev/stable/nextcloud/templates/test_values/same-vol-values.yaml
@@ -4,6 +4,7 @@ resources:
     memory: 4096
 
 nextcloud:
+  postgres_image_selector: postgres_17_image
   admin_user: admin
   admin_password: password
   apt_packages: