diff --git a/board/common/post-image.sh b/board/common/post-image.sh
index 2d12aca3..26458756 100755
--- a/board/common/post-image.sh
+++ b/board/common/post-image.sh
@@ -4,14 +4,18 @@
 
 common=$(dirname "$(readlink -f "$0")")
 
-imgdir=$1
-arch=$2
-signkey=$3
+# Temporary, separate handling of aarch64 and amd64 images.
+# Best would be to have the same for both, i.e., boot GNS3
+# with u-boot.
+if [ "$BR2_ARCH" = "aarch64" ]; then
+    # shellcheck disable=SC2034
+    imgdir=$1
+    arch=$2
+    signkey=$3
 
-$common/sign.sh $arch $signkey
-$common/mkfit.sh
-$common/mkmmc.sh
-
-if [ "$BR2_ARCH" = "x86_64" ]; then
-	"$common/mkgns3a.sh"
+    $common/sign.sh $arch $signkey
+    $common/mkfit.sh
+    $common/mkmmc.sh
+elif [ "$BR2_ARCH" = "x86_64" ]; then
+    "$common/mkgns3a.sh"
 fi