diff --git a/.circleci/config.yml b/.circleci/config.yml
index 50be92b61..23a8177b7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,7 +22,7 @@ executors:
   db:
     docker:
       - image: cimg/clojure:1.12-openjdk-21.0-browsers
-      - image: postgres:13
+      - image: postgres:18
         environment:
           POSTGRES_HOST_AUTH_METHOD: trust
           POSTGRES_USER: rems_test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58f49990c..039a13e51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ Changes since v2.39.1
 
 ### Additions
 
+- REMS now supports PostgreSQL version 18. (#3451)
 - Added the `:external-frontend-url` configuration option. When configured, applicant-facing links in outbound emails will use this URL instead of the default REMS frontend URL.
 - Added a custom action button for approved applications. The button is defined in extra translations. (#3413)
 - Upgraded several libraries (#3421)
diff --git a/dev_db.sh b/dev_db.sh
index b00adc8c0..311d6d27d 100755
--- a/dev_db.sh
+++ b/dev_db.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-docker run --rm --name rems_test -p 127.0.0.1:5432:5432 -d -e POSTGRES_HOST_AUTH_METHOD=trust postgres:13
-docker run --rm --link rems_test postgres:13 /bin/bash -c "while ! psql -h rems_test -U postgres -c 'select 1;' 2>/dev/null; do sleep 1; done"
-docker run -i --rm --link rems_test postgres:13 psql -h rems_test -U postgres < resources/sql/init.sql
+docker run --rm --name rems_test -p 127.0.0.1:5432:5432 -d -e POSTGRES_HOST_AUTH_METHOD=trust postgres:18
+docker run --rm --link rems_test postgres:18 /bin/bash -c "while ! psql -h rems_test -U postgres -c 'select 1;' 2>/dev/null; do sleep 1; done"
+docker run -i --rm --link rems_test postgres:18 psql -h rems_test -U postgres < resources/sql/init.sql
 
 ARGS="run dev-setup"
 
diff --git a/docker-compose-build.yml b/docker-compose-build.yml
index 3b8f467f6..5e200e031 100644
--- a/docker-compose-build.yml
+++ b/docker-compose-build.yml
@@ -20,7 +20,7 @@ services:
       - "127.0.0.1:3000:3000"
 
   db:
-    image: postgres:13
+    image: postgres:18
     environment:
       POSTGRES_USER: rems
       POSTGRES_PASSWORD: remspassword
diff --git a/docker-compose-config.yml b/docker-compose-config.yml
index e6d96d9d3..c46b23c6b 100644
--- a/docker-compose-config.yml
+++ b/docker-compose-config.yml
@@ -15,7 +15,7 @@ services:
       - ./example-theme/extra-styles.css:/rems/example-theme/extra-styles.css
 
   db:
-    image: postgres:13
+    image: postgres:18
     environment:
       POSTGRES_USER: rems
       POSTGRES_PASSWORD: remspassword
diff --git a/docker-compose.yml b/docker-compose.yml
index aac758b05..075bf79e6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - "127.0.0.1:3000:3000"
 
   db:
-    image: postgres:13
+    image: postgres:18
     environment:
       POSTGRES_USER: rems
       POSTGRES_PASSWORD: remspassword