diff --git a/autoinstall/FreeBSD/13/installerconfig b/autoinstall/FreeBSD/13/installerconfig
index 87e492cd0..e745a34c4 100644
--- a/autoinstall/FreeBSD/13/installerconfig
+++ b/autoinstall/FreeBSD/13/installerconfig
@@ -62,7 +62,12 @@ env ASSUME_ALWAYS_YES=YES pkg update -f > /dev/ttyu0
 
 # We install packages from ISO image
 # Different packages between the 32bit image and 64bit image
-packages_to_install='bash sudo xorg xf86-video-vmware'
+machtype=$(uname -m)
+if [ "$machtype" == "amd64" ] || [ "$machtype" == "x86_64" ]; then
+    packages_to_install='bash sudo xorg xf86-video-vmware'
+else
+    packages_to_install='bash sudo'
+fi
 for package_to_install in $packages_to_install
 do
     echo "Install package $package_to_install ..." > /dev/ttyu0
@@ -92,12 +97,11 @@ FreeBSD_latest: {
 EOF
 
 env ASSUME_ALWAYS_YES=YES pkg update -f > /dev/ttyu0
-machtype=$(uname -m)
 echo "Machine type is $machtype" > /dev/ttyu0
-if [[ "$machtype" =~ 64 ]]; then
+if [ "$machtype" == "amd64" ] || [ "$machtype" == "x86_64" ]; then
     packages_to_install='sddm kde5 open-vm-tools xf86-input-vmmouse wget curl e2fsprogs iozone lsblk'
 else 
-    packages_to_install='open-vm-tools-nox11 xf86-input-vmmouse wget curl e2fsprogs iozone lsblk'
+    packages_to_install='open-vm-tools-nox11 wget curl e2fsprogs iozone lsblk'
 fi
 
 for package_to_install in $packages_to_install
diff --git a/autoinstall/FreeBSD/14/installerconfig b/autoinstall/FreeBSD/14/installerconfig
index dd62dec92..ede17a92a 100644
--- a/autoinstall/FreeBSD/14/installerconfig
+++ b/autoinstall/FreeBSD/14/installerconfig
@@ -64,10 +64,10 @@ env ASSUME_ALWAYS_YES=YES pkg update -f > /dev/ttyu0
 # Different packages between the 32bit image and 64bit image
 machtype=$(uname -m)
 echo "Machine type is $machtype" > /dev/ttyu0
-if [[ "$machtype" =~ 64 ]]; then
+if [ "$machtype" == "amd64" ] || [ "$machtype" == "x86_64" ]; then
     packages_to_install='bash sudo xorg kde5 xf86-video-vmware'
 else
-    packages_to_install='bash sudo xf86-video-vmware'
+    packages_to_install='bash sudo'
 fi
 
 for package_to_install in $packages_to_install
@@ -86,10 +86,10 @@ done
 # Disable ISO repo and enable default repo
 rm -rf /usr/local/etc/pkg/repos/FreeBSD_install_cdrom.conf
 env ASSUME_ALWAYS_YES=YES pkg update -f > /dev/ttyu0
-if [[ "$machtype" =~ 64 ]]; then
+if [ "$machtype" == "amd64" ] || [ "$machtype" == "x86_64" ]; then
     packages_to_install='sddm open-vm-tools xf86-input-vmmouse wget curl e2fsprogs iozone lsblk'
 else
-    packages_to_install='open-vm-tools-nox11 xf86-input-vmmouse wget curl e2fsprogs iozone lsblk'
+    packages_to_install='open-vm-tools-nox11 wget curl e2fsprogs iozone lsblk'
 fi
 
 for package_to_install in $packages_to_install