diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs
index eb04b07b..2c0cdac2 100755
--- a/src/freedombone-app-ipfs
+++ b/src/freedombone-app-ipfs
@@ -408,13 +408,13 @@ function mesh_install_ipfs_go {
     if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
         IPFS_ARCH=amd64
     fi
-    if [[ $ARCHITECTURE == *"arm"* ]]; then
+    if [[ $ARCHITECTURE == *"arm"* || $ARCHITECTURE == *"aarch"* ]]; then
         IPFS_ARCH=arm
     fi
     if [ ! $IPFS_ARCH ]; then
         echo $'No architecture specified'
         ARCHITECTURE=$(uname -m)
-        if [[ $ARCHITECTURE == "arm"* ]]; then
+        if [[ $ARCHITECTURE == "arm"* || $ARCHITECTURE == *"aarch"* ]]; then
             IPFS_ARCH=arm
             echo $"Using $IPFS_ARCH"
         fi
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 7358c082..14d733c9 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1164,7 +1164,7 @@ function image_setup_utils {
     if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
         GOARCH=amd64
     fi
-    if [[ $ARCHITECTURE == *"arm"* ]]; then
+    if [[ $ARCHITECTURE == *"arm"* || $ARCHITECTURE == *"aarch"* ]]; then
         GOARCH=armv6l
     fi
     if [ ! $GOARCH ]; then
diff --git a/src/freedombone-utils-go b/src/freedombone-utils-go
index df438bdd..1e6e7e08 100755
--- a/src/freedombone-utils-go
+++ b/src/freedombone-utils-go
@@ -144,13 +144,13 @@ function mesh_upgrade_golang {
     if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
         GOARCH=amd64
     fi
-    if [[ $ARCHITECTURE == *"arm"* ]]; then
+    if [[ $ARCHITECTURE == *"arm"* || $ARCHITECTURE == *"aarch"* ]]; then
         GOARCH=armv6l
     fi
     if [ ! $GOARCH ]; then
         echo $'No architecture specified'
         ARCHITECTURE=$(uname -m)
-        if [[ $ARCHITECTURE == "arm"* ]]; then
+        if [[ $ARCHITECTURE == "arm"* || $ARCHITECTURE == *"aarch"* ]]; then
             GOARCH=armv6l
             echo $"Using $GOARCH"
         fi
diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index c40cbd05..dbd8ac62 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -46,7 +46,7 @@ NODEJS_INSTALLED_APPS_FILE=$HOME/.nodejs-apps
 function get_npm_arch {
     N_ARCH='x86'
     NPM_ARCH='ia32'
-    if [[ $ARCHITECTURE == 'arm'* ]]; then
+    if [[ $ARCHITECTURE == 'arm'* || $ARCHITECTURE == *"aarch"* ]]; then
         NPM_ARCH='armv7l'
         N_ARCH='arm'
     fi