diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index e0cb768..9f66bf0 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -64,7 +64,7 @@ jobs:
         name: Run tests
         id: docker_test
         run: |
-          docker run --entrypoint "/usr/bin/env" ${{ env.TEST_TAG }} -i nu -c "use bf test ; test"
+          docker run --entrypoint /test ${{ env.TEST_TAG }}
       -
         name: Build and push
         id: docker_build
diff --git a/12/Dockerfile b/12/Dockerfile
index e90c7a3..caceac8 100644
--- a/12/Dockerfile
+++ b/12/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.4.13
+FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.4.15
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/13/Dockerfile b/13/Dockerfile
index 585ae92..13504d7 100644
--- a/13/Dockerfile
+++ b/13/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.4.13
+FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.4.15
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/13/overlay/tmp/POSTGRESQL_BUILD b/13/overlay/tmp/POSTGRESQL_BUILD
index 668cab3..d005e1c 100644
--- a/13/overlay/tmp/POSTGRESQL_BUILD
+++ b/13/overlay/tmp/POSTGRESQL_BUILD
@@ -1 +1 @@
-13.16-r0
\ No newline at end of file
+13.17-r0
\ No newline at end of file
diff --git a/13/overlay/tmp/POSTGRESQL_MINOR b/13/overlay/tmp/POSTGRESQL_MINOR
index 8f728fc..f84ff04 100644
--- a/13/overlay/tmp/POSTGRESQL_MINOR
+++ b/13/overlay/tmp/POSTGRESQL_MINOR
@@ -1 +1 @@
-13.16
\ No newline at end of file
+13.17
\ No newline at end of file
diff --git a/14/Dockerfile b/14/Dockerfile
index 3a42e10..5384898 100644
--- a/14/Dockerfile
+++ b/14/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.13
+FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.15
 
 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 58ef000..ab04499 100644
--- a/14/overlay/tmp/POSTGRESQL_BUILD
+++ b/14/overlay/tmp/POSTGRESQL_BUILD
@@ -1 +1 @@
-14.13-r0
\ No newline at end of file
+14.14-r0
\ No newline at end of file
diff --git a/14/overlay/tmp/POSTGRESQL_MINOR b/14/overlay/tmp/POSTGRESQL_MINOR
index aefcd64..7050c59 100644
--- a/14/overlay/tmp/POSTGRESQL_MINOR
+++ b/14/overlay/tmp/POSTGRESQL_MINOR
@@ -1 +1 @@
-14.13
\ No newline at end of file
+14.14
\ No newline at end of file
diff --git a/15/Dockerfile b/15/Dockerfile
index 2433d0f..e29562a 100644
--- a/15/Dockerfile
+++ b/15/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.13
+FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.15
 
 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 e65cbaf..5a82266 100644
--- a/15/overlay/tmp/POSTGRESQL_BUILD
+++ b/15/overlay/tmp/POSTGRESQL_BUILD
@@ -1 +1 @@
-15.8-r0
\ No newline at end of file
+15.9-r0
\ No newline at end of file
diff --git a/15/overlay/tmp/POSTGRESQL_MINOR b/15/overlay/tmp/POSTGRESQL_MINOR
index e754ab7..fa09730 100644
--- a/15/overlay/tmp/POSTGRESQL_MINOR
+++ b/15/overlay/tmp/POSTGRESQL_MINOR
@@ -1 +1 @@
-15.8
\ No newline at end of file
+15.9
\ No newline at end of file
diff --git a/16/Dockerfile b/16/Dockerfile
index d733c91..d76c2bc 100644
--- a/16/Dockerfile
+++ b/16/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.13
+FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.15
 
 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 1b0e7d4..bd967b6 100644
--- a/16/overlay/tmp/POSTGRESQL_BUILD
+++ b/16/overlay/tmp/POSTGRESQL_BUILD
@@ -1 +1 @@
-16.4-r0
\ No newline at end of file
+16.5-r0
\ No newline at end of file
diff --git a/16/overlay/tmp/POSTGRESQL_MINOR b/16/overlay/tmp/POSTGRESQL_MINOR
index 00a5207..231420a 100644
--- a/16/overlay/tmp/POSTGRESQL_MINOR
+++ b/16/overlay/tmp/POSTGRESQL_MINOR
@@ -1 +1 @@
-16.4
\ No newline at end of file
+16.5
\ No newline at end of file
diff --git a/VERSION b/VERSION
index 8649cd4..9e08064 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.17
\ No newline at end of file
+3.2.18
\ No newline at end of file
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
index a886483..5fe8eac 100755
--- a/generate-dockerfiles.sh
+++ b/generate-dockerfiles.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_VERSION="5.4.13"
+BASE_VERSION="5.4.15"
 echo "Base: ${BASE_VERSION}"
 
 POSTGRESQL_VERSIONS="12 13 14 15 16"
diff --git a/test.sh b/test.sh
index c736b3b..6fc1e8e 100644
--- a/test.sh
+++ b/test.sh
@@ -13,4 +13,4 @@ docker buildx build \
     -t ${TAG} \
     . \
     && \
-    docker run --entrypoint "/usr/bin/env" ${TAG} -i nu -c "use bf test ; test"
+    docker run --entrypoint /test ${TAG}