diff --git a/ShellScripts/Linux/install_packages_root.sh b/ShellScripts/Linux/install_packages_root.sh
index f541230fd..61ee08ab4 100755
--- a/ShellScripts/Linux/install_packages_root.sh
+++ b/ShellScripts/Linux/install_packages_root.sh
@@ -87,13 +87,12 @@ run_script() {
             install_package python
         fi
         install_gitversion "$outputdir"
-        if [ ! -d /usr/share/espeak-ng-data ]; then
-            if [ ! -d /usr/local/share/espeak-ng-data ]; then
-                if [ ! -d /usr/lib/x86_64-linux-gnu/espeak-ng-data ]; then
-                    echo "❌ espeak-ng-data not in /usr/share, /usr/local/share or /usr/lib/x86_64-linux-gnu!"
-                    return 1
-                fi
-            fi
+        local espeak_folder="$(uname -m 2>/dev/null || echo x86_64)-linux-gnu"
+        if [[ ! -d "/usr/share/espeak-ng-data" &&
+              ! -d "/usr/local/share/espeak-ng-data" &&
+              ! -d "/usr/lib/$espeak_folder/espeak-ng-data" ]]; then
+            echo "❌ espeak-ng-data not in /usr/share, /usr/local/share or /usr/lib/$espeak_folder!"
+            return 1
         fi
     fi
 
diff --git a/ShellScripts/common/post_build.sh b/ShellScripts/common/post_build.sh
index 8f2676a29..4a65d3973 100755
--- a/ShellScripts/common/post_build.sh
+++ b/ShellScripts/common/post_build.sh
@@ -54,7 +54,7 @@ run_script() {
             # Linux search paths for espeak-ng-data
             local SEARCH_PATHS=(
                 "/usr/local/share/espeak-ng-data"
-                "/usr/lib/x86_64-linux-gnu/espeak-ng-data"
+                "/usr/lib/$(uname -m 2>/dev/null || echo x86_64)-linux-gnu/espeak-ng-data"
                 "/usr/share/espeak-ng-data"
                 "/app/share/espeak-ng-data"
             )