diff --git a/Dockerfile b/Dockerfile
index 332764fb..a349824e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:alpine
+FROM ghcr.io/linuxserver/baseimage-rdesktop:3.16
 
 # set version label
 ARG BUILD_DATE
@@ -22,4 +22,5 @@ COPY /root /
 
 # ports and volumes
 EXPOSE 3389
+
 VOLUME /config
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index bca02a60..175580c5 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-alpine
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -10,7 +10,7 @@ LABEL maintainer="thelamer"
 RUN \
   echo "**** install packages ****" && \
   apk add --no-cache \
-    firefox-esr \
+    firefox \
     font-noto \
     mate-desktop-environment && \
   echo "**** cleanup ****" && \
@@ -22,4 +22,5 @@ COPY /root /
 
 # ports and volumes
 EXPOSE 3389
+
 VOLUME /config
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index e9ee5d52..59ef9772 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-alpine
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -22,4 +22,5 @@ COPY /root /
 
 # ports and volumes
 EXPOSE 3389
+
 VOLUME /config
diff --git a/README.md b/README.md
index 85566e25..35d77f53 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,7 @@ docker exec -it rdesktop passwd abc
 By default we perform all logic for the abc user and we reccomend using that user only in the container, but new users can be added as long as there is a `startwm.sh` executable script in their home directory.
 All of these containers are configured with passwordless sudo, we make no efforts to secure or harden these containers and we do not reccomend ever publishing their ports to the public Internet.
 
-## Hardware Acceleration
+## Hardware Acceleration (Ubuntu Container Only)
 
 Many desktop application will need access to a GPU to function properly and even some Desktop Environments have compisitor effects that will not function without a GPU. This is not a hard requirement and all base images will function without a video device mounted into the container.
 
@@ -125,6 +125,10 @@ https://github.com/NVIDIA/nvidia-docker
 
 We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the container.
 
+### Arm Devices
+
+Best effort is made to install tools to allow mounting in /dev/dri on Arm devices. In most cases if /dev/dri exists on the host it should just work. If running a Raspberry Pi 4 be sure to enable `dtoverlay=vc4-fkms-v3d` in your usercfg.txt.
+
 ## Usage
 
 Here are some example snippets to help you get started creating a container.
@@ -298,6 +302,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **26.10.22:** - Rebase Alpine mate to 3.16, migrate to s6v3.
 * **05.03.22:** - Organize tags differently to run Ubuntu at latest LTS, make Alpine latest, add docs about GPU accel.
 * **05.05.21:** - Reduce default packages to their flavor specific basics.
 * **05.04.21:** - Add Alpine flavor.
diff --git a/readme-vars.yml b/readme-vars.yml
index 425abfb8..7c18d8c7 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -84,7 +84,7 @@ app_setup_block: |
   By default we perform all logic for the abc user and we reccomend using that user only in the container, but new users can be added as long as there is a `startwm.sh` executable script in their home directory.
   All of these containers are configured with passwordless sudo, we make no efforts to secure or harden these containers and we do not reccomend ever publishing their ports to the public Internet.
 
-  ## Hardware Acceleration
+  ## Hardware Acceleration (Ubuntu Container Only)
   
   Many desktop application will need access to a GPU to function properly and even some Desktop Environments have compisitor effects that will not function without a GPU. This is not a hard requirement and all base images will function without a video device mounted into the container.
   
@@ -102,8 +102,13 @@ app_setup_block: |
   
   We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the container.
 
+  ### Arm Devices
+
+  Best effort is made to install tools to allow mounting in /dev/dri on Arm devices. In most cases if /dev/dri exists on the host it should just work. If running a Raspberry Pi 4 be sure to enable `dtoverlay=vc4-fkms-v3d` in your usercfg.txt.
+
 # changelog
 changelogs:
+  - { date: "26.10.22:", desc: "Rebase Alpine mate to 3.16, migrate to s6v3." }
   - { date: "05.03.22:", desc: "Organize tags differently to run Ubuntu at latest LTS, make Alpine latest, add docs about GPU accel." }
   - { date: "05.05.21:", desc: "Reduce default packages to their flavor specific basics." }
   - { date: "05.04.21:", desc: "Add Alpine flavor." }