diff --git a/build/download_helm_binary.sh b/build/download_helm_binary.sh
index 950bc46c9..4aa1f896b 100755
--- a/build/download_helm_binary.sh
+++ b/build/download_helm_binary.sh
@@ -10,6 +10,10 @@ if [ "${PLATFORM}" == 'linux' ]; then
   wget -qO- "https://get.helm.sh/${HELM_DIST}.tar.gz" | tar -x -z --strip-components 1 "${PLATFORM}-${ARCH}/helm"
   mv "helm" "dist/helm"
   chmod +x "dist/helm"
+elif [ "${PLATFORM}" == 'darwin' ]; then
+  wget -qO- "https://get.helm.sh/helm-canary-darwin-amd64.tar.gz" | tar -x -z --strip-components 1 "darwin-amd64/helm"
+  mv "helm" "dist/helm"
+  chmod +x "dist/helm"
 elif [ "${PLATFORM}" == 'windows' ]; then
   wget -q -O tmp.zip "https://get.helm.sh/${HELM_DIST}.zip" && unzip -o -j tmp.zip "${PLATFORM}-${ARCH}/helm.exe" -d dist && rm -f tmp.zip
 fi
diff --git a/build/download_kompose_binary.sh b/build/download_kompose_binary.sh
index 3221aa23a..8b7ec5f2d 100755
--- a/build/download_kompose_binary.sh
+++ b/build/download_kompose_binary.sh
@@ -4,12 +4,12 @@ PLATFORM=$1
 ARCH=$2
 KOMPOSE_VERSION=$3
 
-if [ "${PLATFORM}" == 'linux' ]; then
-  wget -O "dist/kompose" "https://github.com/kubernetes/kompose/releases/download/${KOMPOSE_VERSION}/kompose-${PLATFORM}-${ARCH}"
-  chmod +x "dist/kompose"
-elif [ "${PLATFORM}" == 'windows' ]; then
+if [ "${PLATFORM}" == 'windows' ]; then
   wget -O "dist/kompose.exe" "https://github.com/kubernetes/kompose/releases/download/${KOMPOSE_VERSION}/kompose-windows-amd64.exe"
   chmod +x "dist/kompose.exe"
+else
+  wget -O "dist/kompose" "https://github.com/kubernetes/kompose/releases/download/${KOMPOSE_VERSION}/kompose-${PLATFORM}-${ARCH}"
+  chmod +x "dist/kompose"
 fi
 
 exit 0
diff --git a/build/download_kubectl_binary.sh b/build/download_kubectl_binary.sh
index 4b9714244..3e4069613 100755
--- a/build/download_kubectl_binary.sh
+++ b/build/download_kubectl_binary.sh
@@ -4,12 +4,12 @@ PLATFORM=$1
 ARCH=$2
 KUBECTL_VERSION=$3
 
-if [ "${PLATFORM}" == 'linux' ]; then
-  wget -O "dist/kubectl" "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/${PLATFORM}/${ARCH}/kubectl"
-  chmod +x "dist/kubectl"
-elif [ "${PLATFORM}" == 'windows' ]; then
+if [ "${PLATFORM}" == 'windows' ]; then
   wget -O "dist/kubectl.exe" "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/windows/amd64/kubectl.exe"
   chmod +x "dist/kubectl.exe"
+else
+  wget -O "dist/kubectl" "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/${PLATFORM}/${ARCH}/kubectl"
+  chmod +x "dist/kubectl"
 fi
 
 exit 0
diff --git a/gruntfile.js b/gruntfile.js
index 1d5bef6af..9e624cddd 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -131,7 +131,7 @@ function shell_storybook(env) {
 
 function shell_build_binary(platform, arch) {
   const binfile = 'dist/portainer';
-  if (platform === 'linux') {
+  if (platform === 'linux' || platform === 'darwin') {
     return `
       if [ -f ${binfile} ]; then
         echo "Portainer binary exists";