diff --git a/install.sh b/install.sh
index e5cac6f7..9d0d0665 100755
--- a/install.sh
+++ b/install.sh
@@ -70,6 +70,7 @@ uname_arch() {
   arch=$(uname -m)
   case $arch in 
     x86_64) arch="amd64" ;;
+    aarch64) arch="arm64" ;;
     x86) arch="386" ;;
     i686) arch="386" ;;
     i386) arch="386" ;;
diff --git a/scripts/cli/build.sh b/scripts/cli/build.sh
index 0c3e30d1..ee010751 100755
--- a/scripts/cli/build.sh
+++ b/scripts/cli/build.sh
@@ -112,6 +112,7 @@ if [ -z "$GOOS" ] && [ -z "$GOARCH" ]; then
   cp -R  "$projectDir" "$goPathBasedir"
 
   build linux amd64
+  build linux arm64
   build darwin amd64
   build windows amd64
 else
diff --git a/scripts/server/build.sh b/scripts/server/build.sh
index b8c3d507..f6a6282e 100755
--- a/scripts/server/build.sh
+++ b/scripts/server/build.sh
@@ -64,3 +64,4 @@ build() {
 }
 
 build linux amd64
+build linux arm64
diff --git a/scripts/server/test.sh b/scripts/server/test.sh
index ff098cd1..89d51a79 100755
--- a/scripts/server/test.sh
+++ b/scripts/server/test.sh
@@ -3,13 +3,14 @@
 # appropriate env vars.
 set -eux
 
-dir=$(dirname "${BASH_SOURCE[0]}")
+dir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 pushd "$dir/../../pkg/server"
 
-export DNOTE_TEST_EMAIL_TEMPLATE_DIR="$dir/../../pkg/server/mailer/templates/src"
+emailTemplateDir=$(realpath "$dir/../../pkg/server/mailer/templates/src")
+export DNOTE_TEST_EMAIL_TEMPLATE_DIR="$emailTemplateDir"
 
 function run_test {
-  go test ./... -cover -p 1 
+  go test ./... -cover -p 1
 }
 
 if [ "${WATCH-false}" == true ]; then