diff --git a/.github/scripts/build_projects.py b/.github/scripts/build_projects.py
index 3db1048..7b837c7 100755
--- a/.github/scripts/build_projects.py
+++ b/.github/scripts/build_projects.py
@@ -44,11 +44,11 @@ def select_build_target():
                 return ("libzim", "libkiwix")
             else:
                 return ("zim-tools", "kiwix-tools")
-    elif PLATFORM_TARGET in ("win32_static", "armhf_static", "armhf_dyn", "aarch64_static", "aarch64_dyn", "i586_static"):
+    elif PLATFORM_TARGET in ("win32_static", "armv6_static", "armv6_dyn", "armv8_static", "armv8_dyn", "aarch64_static", "aarch64_dyn", "i586_static"):
         return ("zim-tools", "kiwix-tools")
     elif PLATFORM_TARGET == "flatpak":
         return ("kiwix-desktop",)
-    elif PLATFORM_TARGET in ("wasm", "armhf_mixed", "aarch64_mixed"):
+    elif PLATFORM_TARGET in ("wasm", "armv6_mixed", "armv8_mixed", "aarch64_mixed"):
         return ("libzim", )
     else:
         return ("libzim", "zim-tools", "libkiwix", "kiwix-tools")
diff --git a/.github/scripts/common.py b/.github/scripts/common.py
index cc2d604..cf4d0e8 100644
--- a/.github/scripts/common.py
+++ b/.github/scripts/common.py
@@ -51,8 +51,10 @@ PLATFORM_TO_RELEASE = {
     "native_mixed": "{os}-x86_64{extra}".format(os=RELEASE_OS_NAME, extra=EXTRA_NAME),
     "native_static": "{os}-x86_64".format(os=RELEASE_OS_NAME),
     "win32_static": "win-i686",
-    "armhf_static": "{os}-armhf".format(os=RELEASE_OS_NAME),
-    "armhf_mixed": "{os}-armhf".format(os=RELEASE_OS_NAME),
+    "armv6_static": "{os}-armv6".format(os=RELEASE_OS_NAME),
+    "armv6_mixed": "{os}-armv6".format(os=RELEASE_OS_NAME),
+    "armv8_static": "{os}-armv8".format(os=RELEASE_OS_NAME),
+    "armv8_mixed": "{os}-armv8".format(os=RELEASE_OS_NAME),
     "aarch64_static": "{os}-aarch64".format(os=RELEASE_OS_NAME),
     "aarch64_mixed": "{os}-aarch64{extra}".format(os=RELEASE_OS_NAME, extra=EXTRA_NAME),
     "i586_static": "{os}-i586".format(os=RELEASE_OS_NAME),
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4d703ae..f2c1f48 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,9 +16,12 @@ jobs:
           - native_mixed
           - native_desktop
           - wasm
-          - armhf_static
-          - armhf_dyn
-          - armhf_mixed
+          - armv6_static
+          - armv6_dyn
+          - armv6_mixed
+          - armv8_static
+          - armv8_dyn
+          - armv8_mixed
           - aarch64_static
           - aarch64_dyn
           - aarch64_mixed
diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml
index cea0d15..4eacfc2 100644
--- a/.github/workflows/releaseNigthly.yml
+++ b/.github/workflows/releaseNigthly.yml
@@ -18,8 +18,10 @@ jobs:
           - native_mixed
           - native_desktop
           - wasm
-          - armhf_static
-          - armhf_mixed
+          - armv6_static
+          - armv6_mixed
+          - armv8_static
+          - armv8_mixed
           - aarch64_static
           - aarch64_mixed
           - win32_static
@@ -47,10 +49,16 @@ jobs:
           - target: wasm
             image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
-          - target: armhf_static
+          - target: armv6_static
             image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
-          - target: armhf_mixed
+          - target: armv6_mixed
+            image_variant: focal
+            lib_postfix: '/x86_64-linux-gnu'
+          - target: armv8_static
+            image_variant: focal
+            lib_postfix: '/x86_64-linux-gnu'
+          - target: armv8_mixed
             image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: aarch64_static