diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 9f66bf0..92d30fb 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" ]
+        postgresql: [ "12", "13", "14", "15", "16", "17" ]
     runs-on: ubuntu-latest
     steps:
       -
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 929aacf..acdd3a6 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" ]
+        postgresql: [ "12", "13", "14", "15", "16", "17" ]
     runs-on: ubuntu-latest
     steps:
       -
diff --git a/12/Dockerfile b/12/Dockerfile
index caceac8..4482d79 100644
--- a/12/Dockerfile
+++ b/12/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.4.15
+FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/13/Dockerfile b/13/Dockerfile
index 13504d7..2b902ef 100644
--- a/13/Dockerfile
+++ b/13/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.4.15
+FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/14/ALPINE_EDITION b/14/ALPINE_EDITION
new file mode 100644
index 0000000..8b6d177
--- /dev/null
+++ b/14/ALPINE_EDITION
@@ -0,0 +1 @@
+3.20
\ No newline at end of file
diff --git a/14/Dockerfile b/14/Dockerfile
index 5384898..7d35813 100644
--- a/14/Dockerfile
+++ b/14/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.15
+FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/14/overlay/tmp/POSTGRESQL_BUILD b/14/overlay/tmp/POSTGRESQL_BUILD
index ab04499..ebb26ab 100644
--- a/14/overlay/tmp/POSTGRESQL_BUILD
+++ b/14/overlay/tmp/POSTGRESQL_BUILD
@@ -1 +1 @@
-14.14-r0
\ No newline at end of file
+14.15-r0
\ No newline at end of file
diff --git a/14/overlay/tmp/POSTGRESQL_MINOR b/14/overlay/tmp/POSTGRESQL_MINOR
index 7050c59..bc467a1 100644
--- a/14/overlay/tmp/POSTGRESQL_MINOR
+++ b/14/overlay/tmp/POSTGRESQL_MINOR
@@ -1 +1 @@
-14.14
\ No newline at end of file
+14.15
\ No newline at end of file
diff --git a/15/Dockerfile b/15/Dockerfile
index e29562a..327695b 100644
--- a/15/Dockerfile
+++ b/15/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.15
+FROM ghcr.io/bfren/alpine-s6:alpine3.21-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/15/overlay/tmp/POSTGRESQL_BUILD b/15/overlay/tmp/POSTGRESQL_BUILD
index 5a82266..5924ad1 100644
--- a/15/overlay/tmp/POSTGRESQL_BUILD
+++ b/15/overlay/tmp/POSTGRESQL_BUILD
@@ -1 +1 @@
-15.9-r0
\ No newline at end of file
+15.10-r0
\ No newline at end of file
diff --git a/15/overlay/tmp/POSTGRESQL_MINOR b/15/overlay/tmp/POSTGRESQL_MINOR
index fa09730..f27e0b0 100644
--- a/15/overlay/tmp/POSTGRESQL_MINOR
+++ b/15/overlay/tmp/POSTGRESQL_MINOR
@@ -1 +1 @@
-15.9
\ No newline at end of file
+15.10
\ No newline at end of file
diff --git a/16/Dockerfile b/16/Dockerfile
index d76c2bc..75e937b 100644
--- a/16/Dockerfile
+++ b/16/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.15
+FROM ghcr.io/bfren/alpine-s6:alpine3.21-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/16/overlay/tmp/POSTGRESQL_BUILD b/16/overlay/tmp/POSTGRESQL_BUILD
index bd967b6..e14ca71 100644
--- a/16/overlay/tmp/POSTGRESQL_BUILD
+++ b/16/overlay/tmp/POSTGRESQL_BUILD
@@ -1 +1 @@
-16.5-r0
\ No newline at end of file
+16.6-r0
\ No newline at end of file
diff --git a/16/overlay/tmp/POSTGRESQL_MINOR b/16/overlay/tmp/POSTGRESQL_MINOR
index 231420a..b70a6bf 100644
--- a/16/overlay/tmp/POSTGRESQL_MINOR
+++ b/16/overlay/tmp/POSTGRESQL_MINOR
@@ -1 +1 @@
-16.5
\ No newline at end of file
+16.6
\ No newline at end of file
diff --git a/17/Dockerfile b/17/Dockerfile
new file mode 100644
index 0000000..1523d33
--- /dev/null
+++ b/17/Dockerfile
@@ -0,0 +1,22 @@
+FROM ghcr.io/bfren/alpine-s6:alpine3.21-5.5.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/17/overlay/tmp/POSTGRESQL_BUILD b/17/overlay/tmp/POSTGRESQL_BUILD
new file mode 100644
index 0000000..80aae1f
--- /dev/null
+++ b/17/overlay/tmp/POSTGRESQL_BUILD
@@ -0,0 +1 @@
+17.2-r0
\ No newline at end of file
diff --git a/17/overlay/tmp/POSTGRESQL_MINOR b/17/overlay/tmp/POSTGRESQL_MINOR
new file mode 100644
index 0000000..84cc55d
--- /dev/null
+++ b/17/overlay/tmp/POSTGRESQL_MINOR
@@ -0,0 +1 @@
+17.2
\ No newline at end of file
diff --git a/VERSION b/VERSION
index 9e08064..0fa4ae4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.18
\ No newline at end of file
+3.3.0
\ No newline at end of file
diff --git a/VERSION_MINOR b/VERSION_MINOR
index 4fe5631..f30101c 100644
--- a/VERSION_MINOR
+++ b/VERSION_MINOR
@@ -1 +1 @@
-3.2
\ No newline at end of file
+3.3
\ No newline at end of file
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
index 5fe8eac..fc16a01 100755
--- a/generate-dockerfiles.sh
+++ b/generate-dockerfiles.sh
@@ -4,10 +4,10 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_VERSION="5.4.15"
+BASE_VERSION="5.5.0"
 echo "Base: ${BASE_VERSION}"
 
-POSTGRESQL_VERSIONS="12 13 14 15 16"
+POSTGRESQL_VERSIONS="12 13 14 15 16 17"
 for V in ${POSTGRESQL_VERSIONS} ; do
 
     echo "PostgreSQL ${V}"
@@ -15,7 +15,7 @@ for V in ${POSTGRESQL_VERSIONS} ; do
     if [ -f "${ALPINE_EDITION_FILE}" ] ; then
         ALPINE_EDITION=`cat ${ALPINE_EDITION_FILE}`
     else
-        ALPINE_EDITION="3.20"
+        ALPINE_EDITION="3.21"
     fi
 
     DOCKERFILE=$(docker run \
diff --git a/run.sh b/run.sh
index 92dfea3..357ec4b 100755
--- a/run.sh
+++ b/run.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 IMAGE=`cat VERSION`
-POSTGRESQL=${1:-16}
+POSTGRESQL=${1:-17}
 
 docker buildx build \
     --load \
diff --git a/test.sh b/test.sh
index 6fc1e8e..b8523b4 100644
--- a/test.sh
+++ b/test.sh
@@ -2,7 +2,7 @@
 
 IMAGE=postgresql
 VERSION=`cat VERSION`
-POSTGRESQL=${1:-16}
+POSTGRESQL=${1:-17}
 TAG=${IMAGE}-test
 
 docker buildx build \