diff --git a/build/scripts/build-client-binary b/build/scripts/build-client-binary
index 53cb44a8b0..8fdacdd3d8 100755
--- a/build/scripts/build-client-binary
+++ b/build/scripts/build-client-binary
@@ -27,6 +27,10 @@ gobuild_component() {
     local archive=$(ls ${source_dir} | grep -e "${parent_component}-\w*\.tar\.gz" | head -n1)
     local build_command
 
+    if [ "$(uname -o)" = "Darwin" ]; then
+      local GOARCH=$(uname -m)
+    fi
+
     if [ -d "${root_dir}/go-build" ]; then
         volume_mounts+=" -v ${root_dir}/go-build:/home/builder/.cache/go-build"
     fi
diff --git a/build/scripts/build-client-rpm b/build/scripts/build-client-rpm
index 6ec65cc016..517993a868 100755
--- a/build/scripts/build-client-rpm
+++ b/build/scripts/build-client-rpm
@@ -25,14 +25,13 @@ main() {
 
         export pmm_version=$pmm_version
         export pmm_release=$pmm_release
-        export sudo_path=\$$(command -v sudo)
         mkdir -p /tmp/pmm
         cd /home/builder/results
         /home/builder/bin/build-client-packages \
             --builddir=/tmp/pmm \
             --build_rpm=1
 
-        \$sudo_path chown -R $(id -u):$(id -g) /home/builder/results/rpm
+        sudo_path chown -R $(id -u):$(id -g) /home/builder/results/rpm
     "
 }