diff --git a/VERSION.json b/VERSION.json
index fc968a00a..d73d4cdbf 100644
--- a/VERSION.json
+++ b/VERSION.json
@@ -5,8 +5,8 @@
   "git_branch": "master",
   "changelog": "https://github.com/tautulli/tautulli/compare/v2.13.3...v2.13.4",
   "upstream_image": "ghcr.io/hotio/base",
-  "upstream_tag": "alpine",
-  "upstream_digest_amd64": "sha256:aba1ad70d73a01a04940ceefcc0506c8867aa99be1e1598f7f57d79dc462ba1d",
-  "upstream_digest_arm64": "sha256:5f44dcee2c34486af761dca45b1a7b57ef953ee485050544c2255c6f21ed0278",
+  "upstream_tag": "alpinevpn",
+  "upstream_digest_amd64": "sha256:e8c549548c101b12abc2fc9399c6c6dc33e5d56603e01f6e3e23fed42d08d54a",
+  "upstream_digest_arm64": "sha256:b4fca2fdedc503aaa5f73aa1483c442d0ba03113bd359a0ab47ed75a33e5bd9b",
   "test_url": "http://localhost:8181"
 }
diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile
index 01c9d6ddf..818a1519d 100644
--- a/linux-amd64.Dockerfile
+++ b/linux-amd64.Dockerfile
@@ -5,8 +5,6 @@ FROM ${UPSTREAM_IMAGE}@${UPSTREAM_DIGEST_AMD64}
 EXPOSE 8181
 ENV TAUTULLI_DOCKER="True"
 
-VOLUME ["${CONFIG_DIR}"]
-
 RUN apk add --no-cache python3 py3-lxml py3-openssl py3-setuptools && \
     apk add --no-cache --virtual=build-dependencies py3-pip make gcc g++ python3-dev && \
     pip3 install --no-cache-dir --upgrade plexapi pycryptodomex && \
diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile
index a4019b08f..00cf634bb 100644
--- a/linux-arm64.Dockerfile
+++ b/linux-arm64.Dockerfile
@@ -5,8 +5,6 @@ FROM ${UPSTREAM_IMAGE}@${UPSTREAM_DIGEST_ARM64}
 EXPOSE 8181
 ENV TAUTULLI_DOCKER="True"
 
-VOLUME ["${CONFIG_DIR}"]
-
 RUN apk add --no-cache python3 py3-lxml py3-openssl py3-setuptools && \
     apk add --no-cache --virtual=build-dependencies py3-pip make gcc g++ python3-dev && \
     pip3 install --no-cache-dir --upgrade plexapi pycryptodomex && \
diff --git a/root/etc/s6-overlay/s6-rc.d/init-perms/up b/root/etc/s6-overlay/s6-rc.d/init-perms/up
deleted file mode 100644
index 405161e9b..000000000
--- a/root/etc/s6-overlay/s6-rc.d/init-perms/up
+++ /dev/null
@@ -1 +0,0 @@
-find /etc/s6-overlay/s6-rc.d -name "run*" -execdir chmod +x {} +
diff --git a/root/etc/s6-overlay/s6-rc.d/init-secrets/run b/root/etc/s6-overlay/s6-rc.d/init-secrets/run
deleted file mode 100644
index e410d3390..000000000
--- a/root/etc/s6-overlay/s6-rc.d/init-secrets/run
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/command/with-contenv bash
-# shellcheck shell=bash
-
-find /var/run/s6/container_environment/ -type f -name 'FILE__*' -print0 | while IFS= read -r -d '' FILENAME; do
-    NEW_VAR=${FILENAME//FILE__/}
-    SECRET_FILE=$(cat "${FILENAME}")
-    if [[ ! -f ${SECRET_FILE} ]]; then
-        echo "[${NEW_VAR##*/}] The file \"${SECRET_FILE}\" wasn't found!"
-        exit 1
-    fi
-    SECRET=$(cat "${SECRET_FILE}")
-    if [[ -n ${SECRET} ]]; then
-        echo -n "${SECRET}" > "${NEW_VAR}"
-        echo "[${NEW_VAR##*/}] Set with secret from \"${SECRET_FILE}\"."
-    else
-        echo "[${NEW_VAR##*/}] No secret found in \"${SECRET_FILE}\"!"
-        exit 1
-    fi
-done
diff --git a/root/etc/s6-overlay/s6-rc.d/init-secrets/type b/root/etc/s6-overlay/s6-rc.d/init-secrets/type
deleted file mode 100644
index bdd22a185..000000000
--- a/root/etc/s6-overlay/s6-rc.d/init-secrets/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-secrets/up b/root/etc/s6-overlay/s6-rc.d/init-secrets/up
deleted file mode 100644
index 3f032394d..000000000
--- a/root/etc/s6-overlay/s6-rc.d/init-secrets/up
+++ /dev/null
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-secrets/run
diff --git a/root/etc/s6-overlay/s6-rc.d/service-tautulli/dependencies.d/init-setup b/root/etc/s6-overlay/s6-rc.d/init-setup-app/dependencies.d/init-setup
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/service-tautulli/dependencies.d/init-setup
rename to root/etc/s6-overlay/s6-rc.d/init-setup-app/dependencies.d/init-setup
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup-app/run b/root/etc/s6-overlay/s6-rc.d/init-setup-app/run
new file mode 100644
index 000000000..646fbe8c8
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-setup-app/run
@@ -0,0 +1,12 @@
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+umask "${UMASK}"
+
+echo "
+----------------------------------------------------------------------
+ENVIRONMENT APP
+----------------------------------------------------------------------
+
+----------------------------------------------------------------------
+"
diff --git a/root/etc/s6-overlay/s6-rc.d/init-perms/type b/root/etc/s6-overlay/s6-rc.d/init-setup-app/type
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/init-perms/type
rename to root/etc/s6-overlay/s6-rc.d/init-setup-app/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup-app/up b/root/etc/s6-overlay/s6-rc.d/init-setup-app/up
new file mode 100644
index 000000000..2338a3f94
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-setup-app/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-setup-app/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/dependencies.d/init-secrets b/root/etc/s6-overlay/s6-rc.d/init-setup/dependencies.d/init-secrets
deleted file mode 100644
index e69de29bb..000000000
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/run b/root/etc/s6-overlay/s6-rc.d/init-setup/run
deleted file mode 100644
index b7c64d086..000000000
--- a/root/etc/s6-overlay/s6-rc.d/init-setup/run
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/command/with-contenv bash
-# shellcheck shell=bash
-
-umask "${UMASK}"
-
-echo "
-----------------------------------------------------------------------
-ENVIRONMENT
-----------------------------------------------------------------------
-PUID=${PUID}
-PGID=${PGID}
-UMASK=${UMASK}
-TZ=${TZ}
-----------------------------------------------------------------------
-"
-
-if [[ ! "${PUID}" -eq 0 ]] && [[ ! "${PGID}" -eq 0 ]]; then
-    echo "Executing usermod..."
-    mkdir "/tmp/temphome"
-    usermod -d "/tmp/temphome" hotio
-    usermod -o -u "${PUID}" hotio
-    usermod -d "${CONFIG_DIR}" hotio
-    rm -rf "/tmp/temphome"
-    groupmod -o -g "${PGID}" hotio
-else
-    echo "Running as root is not supported, please fix your PUID and PGID!"
-    exit 1
-fi
-
-echo "Applying permissions to ${CONFIG_DIR}"
-chmod "=rwx" "${CONFIG_DIR}"
-chown hotio:hotio "${CONFIG_DIR}"
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/type b/root/etc/s6-overlay/s6-rc.d/init-setup/type
deleted file mode 100644
index bdd22a185..000000000
--- a/root/etc/s6-overlay/s6-rc.d/init-setup/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/up b/root/etc/s6-overlay/s6-rc.d/init-setup/up
deleted file mode 100644
index 33f033230..000000000
--- a/root/etc/s6-overlay/s6-rc.d/init-setup/up
+++ /dev/null
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-setup/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-perms/dependencies.d/base b/root/etc/s6-overlay/s6-rc.d/service-tautulli/dependencies.d/init-wireguard
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/init-perms/dependencies.d/base
rename to root/etc/s6-overlay/s6-rc.d/service-tautulli/dependencies.d/init-wireguard
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-perms b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-perms
deleted file mode 100644
index e69de29bb..000000000
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-secrets b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-secrets
deleted file mode 100644
index e69de29bb..000000000
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup
deleted file mode 100644
index e69de29bb..000000000
diff --git a/root/etc/s6-overlay/s6-rc.d/init-secrets/dependencies.d/init-perms b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup-app
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/init-secrets/dependencies.d/init-perms
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup-app