diff --git a/.devcontainer/docker-compose.postgres.yml b/.devcontainer/docker-compose.postgres.yml
index 4ba0f1a4b..ed985a0d0 100644
--- a/.devcontainer/docker-compose.postgres.yml
+++ b/.devcontainer/docker-compose.postgres.yml
@@ -29,12 +29,12 @@ services:
       - hashtopolis_dev
   hashtopolis-db-dev:
     container_name: hashtopolis-db-dev
-    image: postgres:13
+    image: postgres:18
     restart: always
     ports:
       - "5432:5432"
     volumes:
-      - hashtopolis-db-dev:/var/lib/postgresql/data
+      - hashtopolis-db-dev:/var/lib/postgresql
     environment:
       POSTGRES_DB: hashtopolis
       POSTGRES_USER: hashtopolis
diff --git a/.github/docker-compose.postgres.yml b/.github/docker-compose.postgres.yml
index b4c53d290..d52312acf 100644
--- a/.github/docker-compose.postgres.yml
+++ b/.github/docker-compose.postgres.yml
@@ -25,12 +25,12 @@ services:
       - hashtopolis_dev
   hashtopolis-db-dev:
     container_name: hashtopolis-db-dev
-    image: postgres:13
+    image: postgres:18
     restart: always
     ports:
       - "5432:5432"
     volumes:
-      - hashtopolis-db-dev:/var/lib/postgresql/data
+      - hashtopolis-db-dev:/var/lib/postgresql
     environment:
       POSTGRES_DB: hashtopolis
       POSTGRES_USER: hashtopolis