diff --git a/diagnostics.yml b/diagnostics.yml
index 9127a5f407..a3c2164984 100644
--- a/diagnostics.yml
+++ b/diagnostics.yml
@@ -173,7 +173,7 @@ stages:
 
     - template: /eng/build.yml
       parameters:
-        name: MacOS_cross
+        name: MacOS_arm64
         osGroup: MacOS_cross
         crossbuild: true
         buildAndSkipTest: true
@@ -191,7 +191,7 @@ stages:
     - ${{ if ne(variables['System.TeamProject'], 'public') }}:
       - template: /eng/build.yml
         parameters:
-          name: Linux_cross
+          name: Linux_arm
           osGroup: Linux
           dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-20210719121212-8a8d3be
           crossrootfsDir: '/crossrootfs/arm'
@@ -205,7 +205,7 @@ stages:
 
       - template: /eng/build.yml
         parameters:
-          name: Linux_cross64
+          name: Linux_arm64
           osGroup: Linux
           dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
           crossrootfsDir: '/crossrootfs/arm64'
@@ -219,7 +219,22 @@ stages:
 
       - template: /eng/build.yml
         parameters:
-          name: Alpine_cross64
+          name: Linux_musl_arm
+          osGroup: Linux
+          dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm-alpine-20210923140502-78f7860
+          crossrootfsDir: '/crossrootfs/arm'
+          artifactsTargetPath: bin/Linux-musl.arm.Release
+          buildAndSkipTest: true
+          strategy:
+            matrix:
+              Build_Release:
+                _BuildConfig: Release
+                _BuildArch: arm
+                _PublishArtifacts: bin/Linux.arm.Release
+
+      - template: /eng/build.yml
+        parameters:
+          name: Linux_musl_arm64
           osGroup: Linux
           dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20210923140502-78f7860
           crossrootfsDir: '/crossrootfs/arm64'
@@ -232,7 +247,6 @@ stages:
                 _BuildArch: arm64
                 _PublishArtifacts: bin/Linux.arm64.Release
 
-
       ############################
       #                          #
       #      Test only legs      #
@@ -316,10 +330,11 @@ stages:
             - CentOS_7
             - Alpine3_13
             - MacOS
-            - MacOS_cross
-            - Linux_cross
-            - Linux_cross64
-            - Alpine_cross64
+            - MacOS_arm64
+            - Linux_arm
+            - Linux_arm64
+            - Linux_musl_arm
+            - Linux_musl_arm64
             condition: succeeded()
             pool:
               name: NetCore1ESPool-Internal
diff --git a/src/dbgshim/pkg/microsoft.diagnostics.dbgshim.linux-musl-arm.proj b/src/dbgshim/pkg/microsoft.diagnostics.dbgshim.linux-musl-arm.proj
new file mode 100644
index 0000000000..89a1074b9b
--- /dev/null
+++ b/src/dbgshim/pkg/microsoft.diagnostics.dbgshim.linux-musl-arm.proj
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <PackageRID>linux-musl-arm</PackageRID>
+    <PackageArch>arm</PackageArch>
+  </PropertyGroup>
+  <Import Project="Microsoft.Diagnostics.DbgShim.props" />
+</Project>
diff --git a/src/sos-packaging.props b/src/sos-packaging.props
index 9ad7d04685..7ca956b59d 100644
--- a/src/sos-packaging.props
+++ b/src/sos-packaging.props
@@ -40,6 +40,10 @@
     <SosRequiredBinaries Include="$(ArtifactsBinDir)\Linux-musl.arm64.$(Configuration)\libsos.so" TargetRid="linux-musl-arm64" />
     <SosRequiredBinaries Include="$(ArtifactsBinDir)\Linux-musl.arm64.$(Configuration)\sosdocsunix.txt" TargetRid="linux-musl-arm64" />
 
+    <SosRequiredBinaries Include="$(ArtifactsBinDir)\Linux-musl.arm.$(Configuration)\libsosplugin.so" TargetRid="linux-musl-arm" />
+    <SosRequiredBinaries Include="$(ArtifactsBinDir)\Linux-musl.arm.$(Configuration)\libsos.so" TargetRid="linux-musl-arm" />
+    <SosRequiredBinaries Include="$(ArtifactsBinDir)\Linux-musl.arm.$(Configuration)\sosdocsunix.txt" TargetRid="linux-musl-arm" />
+
     <SosRequiredBinaries Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsosplugin.dylib" TargetRid="osx-x64" />
     <SosRequiredBinaries Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\libsos.dylib" TargetRid="osx-x64" />
     <SosRequiredBinaries Include="$(ArtifactsBinDir)\OSX.x64.$(Configuration)\sosdocsunix.txt" TargetRid="osx-x64" />