diff --git a/app/Models/StandalonePostgresql.php b/app/Models/StandalonePostgresql.php
index be86438fe..ea59ccaa9 100644
--- a/app/Models/StandalonePostgresql.php
+++ b/app/Models/StandalonePostgresql.php
@@ -28,9 +28,23 @@ class StandalonePostgresql extends BaseModel
protected static function booted()
{
static::created(function ($database) {
+ // This is really stupid and it took me 1h to figure out why the image was not loading properly. This is exactly the reason why we need to use the action pattern because Model events and Accessors are a fragile mess!
+ $image = (string) ($database->getAttributes()['image'] ?? '');
+ $majorVersion = 0;
+
+ if (preg_match('/:(\d+)/', $image, $matches)) {
+ $majorVersion = (int) $matches[1];
+ }
+
+ // PostgreSQL 18+ uses /var/lib/postgresql as mount path
+ // Older versions use /var/lib/postgresql/data
+ $mountPath = $majorVersion >= 18
+ ? '/var/lib/postgresql'
+ : '/var/lib/postgresql/data';
+
LocalPersistentVolume::create([
'name' => 'postgres-data-'.$database->uuid,
- 'mount_path' => '/var/lib/postgresql/data',
+ 'mount_path' => $mountPath,
'host_path' => null,
'resource_id' => $database->id,
'resource_type' => $database->getMorphClass(),
diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php
index 03316277f..8f97c22d8 100644
--- a/resources/views/livewire/project/new/select.blade.php
+++ b/resources/views/livewire/project/new/select.blade.php
@@ -448,14 +448,56 @@ function searchResources() {
Select a Postgresql type
If you need extra extensions, you can select Supabase PostgreSQL (or others), otherwise select
PostgreSQL
- 17 (default).
-
+ 18 (default).
+
+
+
+
PostgreSQL 18 (default)
+
+ PostgreSQL is a powerful, open-source object-relational database system (no extensions).
+