diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 14d733c9..d665c031 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1164,9 +1164,12 @@ function image_setup_utils {
     if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
         GOARCH=amd64
     fi
-    if [[ $ARCHITECTURE == *"arm"* || $ARCHITECTURE == *"aarch"* ]]; then
+    if [[ $ARCHITECTURE == *"arm"* ]]; then
         GOARCH=armv6l
     fi
+    if [[ $ARCHITECTURE == *"aarch"* ]]; then
+        GOARCH=arm64
+    fi
     if [ ! $GOARCH ]; then
         echo $'System architecture was not specified when installing Go'
         exit 6734378
diff --git a/src/freedombone-utils-go b/src/freedombone-utils-go
index 1e6e7e08..933c8dc7 100755
--- a/src/freedombone-utils-go
+++ b/src/freedombone-utils-go
@@ -144,16 +144,23 @@ function mesh_upgrade_golang {
     if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
         GOARCH=amd64
     fi
-    if [[ $ARCHITECTURE == *"arm"* || $ARCHITECTURE == *"aarch"* ]]; then
+    if [[ $ARCHITECTURE == *"arm"* ]]; then
         GOARCH=armv6l
     fi
+    if [[ $ARCHITECTURE == *"aarch"* ]]; then
+        GOARCH=arm64
+    fi
     if [ ! $GOARCH ]; then
         echo $'No architecture specified'
         ARCHITECTURE=$(uname -m)
-        if [[ $ARCHITECTURE == "arm"* || $ARCHITECTURE == *"aarch"* ]]; then
+        if [[ $ARCHITECTURE == "arm"* ]]; then
             GOARCH=armv6l
             echo $"Using $GOARCH"
         fi
+        if [[ $ARCHITECTURE == *"aarch"* ]]; then
+            GOARCH=arm64
+            echo $"Using $GOARCH"
+        fi
         if [[ $ARCHITECTURE == "amd"* || $ARCHITECTURE == "x86_64" ]]; then
             GOARCH=amd64
             echo $"Using $GOARCH"