diff --git a/images/macos/scripts/build/install-ruby.sh b/images/macos/scripts/build/install-ruby.sh
index 413e89349..0f81a35e9 100644
--- a/images/macos/scripts/build/install-ruby.sh
+++ b/images/macos/scripts/build/install-ruby.sh
@@ -8,49 +8,49 @@ source ~/utils/utils.sh
 
 arch=$(get_arch)
 DEFAULT_RUBY_VERSION=$(get_toolset_value '.ruby.default')
+RUBY_PATH=$AGENT_TOOLSDIRECTORY/Ruby
+TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .arch.'$arch'.versions[]')
+
 echo "Installing Ruby..."
 brew_smart_install "ruby@${DEFAULT_RUBY_VERSION}"
+
+echo "Set Ruby ${DEFAULT_RUBY_VERSION} as default"
 if [[ $arch == "arm64" ]]; then
     export PATH=/opt/homebrew/opt/ruby@${DEFAULT_RUBY_VERSION}/bin:$PATH
-    ruby_suffix="macos-13-arm64"
 else
     export PATH=/usr/local/opt/ruby@${DEFAULT_RUBY_VERSION}/bin:$PATH
-    ruby_suffix="macos-latest"
 fi
 
+echo "Setting up gem environment"
 GEM_PATH=$(gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}')
 echo "GEM_PATH=$GEM_PATH" >> $HOME/.bashrc
+
 if [[ $arch == "arm64" ]]; then
     echo 'export PATH="$GEM_PATH:/opt/homebrew/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"'  >> $HOME/.bashrc
 else
     echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"'  >> $HOME/.bashrc
 fi
 
-echo "Install Ruby from toolset..."
-[ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}")
-PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -fsSL "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name')
-TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .arch.'$arch'.versions[]')
-RUBY_PATH=$AGENT_TOOLSDIRECTORY/Ruby
-
-echo "Check if Ruby hostedtoolcache folder exists..."
+echo "Check if Ruby hostedtoolcache folder exists"
 if [[ ! -d $RUBY_PATH ]]; then
-    mkdir -p $RUBY_PATH
+    mkdir -p "$RUBY_PATH"
 fi
-echo "ruby path - $RUBY_PATH"
 
 for toolset_version in ${TOOLSET_VERSIONS[@]}; do
-    package_tar_name=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${toolset_version}-${ruby_suffix}.tar.gz$" | egrep -v "rc|preview" | sort -V | tail -1)
+    echo "Installing Ruby version: $toolset_version..."
+    download_url=$(resolve_github_release_asset_url "ruby/ruby-builder" "contains(\"darwin-$arch.tar.gz\")" "ruby-$toolset_version" "$API_PAT")
+    package_tar_name="${download_url##*/}"
     ruby_version=$(echo "$package_tar_name" | cut -d'-' -f 2)
     ruby_version_path="$RUBY_PATH/$ruby_version"
 
-    echo "Create Ruby $ruby_version directory..."
-    mkdir -p $ruby_version_path
+    echo "Create Ruby $ruby_version directory"
+    mkdir -p "$ruby_version_path"
 
     echo "Downloading tar archive $package_tar_name"
-    archive_path=$(download_with_retry "https://github.com/ruby/ruby-builder/releases/download/toolcache/${package_tar_name}")
+    archive_path=$(download_with_retry "$download_url")
 
     echo "Expand $package_tar_name to the $ruby_version_path folder"
-    tar xf $archive_path -C $ruby_version_path
+    tar xf "$archive_path" -C "$ruby_version_path"
     complete_file_path=$ruby_version_path/$arch.complete
     if [[ ! -f $complete_file_path ]]; then
         echo "Create complete file"