diff --git a/Dockerfile b/Dockerfile
index 6b7ebcfc..c9172e79 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop-web:fedora-2c286ca1-ls70
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:fedora
 
 # set version label
 ARG BUILD_DATE
@@ -9,9 +9,9 @@ LABEL maintainer="thelamer"
 RUN \
   echo "**** install packages ****" && \
   dnf install -y --setopt=install_weak_deps=False --best \
-    firefox \
     dmenu \
     feh \
+    firefox \
     i3 \
     i3status && \
   echo "**** cleanup ****" && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index a7e42659..24f6001c 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-fedora-2c286ca1-ls70
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-fedora
 
 # set version label
 ARG BUILD_DATE
@@ -9,9 +9,9 @@ LABEL maintainer="thelamer"
 RUN \
   echo "**** install packages ****" && \
   dnf install -y --setopt=install_weak_deps=False --best \
-    firefox \
     dmenu \
     feh \
+    firefox \
     i3 \
     i3status && \
   echo "**** cleanup ****" && \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index bc90949a..93de39d7 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-fedora-2c286ca1-ls70
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-fedora
 
 # set version label
 ARG BUILD_DATE
@@ -11,6 +11,7 @@ RUN \
   dnf install -y --forcearch armv7hl --setopt=install_weak_deps=False --best \
     dmenu \
     feh \
+    firefox \
     i3 \
     i3status && \
   echo "**** cleanup ****" && \
diff --git a/README.md b/README.md
index 764b9b78..a431adb8 100644
--- a/README.md
+++ b/README.md
@@ -270,4 +270,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **07.10.22:** - Rebase fedora-i3 to Fedora 36, migrate to s6v3.
 * **20.04.21:** - Initial release.
diff --git a/readme-vars.yml b/readme-vars.yml
index 28b85b87..b77786b8 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -78,4 +78,5 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "07.10.22:", desc: "Rebase fedora-i3 to Fedora 36, migrate to s6v3." }
   - { date: "20.04.21:", desc: "Initial release." }