diff --git a/samples/CSharpAvalonia/dev-scripts/build-linux.sh b/samples/CSharpAvalonia/dev-scripts/build-linux.sh
deleted file mode 100755
index 02216206..00000000
--- a/samples/CSharpAvalonia/dev-scripts/build-linux.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# Find the absolute path of the script
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# Check if version parameter is provided
-if [ "$#" -ne 1 ]; then
-    echo "Version number is required."
-    echo "Usage: ./build.sh [version]"
-    exit 1
-fi
-
-BUILD_VERSION="$1"
-RELEASE_DIR="$SCRIPT_DIR/../releases"
-PUBLISH_DIR="$SCRIPT_DIR/../publish"
-
-cd "$SCRIPT_DIR/../../.."
-
-echo ""
-echo "Building Velopack Rust"
-cargo build --target x86_64-unknown-linux-gnu
-cp target/x86_64-unknown-linux-gnu/debug/update target/debug/update
-
-echo ""
-echo "Building Velopack Vpk"
-dotnet build src/vpk/Velopack.Vpk/Velopack.Vpk.csproj
-
-cd "$SCRIPT_DIR/.."
-
-echo ""
-echo "Compiling VelopackCSharpAvalonia with dotnet..."
-dotnet publish -c Release --self-contained -r linux-x64 -o "$PUBLISH_DIR" -p:UseLocalVelopack=true
-
-echo ""
-echo "Building Velopack Release v$BUILD_VERSION"
-"$SCRIPT_DIR/../../../build/Debug/net8.0/vpk" pack -u VelopackCSharpAvalonia -v $BUILD_VERSION -o "$RELEASE_DIR" -p "$PUBLISH_DIR"
\ No newline at end of file
diff --git a/samples/CSharpAvalonia/dev-scripts/build-win.bat b/samples/CSharpAvalonia/dev-scripts/build.bat
similarity index 100%
rename from samples/CSharpAvalonia/dev-scripts/build-win.bat
rename to samples/CSharpAvalonia/dev-scripts/build.bat
diff --git a/samples/CSharpAvalonia/dev-scripts/build-osx.sh b/samples/CSharpAvalonia/dev-scripts/build.sh
old mode 100755
new mode 100644
similarity index 55%
rename from samples/CSharpAvalonia/dev-scripts/build-osx.sh
rename to samples/CSharpAvalonia/dev-scripts/build.sh
index 7cab7296..250db7b3
--- a/samples/CSharpAvalonia/dev-scripts/build-osx.sh
+++ b/samples/CSharpAvalonia/dev-scripts/build.sh
@@ -26,9 +26,34 @@ dotnet build src/vpk/Velopack.Vpk/Velopack.Vpk.csproj
 
 cd "$SCRIPT_DIR/.."
 
+# Determine the default RID for the platform
+RID=""
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    # macOS
+    ARCH=$(uname -m)
+    if [[ "$ARCH" == "x86_64" ]]; then
+        RID="osx-x64"
+    elif [[ "$ARCH" == "arm64" ]]; then
+        RID="osx-arm64"
+    fi
+elif [[ "$OSTYPE" == "linux"* ]]; then
+    # Linux
+    ARCH=$(uname -m)
+    if [[ "$ARCH" == "x86_64" ]]; then
+        RID="linux-x64"
+    elif [[ "$ARCH" == "aarch64" ]]; then
+        RID="linux-arm64"
+    fi
+else
+    echo "Unsupported OS type: $OSTYPE"
+    exit 1
+fi
+
+echo "Using RID: $RID"
+
 echo ""
 echo "Compiling VelopackCSharpAvalonia with dotnet..."
-dotnet publish -c Release --self-contained -r osx-x64 -o "$PUBLISH_DIR" -p:UseLocalVelopack=true
+dotnet publish -c Release --self-contained -r "$RID" -o "$PUBLISH_DIR" -p:UseLocalVelopack=true
 
 echo ""
 echo "Building Velopack Release v$BUILD_VERSION"