diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index b7490df3..daa6c86f 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        postgres: ['16', '17']
+        postgres: ['15', '16', '17']
         platform: ['linux/amd64', 'linux/arm64']
 
     steps:
diff --git a/Dockerfile b/Dockerfile
index 4d3d45e3..6adf5562 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,12 +4,14 @@ FROM postgres_base AS base
 ### BUILDER
 ###
 FROM base AS builder
+ARG POSTGRES_VERSION
 
 RUN apt-get update -qq && \
   apt-get install -y \
+    postgresql-server-dev-${POSTGRES_VERSION} \
     build-essential libreadline-dev zlib1g-dev flex bison libxml2-dev libxslt-dev \
     libssl-dev libxml2-utils xsltproc pkg-config libc++-dev libc++abi-dev libglib2.0-dev \
-    libtinfo5 cmake libstdc++-12-dev postgresql-server-dev-16 liblz4-dev ccache && \
+    libtinfo5 cmake libstdc++-12-dev liblz4-dev ccache && \
   rm -rf /var/lib/apt/lists/*
 
 WORKDIR /build
diff --git a/docker-bake.hcl b/docker-bake.hcl
index a438982f..bc6ddeea 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -35,6 +35,14 @@ target "pg_duckdb" {
   target = "output"
 }
 
+target "pg_duckdb_15" {
+  inherits = ["pg_duckdb"]
+
+  args = {
+    POSTGRES_VERSION = 15
+  }
+}
+
 target "pg_duckdb_16" {
   inherits = ["pg_duckdb"]