diff --git a/12/Dockerfile b/12/Dockerfile
index d6f0307..7fbfd56 100644
--- a/12/Dockerfile
+++ b/12/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.18-6.3.2
+FROM quay.io/bfren/alpine-s6:alpine3.18-6.3.3
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/13/Dockerfile b/13/Dockerfile
index ce16bd4..e0fa0d4 100644
--- a/13/Dockerfile
+++ b/13/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.19-6.3.2
+FROM quay.io/bfren/alpine-s6:alpine3.19-6.3.3
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/14/Dockerfile b/14/Dockerfile
index c07ab81..a78cb02 100644
--- a/14/Dockerfile
+++ b/14/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.20-6.3.2
+FROM quay.io/bfren/alpine-s6:alpine3.20-6.3.3
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/15/Dockerfile b/15/Dockerfile
index 62683dc..18b051d 100644
--- a/15/Dockerfile
+++ b/15/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.22-6.3.2
+FROM quay.io/bfren/alpine-s6:alpine3.22-6.3.3
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/16/Dockerfile b/16/Dockerfile
index 1dec642..c31b918 100644
--- a/16/Dockerfile
+++ b/16/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.2
+FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.3
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/17/Dockerfile b/17/Dockerfile
index 0c9c1a6..875ca33 100644
--- a/17/Dockerfile
+++ b/17/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.2
+FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.3
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/18/Dockerfile b/18/Dockerfile
index f50d1de..c9c3410 100644
--- a/18/Dockerfile
+++ b/18/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.2
+FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.3
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql"
 
diff --git a/VERSION b/VERSION
index 3fca978..a85ba9b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.2.12
\ No newline at end of file
+4.2.13
\ No newline at end of file
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
index 765cdc0..e79423f 100755
--- a/generate-dockerfiles.sh
+++ b/generate-dockerfiles.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_VERSION="6.3.2"
+BASE_VERSION="6.3.3"
 echo "Base: ${BASE_VERSION}"
 
 POSTGRESQL_VERSIONS="12 13 14 15 16 17 18"
diff --git a/overlay/etc/s6-overlay/s6-rc.d/postgresql/down-signal b/overlay/etc/s6-overlay/s6-rc.d/postgresql/down-signal
new file mode 100644
index 0000000..2310461
--- /dev/null
+++ b/overlay/etc/s6-overlay/s6-rc.d/postgresql/down-signal
@@ -0,0 +1 @@
+SIGINT
\ No newline at end of file
diff --git a/overlay/etc/s6-overlay/s6-rc.d/postgresql/run b/overlay/etc/s6-overlay/s6-rc.d/postgresql/run
index 858026e..78444e6 100644
--- a/overlay/etc/s6-overlay/s6-rc.d/postgresql/run
+++ b/overlay/etc/s6-overlay/s6-rc.d/postgresql/run
@@ -15,4 +15,4 @@ nu -c "use bf-postgresql run ; run preflight"
 #   -D  path to the data directory
 #======================================================================================================================
 
-pg postgres -D "${BF_PG_DATA}"
+exec pg postgres -D "${BF_PG_DATA}"
diff --git a/overlay/etc/s6-overlay/s6-rc.d/user/contents.d/postgresql b/overlay/etc/s6-overlay/user-bundles.d/user/contents.d/postgresql
similarity index 100%
rename from overlay/etc/s6-overlay/s6-rc.d/user/contents.d/postgresql
rename to overlay/etc/s6-overlay/user-bundles.d/user/contents.d/postgresql
diff --git a/overlay/usr/bin/bf/pg b/overlay/usr/bin/bf/pg
index cf66a21..00fcbbe 100644
--- a/overlay/usr/bin/bf/pg
+++ b/overlay/usr/bin/bf/pg
@@ -7,4 +7,4 @@ set -euo pipefail
 # Run a command as postgres user
 #======================================================================================================================
 
-s6-setuidgid postgres "$@"
+exec s6-setuidgid postgres "$@"