diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 7809ee671..5c2788b3b 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -24,12 +24,12 @@ jobs:
       uses: actions/setup-python@v2
       with:
         # https://github.com/actions/python-versions/releases
-        python-version: '3.9'
+        python-version: '3.9.7'
     - name: Install MkDocs
       id: mkdocs
       if: always() && steps.python.outcome == 'success'
       run: |
-        pip3 install -U pip wheel setuptools
+        pip3 install -U pip wheel 'setuptools<58'
         pip3 install -r requirements.txt
     - name: Build DietPi-Docs
       id: build
diff --git a/.wordlist.txt b/.wordlist.txt
index 0ad4f01ed..635d2d1f9 100644
--- a/.wordlist.txt
+++ b/.wordlist.txt
@@ -128,6 +128,7 @@ FastMail
 FB
 FHS
 filesystem
+filesystems
 ForkedDaapd
 FOSS
 FPM
@@ -436,6 +437,7 @@ tcpdump
 thechildofroth
 Thonny
 TigerVNC
+TiB
 TIOBE
 TLS
 tmpfs
diff --git a/docs/hardware.md b/docs/hardware.md
index f755f05b7..5c6ea2259 100644
--- a/docs/hardware.md
+++ b/docs/hardware.md
@@ -40,22 +40,49 @@ Quick intro:
             </tr>
         </thead>
         <tbody>
-        <tr>
-            <td><a class="table"><strong>Raspberry Pi - ALL models</strong><br>Single board computer (SBC)<br>Compute Module (CM)<br>Complete PC</a></td>
-            <td>
-                <strong>Unique DietPi image available for ALL Raspberry Pi models: </strong><a href="https://dietpi.com/downloads/images/DietPi_RPi-ARMv6-Bullseye.7z">Download image</a>
-                <strong>
-                <ul>
-                  <li>Raspberry Pi 400</li>
-                  <li>Raspberry Pi 4 Model B <br>Compute Module 4</li>
-                  <li>Raspberry Pi 3 Model A+ / B / B+ <br>Compute Module 3 / CM 3+</li>
-                  <li>Raspberry Pi 2 Model B / B v1.2</li>
-                  <li>Raspberry Pi 1 Model A+ / B+ <br>Compute Module 1</li>
-                  <li>Raspberry Pi Zero / Zero W/WH</li>
-                </ul>
-                </strong>
-            </td>
-        </tr>
+            <tr>
+                <td><a class="table"><strong>Raspberry Pi - ALL models</strong><br>Single board computer (SBC)<br>Compute Module (CM)</a></td>
+                <td>
+                    <strong>DietPi image for ALL Raspberry Pi models</strong>: <a href="https://dietpi.com/downloads/images/DietPi_RPi-ARMv6-Bullseye.7z">Download image</a>
+                    <strong>
+                        <ul>
+                            <li>Raspberry Pi 400</li>
+                            <li>Raspberry Pi 4 Model B<br>Compute Module 4</li>
+                            <li>Raspberry Pi 3 Model A+ / B / B+<br>Compute Module 3 / 3+</li>
+                            <li>Raspberry Pi 2 Model B v1.1 / B v1.2</li>
+                            <li>Raspberry Pi 1 Model A / A+ / B / B+<br>Compute Module 1</li>
+                            <li>Raspberry Pi Zero / Zero W / Zero WH</li>
+                        </ul>
+                    </strong>
+                </td>
+            </tr>
+            <tr>
+                <td><a class="table"><strong>Raspberry Pi - ARMv7</strong><br>Single board computer (SBC)<br>Compute Module (CM)</a></td>
+                <td>
+                    <strong>DietPi image for Raspberry Pi with ARMv7 CPU or above</strong>: <a href="https://dietpi.com/downloads/images/DietPi_RPi-ARMv7-Bullseye.7z">Download image</a>
+                    <strong>
+                        <ul>
+                            <li>Raspberry Pi 400</li>
+                            <li>Raspberry Pi 4 Model B<br>Compute Module 4</li>
+                            <li>Raspberry Pi 3 Model A+ / B / B+<br>Compute Module 3 / 3+</li>
+                            <li>Raspberry Pi 2 Model B v1.2</li>
+                        </ul>
+                    </strong>
+                </td>
+            </tr>
+            <tr>
+                <td><a class="table"><strong>Raspberry Pi - ARMv8</strong><br>Single board computer (SBC)<br>Compute Module (CM)</a></td>
+                <td>
+                    <strong>DietPi image for Raspberry Pi with ARMv8/64-bit CPU</strong>: <a href="https://dietpi.com/downloads/images/DietPi_RPi-ARMv8-Bullseye.7z">Download image</a>
+                    <strong>
+                        <ul>
+                            <li>Raspberry Pi 400</li>
+                            <li>Raspberry Pi 4 Model B<br>Compute Module 4</li>
+                            <li>Raspberry Pi 3 Model A+ / B / B+<br>Compute Module 3 / 3+</li>
+                        </ul>
+                    </strong>
+                </td>
+            </tr>
         </tbody>
     </table>
 </div>
@@ -446,30 +473,31 @@ The Hyper-V virtual machine is great for those occasions where SBC performance j
                 <td><a class="table" href=""><strong>Native PC for BIOS/CSM</strong></a></td>
                 <td>
                    <strong>Download</strong>: <a href="https://dietpi.com/downloads/images/DietPi_NativePC-BIOS-x86_64-Bullseye.7z">DietPi image</a>
+                   <br><strong>Download</strong>: <a href="https://dietpi.com/downloads/images/DietPi_NativePC-BIOS-x86_64-Bullseye_Installer.7z">DietPi installer image</a>
                 </td>
             </tr>
             <tr>
                 <td><a class="table" href=""><strong>Native PC UEFI</strong></a></td>
                 <td>
-                   <strong>Download</strong>: <a href="https://dietpi.com/downloads/images/DietPi_NativePC-UEFI-x86_64-Bullseye_Installer.7z">DietPi image</a>
+                   <strong>Download</strong>: <a href="https://dietpi.com/downloads/images/DietPi_NativePC-UEFI-x86_64-Bullseye_Installer.7z">DietPi installer image</a>
                 </td>
             </tr>
             <tr>
                 <td><a class="table" href=""><strong>VMware</strong></a></td>
                 <td>
-                   <strong>Download</strong>: <a href="https://dietpi.com/downloads/images/DietPi_VMware-x86_64-Buster.7z">DietPi image</a>
+                   <strong>Download</strong>: <a href="https://dietpi.com/downloads/images/DietPi_VMware-x86_64-Bullseye.7z">DietPi appliance</a>
                 </td>
             </tr>
             <tr>
                 <td><a class="table" href=""><strong>VirtualBox</strong></a></td>
                 <td>
-                   <strong>Download</strong>: <a href="https://dietpi.com/downloads/images/DietPi_VirtualBox-x86_64-Buster.7z">DietPi image</a>
+                   <strong>Download</strong>: <a href="https://dietpi.com/downloads/images/DietPi_VirtualBox-x86_64-Bullseye.7z">DietPi appliance</a>
                 </td>
             </tr>
             <tr>
                 <td><a class="table" href=""><strong>Hyper-V</strong></a></td>
                 <td>
-                   <strong>Download</strong>: <a target="_blank" rel="noopener" href="https://github.com/yumiris/DietPi.Hyper-V/blob/master/README.md">DietPi image</a>
+                   <strong>Download</strong>: <a href="https://dietpi.com/downloads/images/DietPi_Hyper-V-x86_64-Bullseye.7z">DietPi image</a>
                 </td>
             </tr>
         </tbody>