diff --git a/Makefile b/Makefile
index fbe58b8ccd5a250fabf8ae9260138c9f6d80f29e..13e8a63b0323da31acac27213b8eaefa5f175e74 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ OPENVPN_WINDOWS_INSTALLER = https://build.openvpn.net/downloads/releases/OpenVPN
 ifeq ($(PLATFORM), linux)
 HAS_QTIFW :=
 else
-HAS_QTIFW := $(shell which binarycreator)
+HAS_QTIFW := $(shell command -v binarycreator)
 endif
 OPENVPN_BIN = "$(HOME)/openvpn_build/sbin/$(shell grep OPENVPN branding/thirdparty/openvpn/build_openvpn.sh | head -n 1 | cut -d = -f 2 | tr -d '"')"
 
diff --git a/gui/build.sh b/gui/build.sh
index 8bc22febdbea678fe449d60f5e63629efe81413d..ceacd1d11b7845452778093b8414c7a33ef837a7 100755
--- a/gui/build.sh
+++ b/gui/build.sh
@@ -13,7 +13,7 @@ LDFLAGS_VER="-X 0xacab.org/leap/bitmask-vpn/pkg/config/version.appVersion=${VERS
 
 OSX_TARGET=12
 WIN64="win64"
-GO=`which go`
+GO=`command -v go`
 
 PROJECT=bitmask.pro
 TARGET_GOLIB=lib/libgoshim.a