diff --git a/generated/90-minimal b/generated/90-minimal
index 5739c77..1a7f3c6 100644
--- a/generated/90-minimal
+++ b/generated/90-minimal
@@ -40,9 +40,10 @@ fi
 
 
 # RELEASE VERSION ===============================================================
+ARCH=`uname -m`
 VERSION="90"
 FILES_URL="http://files.pharo.org/get-files/${VERSION}"
-IMAGE_FILE_NAME="pharo-minimal"
+IMAGE_FILE_NAME="pharo-minimal-${ARCH}"
 
 
 # DOWNLOADING THE LATEST PHARO 90 IMAGE =========================================
diff --git a/generated/vm90 b/generated/vm90
index 47b8ca5..78a7188 100644
--- a/generated/vm90
+++ b/generated/vm90
@@ -54,7 +54,12 @@ VM_STATUS="stable"
 
 
 # DETECT SYSTEM PROPERTIES ======================================================
-VM_ARCH=`uname -m`
+vmArchOut="$(uname -m)"
+case "${vmArchOut}" in
+    x*)         VM_ARCH=x86_64;;
+    arm*|ARM*)  VM_ARCH="${vmArchOut}";;
+    *)          VM_ARCH="UNKNOWN:${vmArchOut}";;
+esac
 unameOut="$(uname -s)"
 case "${unameOut}" in
     Linux*)     OSNAME=Linux;;
@@ -181,4 +186,4 @@ or if <code>curl</code> is not available: </br>
 
 <!--
 HTML_HELP
-# --!></body></html>
\ No newline at end of file
+# --!></body></html>
diff --git a/generated/vmLatest90 b/generated/vmLatest90
index 323330b..e2b589d 100644
--- a/generated/vmLatest90
+++ b/generated/vmLatest90
@@ -54,7 +54,12 @@ VM_STATUS="latest"
 
 
 # DETECT SYSTEM PROPERTIES ======================================================
-VM_ARCH=`uname -m`
+vmArchOut="$(uname -m)"
+case "${vmArchOut}" in
+    x*)         VM_ARCH=x86_64;;
+    arm*|ARM*)  VM_ARCH="${vmArchOut}";;
+    *)          VM_ARCH="UNKNOWN:${vmArchOut}";;
+esac
 unameOut="$(uname -s)"
 case "${unameOut}" in
     Linux*)     OSNAME=Linux;;
@@ -181,4 +186,4 @@ or if <code>curl</code> is not available: </br>
 
 <!--
 HTML_HELP
-# --!></body></html>
\ No newline at end of file
+# --!></body></html>
diff --git a/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateDetectSystemProperties.st b/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateDetectSystemProperties.st
index abe635c..dfff1b3 100644
--- a/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateDetectSystemProperties.st
+++ b/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateDetectSystemProperties.st
@@ -2,7 +2,12 @@ script generation
 generateDetectSystemProperties
 	self 
 		<<== 'DETECT SYSTEM PROPERTIES';
-		<< 'VM_ARCH=`uname -m`'; cr;
+		<< 'vmArchOut="$(uname -m)"'; cr;
+		<< 'case "${vmArchOut}" in'; cr;
+		<< '    x*)         VM_ARCH=x86_64;;'; cr;
+		<< '    arm*|ARM*)  VM_ARCH="${vmArchOut}";;'; cr;
+		<< '    *)          VM_ARCH="UNKNOWN:${vmArchOut}";;'; cr;
+		<< 'esac'; cr;
 		<< 'unameOut="$(uname -s)"'; cr;
 		<< 'case "${unameOut}" in'; cr;
 		<< '    Linux*)     OSNAME=Linux;;'; cr;
@@ -10,4 +15,4 @@ generateDetectSystemProperties
 		<< '    CYGWIN*)    OSNAME=Windows;;'; cr;
 		<< '    MINGW*)     OSNAME=Windows;;'; cr;
 		<< '    *)          OSNAME="UNKNOWN:${unameOut}"'; cr;
-		<< 'esac'; cr
\ No newline at end of file
+		<< 'esac'; cr