diff --git a/Build/scripts/Start-Pgsql.ps1 b/Build/scripts/Start-Pgsql.ps1
index 3a936cca..af2f047d 100644
--- a/Build/scripts/Start-Pgsql.ps1
+++ b/Build/scripts/Start-Pgsql.ps1
@@ -5,7 +5,7 @@ function Start-Pgsql {
     $npgsqldll = Join-Path $PSScriptRoot 'Npgsql.dll'
     Add-Type -Path $npgsqldll
 
-    $container = Start-Container -Image sqldatabase/postgres:13.3 -ContainerPort 5432
+    $container = Start-Container -Image sqldatabase/postgres:18.0 -ContainerPort 5432
 
     $builder = New-Object -TypeName Npgsql.NpgsqlConnectionStringBuilder
     $builder['Database'] = 'sqldatabasetest'
diff --git a/Build/tasks/create-images-tasks.ps1 b/Build/tasks/create-images-tasks.ps1
index 1c0b5ed0..a31bb182 100644
--- a/Build/tasks/create-images-tasks.ps1
+++ b/Build/tasks/create-images-tasks.ps1
@@ -25,12 +25,12 @@ task BuildMsSqlDatabase {
 }
 
 task BuildPgSqlDatabase {
-    $dockerfile = Join-Path $context 'image-postgres-133.dockerfile'
+    $dockerfile = Join-Path $context 'image-postgres.dockerfile'
     exec {
         docker build `
             --pull `
             -f $dockerfile `
-            -t sqldatabase/postgres:13.3 `
+            -t sqldatabase/postgres:18.0 `
             $context
     }
 }
diff --git a/Sources/Docker/docker-compose.yml b/Sources/Docker/docker-compose.yml
index e5ee83b1..84a55dba 100644
--- a/Sources/Docker/docker-compose.yml
+++ b/Sources/Docker/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       - 1433:1433
 
   pgsql:
-    image: sqldatabase/postgres:13.3
+    image: sqldatabase/postgres:18.0
     restart: always
     ports:
       - 5432:5432
diff --git a/Sources/Docker/image-postgres-133.dockerfile b/Sources/Docker/image-postgres.dockerfile
similarity index 77%
rename from Sources/Docker/image-postgres-133.dockerfile
rename to Sources/Docker/image-postgres.dockerfile
index 903ac9c8..7b75bcdb 100644
--- a/Sources/Docker/image-postgres-133.dockerfile
+++ b/Sources/Docker/image-postgres.dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:13.3-alpine
+FROM postgres:18.0-alpine
 
 ENV POSTGRES_PASSWORD=qwerty