diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 71f594b..6b00892 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        postgresql: [ "12", "13", "14", "15", "16", "17" ]
+        postgresql: [ "12", "13", "14", "15", "16", "17", "18" ]
     runs-on: ubuntu-latest
     steps:
       -
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6e4e303..e5e5138 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        postgresql: [ "12", "13", "14", "15", "16", "17" ]
+        postgresql: [ "12", "13", "14", "15", "16", "17", "18" ]
     runs-on: ubuntu-latest
     steps:
       -
diff --git a/18/Dockerfile b/18/Dockerfile
new file mode 100644
index 0000000..2c4dc64
--- /dev/null
+++ b/18/Dockerfile
@@ -0,0 +1,22 @@
+FROM quay.io/bfren/alpine-s6:alpine3.23-6.1.0
+
+LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
+
+ARG BF_IMAGE
+ARG BF_PUBLISHING
+ARG BF_VERSION
+
+EXPOSE 5432
+
+COPY ./overlay /
+COPY ./17/overlay /
+
+ENV \
+    # set to "1" to compress backup sql files
+    BF_PG_BACKUP_COMPRESS_FILES="0" \
+    # the duration for which backups will be kept
+    BF_PG_BACKUP_KEEP_FOR="28day"
+
+RUN bf-install
+
+VOLUME [ "/backup", "/data" ]
diff --git a/18/overlay/tmp/POSTGRESQL_BUILD b/18/overlay/tmp/POSTGRESQL_BUILD
new file mode 100644
index 0000000..9855a0a
--- /dev/null
+++ b/18/overlay/tmp/POSTGRESQL_BUILD
@@ -0,0 +1 @@
+18.1-r0
\ No newline at end of file
diff --git a/18/overlay/tmp/POSTGRESQL_MINOR b/18/overlay/tmp/POSTGRESQL_MINOR
new file mode 100644
index 0000000..9dc4015
--- /dev/null
+++ b/18/overlay/tmp/POSTGRESQL_MINOR
@@ -0,0 +1 @@
+18.1
\ No newline at end of file
diff --git a/README.md b/README.md
index 150a2ff..d22a021 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 [Docker Repository](https://hub.docker.com/r/bfren/postgresql) - [bfren ecosystem](https://github.com/bfren/docker)
 
-[PostgreSQL](https://www.postgresql.org/) comes pre-installed (12, 13, 14, 15 or 16) with automatic backups built-in.
+[PostgreSQL](https://www.postgresql.org/) comes pre-installed (12, 13, 14, 15, 16, 17 and 18) with automatic backups built-in.
 
 ## Contents
 
diff --git a/VERSION b/VERSION
index 99eba4d..ef8d756 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.0
\ No newline at end of file
+4.2.0
\ No newline at end of file
diff --git a/VERSION_MINOR b/VERSION_MINOR
index 8a36cd1..8012ebb 100644
--- a/VERSION_MINOR
+++ b/VERSION_MINOR
@@ -1 +1 @@
-4.1
\ No newline at end of file
+4.2
\ No newline at end of file
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
index db70f61..a338330 100755
--- a/generate-dockerfiles.sh
+++ b/generate-dockerfiles.sh
@@ -7,7 +7,7 @@ docker pull bfren/alpine
 BASE_VERSION="6.1.0"
 echo "Base: ${BASE_VERSION}"
 
-POSTGRESQL_VERSIONS="12 13 14 15 16 17"
+POSTGRESQL_VERSIONS="12 13 14 15 16 17 18"
 for V in ${POSTGRESQL_VERSIONS} ; do
 
     echo "PostgreSQL ${V}"
diff --git a/run.sh b/run.sh
index 357ec4b..366ae1e 100755
--- a/run.sh
+++ b/run.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 IMAGE=`cat VERSION`
-POSTGRESQL=${1:-17}
+POSTGRESQL=${1:-18}
 
 docker buildx build \
     --load \
diff --git a/test.sh b/test.sh
index b8523b4..7ad3b61 100644
--- a/test.sh
+++ b/test.sh
@@ -2,7 +2,7 @@
 
 IMAGE=postgresql
 VERSION=`cat VERSION`
-POSTGRESQL=${1:-17}
+POSTGRESQL=${1:-18}
 TAG=${IMAGE}-test
 
 docker buildx build \