diff --git a/functions.sh b/functions.sh
index e03cf874d..bee3dafe0 100755
--- a/functions.sh
+++ b/functions.sh
@@ -32,17 +32,14 @@ function get_arch() {
     s390x)
       arch="s390x"
       ;;
-    arm64)
-      arch="amd64"
-      ;;
-    aarch64)
+    aarch64 | arm64)
       arch="arm64"
       ;;
     armv7l)
       arch="arm32v7"
       ;;
     *)
-      echo "$0 does not support architecture ${arch} ... aborting"
+      echo "$0 does not support architecture ${arch:-unknown} ... aborting"
       exit 1
       ;;
   esac
diff --git a/update.sh b/update.sh
index 9a321c800..d22909b73 100755
--- a/update.sh
+++ b/update.sh
@@ -126,7 +126,7 @@ function update_node_version() {
   (
     cp "${template}" "${dockerfile}-tmp"
     local fromprefix=""
-    if [ "${arch}" != "amd64" ]; then
+    if [ "${arch}" != "amd64" ] && [ ${arch} != "arm64" ]; then
       fromprefix="${arch}\\/"
     fi