diff --git a/Dockerfile b/Dockerfile
index fe3ede3..7102aaf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ FROM --platform=${TARGETPLATFORM} alpine:${DOWNLOADER_ALPINE_VERSION} AS downloa
 ARG TARGETPLATFORM
 
 # S6 Overlay
-ARG S6_OVERLAY_VERSION="v2.2.0.3"
+ARG S6_OVERLAY_VERSION="3.0.0.0-1"
 ARG S6_OVERLAY_RELEASE="https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${TARGETPLATFORM}.tar.gz"
 
 RUN wget -O /tmp/s6overlay.tar.gz $(echo ${S6_OVERLAY_RELEASE} | sed 's/linux\///g' | sed 's/arm64/aarch64/g' | sed 's/arm\/v7/armhf/g') \
diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
index 08c5eb0..5b2dbd2 100644
--- a/build/docker-bake.hcl
+++ b/build/docker-bake.hcl
@@ -1,5 +1,5 @@
 group "default" {
-  targets = ["2.1.0.2", "2.2.0.0", "2.2.0.1", "2.2.0.2", "2.2.0.3"]
+  targets = ["2.1.0.2", "2.2.0.0", "2.2.0.1", "2.2.0.2", "2.2.0.3", "3.0.0.0"]
 }
 
 target "build-dockerfile" {
@@ -48,8 +48,16 @@ target "2.2.0.2" {
 
 target "2.2.0.3" {
   inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:2.2.0.3", "docker.io/nlss/s6-rootfs:2.2", "docker.io/nlss/s6-rootfs:latest"]
+  tags     = ["docker.io/nlss/s6-rootfs:2.2.0.3", "docker.io/nlss/s6-rootfs:2.2"]
   args = {
     S6_OVERLAY_VERSION = "v2.2.0.3"
   }
 }
+
+target "3.0.0.0" {
+  inherits = ["build-dockerfile", "build-platforms", "build-common"]
+  tags     = ["docker.io/nlss/s6-rootfs:3.0.0.0", "docker.io/nlss/s6-rootfs:3.0.0.0-1", "docker.io/nlss/s6-rootfs:3.0", "docker.io/nlss/s6-rootfs:latest"]
+  args = {
+    S6_OVERLAY_VERSION = "3.0.0.0-1"
+  }
+}
\ No newline at end of file