diff --git a/.ci/scripts/install-docker-compose.sh b/.ci/scripts/install-docker-compose.sh
index abb138149d1..376c9534380 100755
--- a/.ci/scripts/install-docker-compose.sh
+++ b/.ci/scripts/install-docker-compose.sh
@@ -7,7 +7,7 @@ DOCKER_COMPOSE_VERSION=${DOCKER_COMPOSE_VERSION:?$MSG}
 HOME=${HOME:?$MSG}
 
 ARCH=$(uname -m| tr '[:upper:]' '[:lower:]')
-if [ "${ARCH}" == "aarch64" ] ; then
+if [ "${ARCH}" == "aarch64" ] || [ "${ARCH}" == "arm64" ] ; then
     echo "docker-compose distribution for ARM is not supported yet. See https://github.com/docker/compose/issues/6831."
     echo "Let's use the installed docker-compose version"
     exit 0
diff --git a/.ci/scripts/install-terraform.sh b/.ci/scripts/install-terraform.sh
index 90882c0da6b..1ebff3cf5d2 100755
--- a/.ci/scripts/install-terraform.sh
+++ b/.ci/scripts/install-terraform.sh
@@ -32,6 +32,9 @@ elif [ "${ARCH}" == "x86_64" ] ; then
     ARCH_SUFFIX=amd64
 elif [ "${ARCH}" == "i686" ] ; then
     ARCH_SUFFIX=386
+elif [ "${OS}" == "darwin" ] && [ "${ARCH}" == "arm64" ] ; then
+    echo 'No terraform binary for darwin on arm64 at the moment.'
+    exit 0
 else
     ARCH_SUFFIX=arm
 fi