diff --git a/Dockerfile b/Dockerfile
index cef5a70..45d697c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 # set version label
 ARG BUILD_DATE
@@ -13,7 +13,6 @@ ENV HOME="/config"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-    curl \
     g++ \
     make \
     python3 && \
@@ -60,4 +59,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 5055
+
 VOLUME /config
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index dd49a9f..0fa9507 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -13,7 +13,6 @@ ENV HOME="/config"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-    curl \
     g++ \
     make \
     python3 && \
@@ -60,4 +59,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 5055
+
 VOLUME /config
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 7f1f853..3dc49fc 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -13,7 +13,6 @@ ENV HOME="/config"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-    curl \
     g++ \
     make \
     python3 && \
@@ -60,4 +59,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 5055
+
 VOLUME /config
diff --git a/README.md b/README.md
index 4542149..91c58b3 100644
--- a/README.md
+++ b/README.md
@@ -230,6 +230,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **27.10.22:** - Rebase main to 3.16, migrate to s6v3.
 * **20.08.22:** - Don't install cypress.
 * **01.04.22:** - Rebase main branch to Alpine 3.15.
 * **27.01.22:** - Rebase develop branch to Alpine 3.15.
diff --git a/readme-vars.yml b/readme-vars.yml
index e22cbf9..b15d0cb 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -47,6 +47,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "27.10.22:", desc: "Rebase main to 3.16, migrate to s6v3." }
   - { date: "20.08.22:", desc: "Don't install cypress." }
   - { date: "01.04.22:", desc: "Rebase main branch to Alpine 3.15." }
   - { date: "27.01.22:", desc: "Rebase develop branch to Alpine 3.15." }
diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-overseerr-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-overseerr-config
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-overseerr-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-overseerr-config/dependencies.d/init-config
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/cont-init.d/30-config b/root/etc/s6-overlay/s6-rc.d/init-overseerr-config/run
old mode 100644
new mode 100755
similarity index 80%
rename from root/etc/cont-init.d/30-config
rename to root/etc/s6-overlay/s6-rc.d/init-overseerr-config/run
index 05c4707..aa3208d
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/s6-overlay/s6-rc.d/init-overseerr-config/run
@@ -1,5 +1,5 @@
 #!/usr/bin/with-contenv bash
 
-# permissions
+# permissions
 chown -R abc:abc \
     /config
diff --git a/root/etc/s6-overlay/s6-rc.d/init-overseerr-config/type b/root/etc/s6-overlay/s6-rc.d/init-overseerr-config/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-overseerr-config/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-overseerr-config/up b/root/etc/s6-overlay/s6-rc.d/init-overseerr-config/up
new file mode 100644
index 0000000..2b1e798
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-overseerr-config/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-overseerr/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-overseerr/dependencies.d/init-services
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-overseerr/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-overseerr/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-overseerr/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-overseerr/run b/root/etc/s6-overlay/s6-rc.d/svc-overseerr/run
new file mode 100755
index 0000000..75f1583
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-overseerr/run
@@ -0,0 +1,7 @@
+#!/usr/bin/with-contenv bash
+
+export CONFIG_DIRECTORY="/config"
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 5055" \
+        cd /app/overseerr s6-setuidgid abc /usr/bin/yarn start
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-overseerr/type b/root/etc/s6-overlay/s6-rc.d/svc-overseerr/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-overseerr/type
@@ -0,0 +1 @@
+longrun
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-overseerr-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-overseerr-config
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-overseerr b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-overseerr
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/services.d/overseerr/run b/root/etc/services.d/overseerr/run
deleted file mode 100644
index eecf5d2..0000000
--- a/root/etc/services.d/overseerr/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-cd /app/overseerr || exit
-
-export CONFIG_DIRECTORY="/config"
-
-exec \
-    s6-setuidgid abc /usr/bin/yarn start