diff --git a/deploy_stack.armhf.sh b/deploy_stack.armhf.sh
index b8b0aef5..fce19cb7 100755
--- a/deploy_stack.armhf.sh
+++ b/deploy_stack.armhf.sh
@@ -1,9 +1,3 @@
 #!/bin/sh
 
-if ! [ -x "$(command -v docker)" ]; then
-  echo 'Unable to find docker command, please install Docker (https://www.docker.com/) and retry' >&2
-  exit 1
-fi
-
-echo "Deploying stack"
-docker stack deploy func --compose-file docker-compose.armhf.yml
+sh ./deploy_stack.sh
diff --git a/deploy_stack.sh b/deploy_stack.sh
index c38ce917..a9ffd66c 100755
--- a/deploy_stack.sh
+++ b/deploy_stack.sh
@@ -49,6 +49,18 @@ else
   echo ""
 fi
 
-echo "Deploying OpenFaaS core services"
+arch=$(uname -m)
+case "$arch" in
 
-docker stack deploy func --compose-file docker-compose.yml
+"armv7l") echo "Deploying OpenFaaS core services for ARM"
+          composefile="docker-compose.armhf.yml"
+          ;;
+"aarch64") echo "Deploying OpenFaaS core services for ARM64"
+          composefile="docker-compose.arm64.yml"
+          ;;
+*) echo "Deploying OpenFaaS core services"
+   composefile="docker-compose.yml"
+   ;;
+esac
+
+docker stack deploy func --compose-file $composefile