diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index 622b4aa..2190250 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -22,7 +22,8 @@ jobs:
           14,
           15,
           16,
-          17
+          17,
+          18
         ]
 
     steps:
diff --git a/Dockerfile b/Dockerfile
index 010b7ff..669a60b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG POSTGRES_VERSION=17
+ARG POSTGRES_VERSION=18
 
 FROM buildpack-deps:bookworm
 ARG POSTGRES_VERSION
diff --git a/README.md b/README.md
index 73d94f0..17f7694 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ start-ephemeral-postgres.sh
 ```
 
 **Options**
-- `POSTGRES_VERSION=17`
+- `POSTGRES_VERSION=18`
 - `POSTGRES_USER=postgres`
 - `POSTGRES_PASSWORD=postgres`
 - `POSTGRES_HOST_AUTH_METHOD=trust` - could be `scram-sha-256` / `md5` / etc
diff --git a/ephemeral-postgres-config.sh b/ephemeral-postgres-config.sh
index 944c2bc..33e50ff 100755
--- a/ephemeral-postgres-config.sh
+++ b/ephemeral-postgres-config.sh
@@ -2,7 +2,7 @@
 
 set -eo pipefail
 
-: "${POSTGRES_VERSION:=17}"
+: "${POSTGRES_VERSION:=18}"
 : "${POSTGRES_USER:=postgres}"
 : "${POSTGRES_PASSWORD:=postgres}"
 : "${POSTGRES_HOST_AUTH_METHOD:=trust}"
diff --git a/start-ephemeral-postgres.sh b/start-ephemeral-postgres.sh
index 8b0f65d..1484d33 100755
--- a/start-ephemeral-postgres.sh
+++ b/start-ephemeral-postgres.sh
@@ -82,7 +82,7 @@ if [ -n "$EPHEMERAL_POSTGRES_DATA_DIR" ]; then
     mkdir -p "$EPHEMERAL_POSTGRES_DATA_DIR"
   fi
 
-  EPHEMERAL_POSTGRES_DOCKER_RUN_ARGS+=" -v $EPHEMERAL_POSTGRES_DATA_DIR:/var/lib/postgresql/data"
+  EPHEMERAL_POSTGRES_DOCKER_RUN_ARGS+=" -v $EPHEMERAL_POSTGRES_DATA_DIR:/var/lib/postgresql"
   echo "Using data directory $EPHEMERAL_POSTGRES_DATA_DIR"
 
   # CoW (eg: with btrs) has a bad time with the frequent small writes from postgres
@@ -94,7 +94,7 @@ if [ -n "$EPHEMERAL_POSTGRES_DATA_DIR" ]; then
 else
   if [[ "$OSTYPE" =~ ^linux ]]; then
     echo "Using ram disk"
-    EPHEMERAL_POSTGRES_DOCKER_RUN_ARGS+='--mount type=tmpfs,destination=/var/lib/postgresql/data'
+    EPHEMERAL_POSTGRES_DOCKER_RUN_ARGS+='--mount type=tmpfs,destination=/var/lib/postgresql'
     # Postgres encounters permission issues when using the ram disk unless run as its default linux user
     EPHEMERAL_POSTGRES_LINUX_USER=''
   fi