diff --git a/ansible-playbook-mysql.yml b/ansible-playbook-mysql.yml
index b14a45d..b46b805 100644
--- a/ansible-playbook-mysql.yml
+++ b/ansible-playbook-mysql.yml
@@ -78,7 +78,7 @@
         env:
           MYSQL_ROOT_PASSWORD: 'my-secret-pw'
         healthcheck:
-          test: ['CMD', 'healthcheck.sh', '--su=mysql', '--connect', '--innodb_initialized']
+          test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
           timeout: 10s
           retries: 5
       tags:
@@ -217,7 +217,7 @@
           - /etc/localtime:/etc/localtime:ro
         env:
           PDNS_ADMIN_SQLA_DB_PASSWORD: 'my-secret-pw'
-          PDNS_VERSION: '4.8'
+          PDNS_VERSION: '4.9'
           PDNS_API_KEY: 'secret'
       tags:
         - pdns-admin
diff --git a/ansible-playbook-pgsql.yml b/ansible-playbook-pgsql.yml
index 8f0d781..c2c8fb7 100644
--- a/ansible-playbook-pgsql.yml
+++ b/ansible-playbook-pgsql.yml
@@ -217,7 +217,7 @@
           PDNS_ADMIN_SQLA_DB_PORT: '5432'
           PDNS_ADMIN_SQLA_DB_USER: 'postgres'
           PDNS_ADMIN_SQLA_DB_PASSWORD: 'my-secret-pw'
-          PDNS_VERSION: '4.8'
+          PDNS_VERSION: '4.9'
           PDNS_API_KEY: 'secret'
       tags:
         - pdns-admin
diff --git a/docker-compose-mysql-ipv6.yml b/docker-compose-mysql-ipv6.yml
index 36dd602..8bc6a97 100644
--- a/docker-compose-mysql-ipv6.yml
+++ b/docker-compose-mysql-ipv6.yml
@@ -26,7 +26,7 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=my-secret-pw
     healthcheck:
-      test: ['CMD', 'healthcheck.sh', '--su=mysql', '--connect', '--innodb_initialized']
+      test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
       timeout: 10s
       retries: 5
 
@@ -112,7 +112,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - PDNS_ADMIN_SQLA_DB_PASSWORD=my-secret-pw
-      - PDNS_VERSION=4.8
+      - PDNS_VERSION=4.9
       - PDNS_API_KEY=secret
     depends_on:
       - mariadb
diff --git a/docker-compose-mysql.yml b/docker-compose-mysql.yml
index fba0472..de9cfcb 100644
--- a/docker-compose-mysql.yml
+++ b/docker-compose-mysql.yml
@@ -24,7 +24,7 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=my-secret-pw
     healthcheck:
-      test: ['CMD', 'healthcheck.sh', '--su=mysql', '--connect', '--innodb_initialized']
+      test: ['CMD', 'healthcheck.sh', '--connect', '--innodb_initialized']
       timeout: 10s
       retries: 5
 
@@ -108,7 +108,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - PDNS_ADMIN_SQLA_DB_PASSWORD=my-secret-pw
-      - PDNS_VERSION=4.8
+      - PDNS_VERSION=4.9
       - PDNS_API_KEY=secret
     depends_on:
       - mariadb
diff --git a/docker-compose-pgsql.yml b/docker-compose-pgsql.yml
index 000476a..896a3d3 100644
--- a/docker-compose-pgsql.yml
+++ b/docker-compose-pgsql.yml
@@ -108,7 +108,7 @@ services:
       - PDNS_ADMIN_SQLA_DB_PORT=5432
       - PDNS_ADMIN_SQLA_DB_USER=postgres
       - PDNS_ADMIN_SQLA_DB_PASSWORD=my-secret-pw
-      - PDNS_VERSION=4.8
+      - PDNS_VERSION=4.9
       - PDNS_API_KEY=secret
     depends_on:
       - postgres
diff --git a/examples/kubernetes/admin-dashboard.yaml b/examples/kubernetes/admin-dashboard.yaml
index cef810d..1042db8 100644
--- a/examples/kubernetes/admin-dashboard.yaml
+++ b/examples/kubernetes/admin-dashboard.yaml
@@ -48,7 +48,7 @@ spec:
         - name: PDNS_API_URL
           value: "http://master-api-pdns:8081/"
         - name: PDNS_VERSION
-          value: "4.8"
+          value: "4.9"
         - name: PDNS_API_KEY
           valueFrom:
             secretKeyRef:
diff --git a/pdns-admin/Dockerfile b/pdns-admin/Dockerfile
index 77a6485..ceedbd7 100644
--- a/pdns-admin/Dockerfile
+++ b/pdns-admin/Dockerfile
@@ -28,7 +28,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
     uwsgi \
     uwsgi-plugin-python3 \
     yarn \
-    https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
+    https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
   && dnf clean all
 
 RUN mkdir -p /opt/powerdns-admin \
diff --git a/pdns-admin/config.py.tpl b/pdns-admin/config.py.tpl
index c037044..8ed1b59 100644
--- a/pdns-admin/config.py.tpl
+++ b/pdns-admin/config.py.tpl
@@ -15,7 +15,7 @@ CAPTCHA_SESSION_KEY = 'captcha_image'
 
 SESSION_TYPE = 'sqlalchemy'
 
-# SAML Authnetication
+# SAML Authentication
 SAML_ENABLED = False
 
 # Configuration from env vars
diff --git a/pdns-mysql/Dockerfile b/pdns-mysql/Dockerfile
index c05e2ae..ac2cfbd 100644
--- a/pdns-mysql/Dockerfile
+++ b/pdns-mysql/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:40
+FROM fedora:41
 
 RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
   && echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
@@ -9,7 +9,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
     hostname \
     mariadb \
     pdns \
-    https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
+    https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
   && dnf --setopt 'tsflags=' install pdns-backend-mysql \
   && dnf clean all
 
@@ -18,7 +18,7 @@ RUN mkdir -p /run/pdns \
 
 COPY pdns.conf.tpl docker-entrypoint.sh /
 
-ENV VERSION=4.8 \
+ENV VERSION=4.9 \
   PDNS_guardian=yes \
   PDNS_setuid=pdns \
   PDNS_setgid=pdns \
diff --git a/pdns-mysql/Dockerfile.alpine b/pdns-mysql/Dockerfile.alpine
index cd9bb8f..55b3de3 100644
--- a/pdns-mysql/Dockerfile.alpine
+++ b/pdns-mysql/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM alpine:3.20.0
+FROM alpine:3.21
 
 RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
   && apk update \
@@ -8,7 +8,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
     pdns \
     pdns-backend-mysql \
     pdns-doc \
-  && wget -O subvars.apk https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.apk \
+  && wget -O subvars.apk https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.apk \
   && apk add --allow-untrusted subvars.apk \
   && rm -rf subvars.apk /var/cache/apk/*
 
diff --git a/pdns-pgsql/Dockerfile b/pdns-pgsql/Dockerfile
index c8999f2..1f4ff03 100644
--- a/pdns-pgsql/Dockerfile
+++ b/pdns-pgsql/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:40
+FROM fedora:41
 
 RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
   && echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
@@ -9,7 +9,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
     hostname \
     pdns \
     postgresql16 \
-    https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
+    https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
   && dnf --setopt 'tsflags=' install pdns-backend-postgresql \
   && dnf clean all
 
@@ -18,7 +18,7 @@ RUN mkdir -p /run/pdns \
 
 COPY pdns.conf.tpl docker-entrypoint.sh /
 
-ENV VERSION=4.8 \
+ENV VERSION=4.9 \
   PDNS_guardian=yes \
   PDNS_setuid=pdns \
   PDNS_setgid=pdns \
diff --git a/pdns-pgsql/Dockerfile.alpine b/pdns-pgsql/Dockerfile.alpine
index 426030d..aebd88b 100644
--- a/pdns-pgsql/Dockerfile.alpine
+++ b/pdns-pgsql/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM alpine:3.20.0
+FROM alpine:3.21
 
 RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
   && apk update \
@@ -8,7 +8,7 @@ RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
     pdns-backend-pgsql \
     pdns-doc \
     postgresql16-client \
-  && wget -O subvars.apk https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.apk \
+  && wget -O subvars.apk https://github.com/TektonOps/subvars/releases/download/v0.1.5/subvars_${arch}.apk \
   && apk add --allow-untrusted subvars.apk \
   && rm -rf subvars.apk /var/cache/apk/*
 
diff --git a/pdns-recursor/docker-entrypoint.sh b/pdns-recursor/docker-entrypoint.sh
index 668a898..8a2f9cc 100755
--- a/pdns-recursor/docker-entrypoint.sh
+++ b/pdns-recursor/docker-entrypoint.sh
@@ -4,7 +4,7 @@ set -eu
 
 #### Function definitions
 
-deriveConfigValuesFromEnvrionement() {
+deriveConfigValuesFromEnvironment() {
   # Configure base vars
   : "${PDNS_local_port:=53}"
   : "${PDNS_local_address:=0.0.0.0}"
@@ -24,7 +24,7 @@ elif [ -f /etc/alpine-release ]; then
 fi
 
 if [ "${USE_EXISTING_CONFIG_FILE:-false}" = 'false' ]; then
-    deriveConfigValuesFromEnvrionement
+    deriveConfigValuesFromEnvironment
     echo "Generating config file from environment"
     subvars --prefix 'PDNS_' < '/recursor.conf.tpl' > "${config_file}"
     chown "${pdns_user}:" "${config_file}"