diff --git a/build_sdcard.sh b/build_sdcard.sh
index 4337759..900da12 100644
--- a/build_sdcard.sh
+++ b/build_sdcard.sh
@@ -571,9 +571,12 @@ echo ""
 # Go is needed for ZAP connect later
 # see https://golang.org/dl/
 goVersion="1.12.5"
-if [ ${isARM} -eq 1 ] || [ ${isAARCH64} -eq 1 ] ; then
+if [ ${isARM} -eq 1 ] ; then
   goOSversion="armv6l"
 fi
+if [ ${isAARCH64} -eq 1 ] ; then
+  goOSversion="arm64"
+fi
 if [ ${isX86_64} -eq 1 ] ; then
   goOSversion="amd64"
 fi 
diff --git a/home.admin/97addMobileWalletLNDconnect.sh b/home.admin/97addMobileWalletLNDconnect.sh
index 9fc7a77..e548c4c 100755
--- a/home.admin/97addMobileWalletLNDconnect.sh
+++ b/home.admin/97addMobileWalletLNDconnect.sh
@@ -33,9 +33,12 @@ echo "### Check Framework: GO ###"
 goInstalled=$(go version 2>/dev/null | grep -c 'go')
 if [ ${goInstalled} -eq 0 ];then
   goVersion="1.12.5"
-  if [ ${isARM} -eq 1 ] || [ ${isAARCH64} -eq 1 ] ; then
+  if [ ${isARM} -eq 1 ] ; then
     goOSversion="armv6l"
   fi
+  if [ ${isAARCH64} -eq 1 ] ; then
+    goOSversion="arm64"
+  fi
   if [ ${isX86_64} -eq 1 ] ; then
     goOSversion="amd64"
   fi 
diff --git a/home.admin/97addMobileWalletZeus.sh b/home.admin/97addMobileWalletZeus.sh
index a135e71..d2304e0 100644
--- a/home.admin/97addMobileWalletZeus.sh
+++ b/home.admin/97addMobileWalletZeus.sh
@@ -18,9 +18,12 @@ fi
 goInstalled=$(go version 2>/dev/null | grep -c 'go')
 if [ ${goInstalled} -eq 0 ];then
   goVersion="1.12.5"
-  if [ ${isARM} -eq 1 ] || [ ${isAARCH64} -eq 1 ] ; then
+  if [ ${isARM} -eq 1 ] ; then
     goOSversion="armv6l"
   fi
+  if [ ${isAARCH64} -eq 1 ] ; then
+    goOSversion="arm64"
+  fi
   if [ ${isX86_64} -eq 1 ] ; then
     goOSversion="amd64"
   fi