diff --git a/Dockerfile b/Dockerfile
index d2ca65a..01a4b96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,10 +3,12 @@ LABEL maintainer="LanCache.Net Team <team@lancache.net>"
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG ARCH="amd64"
-ARG OVERLAY_VERSION="v2.2.0.3"
+ARG ARCH_ALT="x86_64"
+ARG OVERLAY_VERSION="3.2.0.0"
 
 ENV \
   S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
+  S6_VERBOSITY=1 \
   LC_ALL=en_GB.UTF-8 \
   LANG=en_GB.UTF-8 \
   LANGUAGE=en_GB.UTF-8 \
@@ -16,12 +18,14 @@ COPY overlay/ /
 
 RUN \
   apt-get -y update && apt-get -y upgrade && \
-  apt-get -y install curl wget bzip2 locales tzdata --no-install-recommends && \
+  apt-get -y install ca-certificates curl locales tzdata wget xz-utils --no-install-recommends && \
   locale-gen en_GB.utf8 && \
   update-locale LANG=en_GB.utf8 \
   cd /tmp && \
-  curl -sSfL -o s6-overlay.tar.gz "https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${ARCH}.tar.gz" && \
-  tar xfz s6-overlay.tar.gz -C / && \
+  curl -sSfL -o s6-overlay-noarch.tar.xz "https://github.com/just-containers/s6-overlay/releases/download/v${OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" && \
+  curl -sSfL -o s6-overlay.tar.xz "https://github.com/just-containers/s6-overlay/releases/download/v${OVERLAY_VERSION}/s6-overlay-${ARCH_ALT}.tar.xz" && \
+  tar -C / -Jpxf s6-overlay-noarch.tar.xz && \
+  tar -C / -Jpxf s6-overlay.tar.xz && \
   apt-get -y clean && \
   rm -rf /tmp/* /var/lib/apt/lists/*
 
diff --git a/goss.yaml b/goss.yaml
index d3269ae..de3fb7e 100644
--- a/goss.yaml
+++ b/goss.yaml
@@ -1,6 +1,4 @@
 package:
-  bzip2:
-    installed: true
   curl:
     installed: true
   wget:
diff --git a/overlay/etc/s6-overlay/s6-rc.d/asciilogo/dependencies.d/base b/overlay/etc/s6-overlay/s6-rc.d/asciilogo/dependencies.d/base
new file mode 100644
index 0000000..e69de29
diff --git a/overlay/etc/s6-overlay/s6-rc.d/asciilogo/type b/overlay/etc/s6-overlay/s6-rc.d/asciilogo/type
new file mode 100644
index 0000000..3d92b15
--- /dev/null
+++ b/overlay/etc/s6-overlay/s6-rc.d/asciilogo/type
@@ -0,0 +1 @@
+oneshot
\ No newline at end of file
diff --git a/overlay/etc/s6-overlay/s6-rc.d/asciilogo/up b/overlay/etc/s6-overlay/s6-rc.d/asciilogo/up
new file mode 100644
index 0000000..4789af4
--- /dev/null
+++ b/overlay/etc/s6-overlay/s6-rc.d/asciilogo/up
@@ -0,0 +1 @@
+/etc/s6-overlay/scripts/asciilogo
\ No newline at end of file
diff --git a/overlay/etc/s6-overlay/s6-rc.d/user/contents.d/asciilogo b/overlay/etc/s6-overlay/s6-rc.d/user/contents.d/asciilogo
new file mode 100644
index 0000000..e69de29
diff --git a/overlay/etc/cont-init.d/00-asciilogo b/overlay/etc/s6-overlay/scripts/asciilogo
old mode 100644
new mode 100755
similarity index 93%
rename from overlay/etc/cont-init.d/00-asciilogo
rename to overlay/etc/s6-overlay/scripts/asciilogo
index fb94a67..ddc81f0
--- a/overlay/etc/cont-init.d/00-asciilogo
+++ b/overlay/etc/s6-overlay/scripts/asciilogo
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 cat <<EOF
   _                  _____           _                       _