diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index 088981e..431986f 100755
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
             && awk '/^P:'"qbittorrent-nox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
diff --git a/Dockerfile b/Dockerfile
index 99a778b..10bbe10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.16
+FROM ghcr.io/linuxserver/baseimage-alpine:edge
 
 # set version label
 ARG BUILD_DATE
@@ -42,7 +42,7 @@ RUN \
   make && \
   install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add -U --upgrade --no-cache \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 7a495d8..dabcd85 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
 
 # set version label
 ARG BUILD_DATE
@@ -42,7 +42,7 @@ RUN \
   make && \
   install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add -U --upgrade --no-cache \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 4bb705a..d548b4c 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-edge
 
 # set version label
 ARG BUILD_DATE
@@ -44,7 +44,7 @@ RUN \
   make && \
   install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add -U --upgrade --no-cache \
diff --git a/Jenkinsfile b/Jenkinsfile
index 4f14ea9..804c3b2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,8 +25,8 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
     PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.16'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/community/'
+    DIST_TAG = 'edge'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
     DIST_REPO_PACKAGES = 'qbittorrent-nox'
     MULTIARCH='true'
     CI='true'
diff --git a/README.md b/README.md
index 7c4f22c..1569ca7 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,6 @@ The webui is at `<your-ip>:8080` and the default username/password is `admin/adm
 
 Change username/password via the webui in the webui section of settings.  
 
-
 ### WEBUI_PORT variable
 
 Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.  
@@ -85,7 +84,7 @@ If you have no webui , check the file /config/qBittorrent/qBittorrent.conf
 
 edit or add the following lines  
 
-```
+```text
 WebUI\Address=*
 
 WebUI\ServerDomains=*
@@ -264,6 +263,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **28.08.22:** - Rebase to Alpine Edge again to follow latest releases.
 * **12.08.22:** - Bump unrar to 6.1.7.
 * **16.06.22:** - Rebase to Alpine 3.16 from edge.
 * **25.05.22:** - Fetch qbitorrent-cli from upstream repo.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 4619999..8f66a0e 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -15,8 +15,8 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.16'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/community/'
+  - DIST_TAG = 'edge'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
   - DIST_REPO_PACKAGES = 'qbittorrent-nox'
   - MULTIARCH='true'
   - CI='true'
diff --git a/readme-vars.yml b/readme-vars.yml
index 645341c..65437cc 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -46,7 +46,6 @@ app_setup_block: |
   
   Change username/password via the webui in the webui section of settings.  
 
-
   ### WEBUI_PORT variable
   
   Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.  
@@ -59,7 +58,7 @@ app_setup_block: |
   
   edit or add the following lines  
 
-  ```
+  ```text
   WebUI\Address=*
   
   WebUI\ServerDomains=*
@@ -69,6 +68,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases." }
   - { date: "12.08.22:", desc: "Bump unrar to 6.1.7." }
   - { date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge." }
   - { date: "25.05.22:", desc: "Fetch qbitorrent-cli from upstream repo." }
diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-qbittorrent b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-qbittorrent
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/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-qbittorrent/run
old mode 100644
new mode 100755
similarity index 53%
rename from root/etc/cont-init.d/30-config
rename to root/etc/s6-overlay/s6-rc.d/init-qbittorrent/run
index 3c9bc24..377bea6
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/run
@@ -3,17 +3,10 @@
 # make our folder
 mkdir -p /config/qBittorrent
 
-# copy config
+# copy default config
 [[ ! -e /config/qBittorrent/qBittorrent.conf ]] && \
     cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
 
-# v4.3.3 BT_backup migration
-[[ -d /config/data/qBittorrent/BT_backup/ ]] && \
-    mv /config/qBittorrent/BT_backup/ /config/qBittorrent/BT_backup.bak/ && \
-    mkdir /config/qBittorrent/BT_backup/ && \
-    cp -a /config/data/qBittorrent/BT_backup/.  /config/qBittorrent/BT_backup/ && \
-    mv /config/data/qBittorrent/BT_backup/ /config/data/qBittorrent/BT_backup.old/
-
 # chown download directory if currently not set to abc
 if [[ -d /downloads ]]; then
     if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
diff --git a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/type b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/up b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/up
new file mode 100644
index 0000000..5f761a2
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-qbittorrent/run
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/dependencies.d/init-qbittorrent b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/dependencies.d/init-qbittorrent
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/dependencies.d/init-services
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/root/etc/services.d/qbittorrent/run b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run
old mode 100644
new mode 100755
similarity index 68%
rename from root/etc/services.d/qbittorrent/run
rename to root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run
index 4d19e8f..ea32c00
--- a/root/etc/services.d/qbittorrent/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run
@@ -2,5 +2,5 @@
 
 WEBUI_PORT=${WEBUI_PORT:-8080}
 
-exec \
+s6-notifyoncheck -d -n 12 -c "nc -z 127.0.0.1 ${WEBUI_PORT}" \
     s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/type b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/type
@@ -0,0 +1 @@
+longrun
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-qbittorrent b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-qbittorrent
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-qbittorrent b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-qbittorrent
new file mode 100644
index 0000000..e69de29