diff --git a/.env b/.env
new file mode 100644
index 0000000000..d9076f57b9
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+POSTGRES_VERSION=18
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 4b8c8ca56e..1adab8d8fa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@
 
 services:
   postgres:
-    image: postgres:18
+    image: postgres:${POSTGRES_VERSION}
     restart: unless-stopped
     healthcheck:
       test: ['CMD-SHELL', 'pg_isready -U postgres']
@@ -32,7 +32,7 @@ services:
     # Use port 5433 on the host to avoid a conflict with a running postgres instance on the host.
     - "5433:5432"
     volumes:
-    - db:/var/lib/postgresql
+    - db:/var/lib/postgresql/${POSTGRES_VERSION}/docker
     logging:
       driver: ${LOG_DRIVER:-gelf}
       options: