diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index d665c031..bed15903 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1167,7 +1167,7 @@ function image_setup_utils {
     if [[ $ARCHITECTURE == *"arm"* ]]; then
         GOARCH=armv6l
     fi
-    if [[ $ARCHITECTURE == *"aarch"* ]]; then
+    if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
         GOARCH=arm64
     fi
     if [ ! $GOARCH ]; then
diff --git a/src/freedombone-utils-go b/src/freedombone-utils-go
index 933c8dc7..6739a163 100755
--- a/src/freedombone-utils-go
+++ b/src/freedombone-utils-go
@@ -147,7 +147,7 @@ function mesh_upgrade_golang {
     if [[ $ARCHITECTURE == *"arm"* ]]; then
         GOARCH=armv6l
     fi
-    if [[ $ARCHITECTURE == *"aarch"* ]]; then
+    if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
         GOARCH=arm64
     fi
     if [ ! $GOARCH ]; then
@@ -157,7 +157,7 @@ function mesh_upgrade_golang {
             GOARCH=armv6l
             echo $"Using $GOARCH"
         fi
-        if [[ $ARCHITECTURE == *"aarch"* ]]; then
+        if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
             GOARCH=arm64
             echo $"Using $GOARCH"
         fi