diff --git a/Dockerfile b/Dockerfile
index 8d9854f..32ae4a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17
 
 ARG BUILD_DATE
 ARG VERSION
@@ -10,21 +12,17 @@ ENV PYTHONUNBUFFERED=1
 
 RUN \
   apk add --update --no-cache --virtual=build-dependencies \
+    build-base \
     cargo \
-    g++ \
-    gcc \
     libc-dev \
     libffi-dev \
     libxslt-dev \
-    make \
     openssl-dev \
-    py3-wheel \
     python3-dev \
     zlib-dev && \
   apk add --update --no-cache \
     libxslt \
-    python3 \
-    py3-pip && \
+    python3 && \
   echo "**** install changedetection.io ****" && \
   mkdir -p /app/changedetection && \
   if [ -z ${CHANGEDETECTON_RELEASE+x} ]; then \
@@ -38,8 +36,11 @@ RUN \
     /tmp/changedetection.tar.gz -C \
     /app/changedetection/ --strip-components=1 && \
   rm /tmp/changedetection.tar.gz && \
-  pip3 install -U pip wheel setuptools && \
-  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r /app/changedetection/requirements.txt && \
+  python3 -m ensurepip --upgrade && \
+  pip3 install -U --no-cache-dir \
+    pip \
+    wheel && \
+  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r /app/changedetection/requirements.txt && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index c71b84f..b7018b4 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 ARG BUILD_DATE
 ARG VERSION
@@ -10,21 +12,17 @@ ENV PYTHONUNBUFFERED=1
 
 RUN \
   apk add --update --no-cache --virtual=build-dependencies \
+    build-base \
     cargo \
-    g++ \
-    gcc \
     libc-dev \
     libffi-dev \
     libxslt-dev \
-    make \
     openssl-dev \
-    py3-wheel \
     python3-dev \
     zlib-dev && \
   apk add --update --no-cache \
     libxslt \
-    python3 \
-    py3-pip && \
+    python3 && \
   echo "**** install changedetection.io ****" && \
   mkdir -p /app/changedetection && \
   if [ -z ${CHANGEDETECTON_RELEASE+x} ]; then \
@@ -38,8 +36,11 @@ RUN \
     /tmp/changedetection.tar.gz -C \
     /app/changedetection/ --strip-components=1 && \
   rm /tmp/changedetection.tar.gz && \
-  pip3 install -U pip wheel setuptools && \
-  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r /app/changedetection/requirements.txt && \
+  python3 -m ensurepip --upgrade && \
+  pip3 install -U --no-cache-dir \
+    pip \
+    wheel && \
+  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r /app/changedetection/requirements.txt && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index e0e0f50..10d01c4 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 ARG BUILD_DATE
 ARG VERSION
@@ -10,21 +12,17 @@ ENV PYTHONUNBUFFERED=1
 
 RUN \
   apk add --update --no-cache --virtual=build-dependencies \
+    build-base \
     cargo \
-    g++ \
-    gcc \
     libc-dev \
     libffi-dev \
     libxslt-dev \
-    make \
     openssl-dev \
-    py3-wheel \
     python3-dev \
     zlib-dev && \
   apk add --update --no-cache \
     libxslt \
-    python3 \
-    py3-pip && \
+    python3 && \
   echo "**** install changedetection.io ****" && \
   mkdir -p /app/changedetection && \
   if [ -z ${CHANGEDETECTON_RELEASE+x} ]; then \
@@ -38,8 +36,11 @@ RUN \
     /tmp/changedetection.tar.gz -C \
     /app/changedetection/ --strip-components=1 && \
   rm /tmp/changedetection.tar.gz && \
-  pip3 install -U pip wheel setuptools && \
-  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r /app/changedetection/requirements.txt && \
+  python3 -m ensurepip --upgrade && \
+  pip3 install -U --no-cache-dir \
+    pip \
+    wheel && \
+  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r /app/changedetection/requirements.txt && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
diff --git a/README.md b/README.md
index f29b5ef..9dda91e 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
 
+* **05.03.23:** - Rebase to Alpine 3.17.
 * **23.10.22:** - Rebase to Alpine 3.16, migrate to s6v3.
 * **09.10.22:** - Add make as build dep to fix pip jq build on armhf.
 * **07.08.22:** - Initial release.
diff --git a/readme-vars.yml b/readme-vars.yml
index 2e3b061..4676751 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -63,6 +63,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "05.03.23:", desc: "Rebase to Alpine 3.17." }
   - { date: "23.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." }
   - { date: "09.10.22:", desc: "Add make as build dep to fix pip jq build on armhf." }
   - { date: "07.08.22:", desc: "Initial release." }
diff --git a/root/etc/s6-overlay/s6-rc.d/init-changedetection-config/run b/root/etc/s6-overlay/s6-rc.d/init-changedetection-config/run
index 087d13a..0d877b1 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-changedetection-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-changedetection-config/run
@@ -1,5 +1,6 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
-chown -R abc:abc \
+lsiown -R abc:abc \
     /app \
     /config \
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-changedetection/run b/root/etc/s6-overlay/s6-rc.d/svc-changedetection/run
index edfaf90..adf65f2 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-changedetection/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-changedetection/run
@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 exec \
     s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 5000" \