diff --git a/build.gradle b/build.gradle
index af51e633..063235a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -228,7 +228,7 @@ project(':database-codegen') {
 
     ext {
         codegenDbImageRepo = 'napstr/poggres'
-        codegenDbImageTag = '15'
+        codegenDbImageTag = "$postgresVersion"
         codegenDbImageName = codegenDbImageRepo + ':' + codegenDbImageTag
         codegenDbContainerName = 'wolfia-codegen-postgres'
         codegenJdbcUrl = "jdbc:postgresql://127.0.0.1:5435/codegen?user=codegen"
diff --git a/docker/deploy/docker-compose.yml b/docker/deploy/docker-compose.yml
index 1086c4ce..1b54e6a5 100644
--- a/docker/deploy/docker-compose.yml
+++ b/docker/deploy/docker-compose.yml
@@ -63,7 +63,7 @@ services:
       - CF_API_KEY=${CF_KEY}
 
   db:
-    image: napstr/poggres:15
+    image: napstr/poggres:16
     restart: always
     ports:
       - 127.0.0.1:5432:5432
diff --git a/docker/dev/docker-compose.yaml b/docker/dev/docker-compose.yaml
index bbd9cbe4..01b97d1f 100644
--- a/docker/dev/docker-compose.yaml
+++ b/docker/dev/docker-compose.yaml
@@ -4,7 +4,7 @@ version: '3.7'
 
 services:
   dev-postgres:
-    image: napstr/poggres:15
+    image: napstr/poggres:16
     restart: always
     ports:
       - 127.0.0.1:5442:5432
diff --git a/gradle.properties b/gradle.properties
index 6488fc12..0b8ce22c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,6 +26,7 @@ org.gradle.warning.mode=all
 
 
 javaVersion=21
+postgresVersion=16
 kotlinVersion=[1.9.21, 2.0[
 springBootVersion=[3.2, 3.3[
 flywayVersion=[9.17.0, 10.0[
diff --git a/src/test/java/space/npstr/wolfia/PostgresAndRedisContainers.java b/src/test/java/space/npstr/wolfia/PostgresAndRedisContainers.java
index e224ad7d..22641eb7 100644
--- a/src/test/java/space/npstr/wolfia/PostgresAndRedisContainers.java
+++ b/src/test/java/space/npstr/wolfia/PostgresAndRedisContainers.java
@@ -31,7 +31,7 @@
  */
 public abstract class PostgresAndRedisContainers {
 
-    private static final GenericContainer<?> DB = new GenericContainer<>("napstr/poggres:15")
+    private static final GenericContainer<?> DB = new GenericContainer<>("napstr/poggres:16")
             .withLogConsumer(new Slf4jLogConsumer(containerLogger("Postgres")))
             .withEnv("POSTGRES_HOST_AUTH_METHOD", "trust")
             .withEnv("ROLE", "wolfia_test")