diff --git a/.circleci/config.yml b/.circleci/config.yml
index 820e907..0bd779d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,7 +16,7 @@ executors:
           PGHOST: 127.0.0.1
           PGUSER: postgres
           RAILS_ENV: test
-      - image: cimg/postgres:17.9
+      - image: cimg/postgres:18.6
         environment:
           POSTGRES_USER: postgres
           POSTGRES_DB: app_test
diff --git a/.tool-versions b/.tool-versions
index b621777..1f06097 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,4 +1,4 @@
 ruby 4.0.7
 nodejs 25.8.1
-postgres 16.8
+postgres 18.6
 pnpm 12.5.1