diff --git a/.devcontainer/pgsql/docker-compose.yaml b/.devcontainer/pgsql/docker-compose.yaml
index 891a03673f..1cab707622 100644
--- a/.devcontainer/pgsql/docker-compose.yaml
+++ b/.devcontainer/pgsql/docker-compose.yaml
@@ -22,13 +22,13 @@ services:
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 
   db:
-    image: postgres:14.3
+    image: postgres:17.2
     restart: unless-stopped
     volumes:
       - postgres-data:/var/lib/postgresql/data
     environment:
       POSTGRES_PASSWORD: jellyfin
-      POSTGRES_USER: password
+      POSTGRES_USER: jellyfin
       POSTGRES_DB: Jellyfin
   pgadmin:
     image: dpage/pgadmin4
diff --git a/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/20250127174201_InitMigration.cs b/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/20250127174201_InitMigration.cs
index f1d0d15647..01ddd5ec96 100644
--- a/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/20250127174201_InitMigration.cs
+++ b/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/20250127174201_InitMigration.cs
@@ -12,6 +12,9 @@ namespace Jellyfin.Database.Providers.PgSql.Migrations
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            // shim NOCASE collation with an undefined locale and case-insensitive matching rules.
+            migrationBuilder.Sql("CREATE COLLATION NOCASE (provider = icu, locale = 'und-x-icu.utf8', deterministic = false)");
+
             migrationBuilder.CreateTable(
                 name: "ActivityLogs",
                 columns: table => new