diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index eefbea5..7ec2dd0 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -30,6 +30,24 @@ jobs:
         with:
           file: ./VERSION
         id: version
+      -
+        name: Read PostgreSQL version - minor
+        uses: bfren/read-file@v2
+        with:
+          file: ./${{ matrix.postgresql }}/overlay/tmp/POSTGRESQL_MINOR
+        id: postgresql_minor
+      -
+        name: Read image version
+        uses: bfren/read-file@v2
+        with:
+          file: ./VERSION_MAJOR
+        id: version_major
+      -
+        name: Read image version
+        uses: bfren/read-file@v2
+        with:
+          file: ./VERSION_MINOR
+        id: version_minor
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v4
@@ -79,9 +97,17 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
             bfren/postgresql:postgresql${{ matrix.postgresql }}-dev
+            bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_major.outputs.contents }}-dev
+            bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_minor.outputs.contents }}-dev
             bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}-dev
+            bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-dev
+            bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }}-dev
             quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-dev
+            quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_major.outputs.contents }}-dev
+            quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_minor.outputs.contents }}-dev
             quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}-dev
+            quay.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-dev
+            quay.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }}-dev
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/12/Dockerfile b/12/Dockerfile
index 5f452aa..cecb953 100644
--- a/12/Dockerfile
+++ b/12/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.18-6.5.0
+FROM quay.io/bfren/alpine-s6:alpine3.18-6.6.0-dev
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/13/Dockerfile b/13/Dockerfile
index 98e82d8..c2ed223 100644
--- a/13/Dockerfile
+++ b/13/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.19-6.5.0
+FROM quay.io/bfren/alpine-s6:alpine3.19-6.6.0-dev
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/14/Dockerfile b/14/Dockerfile
index 90e03e3..3183a13 100644
--- a/14/Dockerfile
+++ b/14/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.20-6.5.0
+FROM quay.io/bfren/alpine-s6:alpine3.20-6.6.0-dev
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/15/Dockerfile b/15/Dockerfile
index 76e222a..a6ae4ba 100644
--- a/15/Dockerfile
+++ b/15/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.22-6.5.0
+FROM quay.io/bfren/alpine-s6:alpine3.22-6.6.0-dev
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/16/Dockerfile b/16/Dockerfile
index 34153a0..e2e6c0e 100644
--- a/16/Dockerfile
+++ b/16/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.24-6.5.0
+FROM quay.io/bfren/alpine-s6:alpine3.24-6.6.0-dev
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/17/Dockerfile b/17/Dockerfile
index 7e52512..3e12f24 100644
--- a/17/Dockerfile
+++ b/17/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.24-6.5.0
+FROM quay.io/bfren/alpine-s6:alpine3.24-6.6.0-dev
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/18/Dockerfile b/18/Dockerfile
index df4c8f6..541ef16 100644
--- a/18/Dockerfile
+++ b/18/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.24-6.5.0
+FROM quay.io/bfren/alpine-s6:alpine3.24-6.6.0-dev
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..a13010f
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1 @@
+@../index/CLAUDE.md
diff --git a/VERSION b/VERSION
index 9dd64db..6e8ad1f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.2.15
\ No newline at end of file
+4.2.16
\ No newline at end of file
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
index 04e834a..f00106c 100755
--- a/generate-dockerfiles.sh
+++ b/generate-dockerfiles.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_VERSION="6.5.0"
+BASE_VERSION="6.6.0-dev"
 echo "Base: ${BASE_VERSION}"
 
 POSTGRESQL_VERSIONS="12 13 14 15 16 17 18"
diff --git a/overlay/etc/nu/scripts/bf-postgresql/conf.nu b/overlay/etc/nu/scripts/bf-postgresql/conf.nu
index 945b64a..ee55289 100644
--- a/overlay/etc/nu/scripts/bf-postgresql/conf.nu
+++ b/overlay/etc/nu/scripts/bf-postgresql/conf.nu
@@ -1,7 +1,8 @@
 use bf
+use bf-s6
 
 # Generate data configuration files
 export def generate [] {
-    bf esh template (bf env PG_DATA_CONF)
-    bf esh template (bf env PG_DATA_HBA_CONF)
+    bf-s6 esh template (bf env PG_DATA_CONF)
+    bf-s6 esh template (bf env PG_DATA_HBA_CONF)
 }
diff --git a/overlay/usr/bin/bf/healthcheck b/overlay/usr/bin/bf/bf-healthcheck
similarity index 100%
rename from overlay/usr/bin/bf/healthcheck
rename to overlay/usr/bin/bf/bf-healthcheck