diff --git a/testing/dotnet5-build/APKBUILD b/testing/dotnet5-build/APKBUILD
index 384ed2865a5dfdc1a994e5122dafaa8e79c4bcca..fe991b84215dfadfdefa278a4d96cc0c715917f8 100644
--- a/testing/dotnet5-build/APKBUILD
+++ b/testing/dotnet5-build/APKBUILD
@@ -8,7 +8,7 @@
 #
 
 pkgname=dotnet5-build
-pkgver=5.0.211
+pkgver=5.0.212
 pkgrel=0
 
 # Tag of tarball generator. This may change from usual due to mistakes from upstream
@@ -24,9 +24,6 @@ _sbrptag=6ce5818b1c1828ccdc8ac63d460d029c6391a401
 # version to establish that we are moving away from upstream
 _bootstrapver=5.0.211-r0
 
-# LLVM version to be used for this build
-_llvmver=12
-
 # Patches to be used. String before '_' refers to repo to patch
 # Look for patch notes within each patch for what they fix / where they come from
 # build_* patches applies directly to $builddir
@@ -38,6 +35,8 @@ _patches="
 	references_sh-build-fix.patch
 	roslyn_added-previously-built-artifacts-repo.patch
 	runtime_add-rid-for-alpine-315.patch
+	runtime_add-rid-for-alpine-316.patch
+	runtime_clang13-support.patch
 	runtime_use-latest-microsoftnetcoreplatformspackage.patch
 	runtime_link-order.patch
 	runtime_non-portable-distrorid-fix-alpine.patch
@@ -84,7 +83,8 @@ makedepends="
 	libxml2-utils
 	linux-headers
 	lldb-dev
-	llvm$_llvmver-dev
+	llvm
+	llvm-dev
 	lttng-ust-dev
 	nodejs
 	openssl-dev
@@ -333,7 +333,7 @@ artifacts() {
 }
 
 sha512sums="
-e4866c779d7a67ae934d80216af2623914dc5c2b64682171be004a429120e5aa31122bef9efe9b728abc1df68e953c6bd6646d9490925cc576371880c8a88fc5  source-build-v5.0.211-SDK.tar.gz
+65b69574419bba947bf2a91ac833e092c9d0f117afb2d72e88b26f8a937a669e996e83406e2939da9f0dd28a6508ac64c6c6e05083dc9a5411dd50397e582ff1  source-build-v5.0.212-SDK.tar.gz
 4d15c4a62342c6186053a5d9391567e0ee2c916382a1c81d6a8aff0dc0092f7889d49d7d5b357abda85d4c709d9599726bba8c2593236360b0373c35e3261208  source-build-reference-packages-6ce5818b1c1828ccdc8ac63d460d029c6391a401.tar.gz
 fb1cffcacba8cf6439c05781442167905b8147d36665aef8df4fc7a573c26fa3dd0f1ed2ec680039715d25d73646c3633f5ad9f658f6e9ec85f6850efec87935  application-insights_fix-net40-location.patch
 d77500c50ce9a9ce35281d54a1f6d9c00e1ca391567f1a05f3b0509aa6212353f48c2163fc277103930ee21ee143304997c55522fdf8e3de83d0ea9d7e2a6b13  build_darc-fix-alpine.patch
@@ -342,6 +342,8 @@ d77500c50ce9a9ce35281d54a1f6d9c00e1ca391567f1a05f3b0509aa6212353f48c2163fc277103
 8acf2f6df8310eee7a786715b304100247cfbaebae17c51449b0c81085763e5babd17774f995668f487107ebd5ac7a1cda77ebc8b91409c88725fcf63581d1ce  references_sh-build-fix.patch
 72ee7064fb9042d4c37ca22c1fe8cd5c393db51086279db3c965142ac8367f6b34b3e6f7d1f36269d945d65587cd0cda068fa0f5e94a203a2383db530f805964  roslyn_added-previously-built-artifacts-repo.patch
 70ca8f5177f9ef3b40c9d0ad0d527877a4179e61db7e4e90e69fb7a0ed214034b6a963ff1fd93dca197ef1b9ea03ca1fa85f84dea685d6f02589a88f84aa732d  runtime_add-rid-for-alpine-315.patch
+1413019d1950498ac7921c974a719a89aca18fd1faa3fd2e95c5213d6618a3ea49660571364cfba73084ceaf13c7a3923a7b340a489945e14c26107ac403f4c8  runtime_add-rid-for-alpine-316.patch
+8ffdf2a36bb4cd2588fbb4a0aad0fafb4584f2d645e4e21012a44b1f4e3521ea037b42377abc6911f78aa8b3cb5b07e212982532f8552e263fdb20efebbfe768  runtime_clang13-support.patch
 8cb8e38fb0d4bfc10b3a214ed2deabbcabaef85cbe2f2ad02cac9589a3e9a613116ef79e38122474fd5c3d6d1a24a2f7efe8f5c61855bb386e90198388bfcd4d  runtime_use-latest-microsoftnetcoreplatformspackage.patch
 619ebecf68bac7bd4ecf68effe31e84d1d338f3b850bc49288b957a5528fe3ed27ed844032f99c2c337c3ed214d1163db81923507100e6ec5f78af502dd610e1  runtime_link-order.patch
 4a480d9502ad9d8c0c9a11879de29f181c2f7eff2e88ef7bd61611dc62ac23fbff9cf904b59186a05d4f5bb7a48d74aae4e09105f16d85a7a95082e2a9af2dd0  runtime_non-portable-distrorid-fix-alpine.patch
diff --git a/testing/dotnet5-build/runtime_add-rid-for-alpine-316.patch b/testing/dotnet5-build/runtime_add-rid-for-alpine-316.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0b8d0e8d85f471d8dc587d743e9dab4fc0d75e53
--- /dev/null
+++ b/testing/dotnet5-build/runtime_add-rid-for-alpine-316.patch
@@ -0,0 +1,208 @@
+From 5434d275bbf5ba8f8a61b4c0dfbb2033ded63b06 Mon Sep 17 00:00:00 2001
+From: Antoine Martin <dev@ayakael.net>
+Date: Tue, 29 Mar 2022 14:19:37 +0000
+Subject: [PATCH 1/1] add alpine 3.16 rid
+
+Adds RID for Alpine 3.16
+
+---
+ .../runtime.compatibility.json                |  123 +-
+ .../Microsoft.NETCore.Platforms/runtime.json  |   25 +-
+ .../runtimeGroups.props                       |    2 +-
+ 5 files changed, 147 insertions(+), 7491 deletions(-)
+
+diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+index 6ff9cdd2cae..9a1057f5396 100644
+--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
++++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+@@ -622,6 +622,127 @@
+     "any",
+     "base"
+   ],
++  "alpine.3.16": [
++    "alpine.3.16",
++    "alpine.3.15",
++    "alpine.3.14",
++    "alpine.3.13",
++    "alpine.3.12",
++    "alpine.3.11",
++    "alpine.3.10",
++    "alpine.3.9",
++    "alpine.3.8",
++    "alpine.3.7",
++    "alpine.3.6",
++    "alpine",
++    "linux-musl",
++    "linux",
++    "unix",
++    "any",
++    "base"
++  ],
++  "alpine.3.16-arm": [
++    "alpine.3.16-arm",
++    "alpine.3.16",
++    "alpine.3.15-arm",
++    "alpine.3.15",
++    "alpine.3.14-arm",
++    "alpine.3.14",
++    "alpine.3.13-arm",
++    "alpine.3.13",
++    "alpine.3.12-arm",
++    "alpine.3.12",
++    "alpine.3.11-arm",
++    "alpine.3.11",
++    "alpine.3.10-arm",
++    "alpine.3.10",
++    "alpine.3.9-arm",
++    "alpine.3.9",
++    "alpine.3.8-arm",
++    "alpine.3.8",
++    "alpine.3.7-arm",
++    "alpine.3.7",
++    "alpine.3.6-arm",
++    "alpine.3.6",
++    "alpine-arm",
++    "alpine",
++    "linux-musl-arm",
++    "linux-musl",
++    "linux-arm",
++    "linux",
++    "unix-arm",
++    "unix",
++    "any",
++    "base"
++  ],
++  "alpine.3.16-arm64": [
++    "alpine.3.16-arm64",
++    "alpine.3.16",
++    "alpine.3.15-arm64",
++    "alpine.3.15",
++    "alpine.3.14-arm64",
++    "alpine.3.14",
++    "alpine.3.13-arm64",
++    "alpine.3.13",
++    "alpine.3.12-arm64",
++    "alpine.3.12",
++    "alpine.3.11-arm64",
++    "alpine.3.11",
++    "alpine.3.10-arm64",
++    "alpine.3.10",
++    "alpine.3.9-arm64",
++    "alpine.3.9",
++    "alpine.3.8-arm64",
++    "alpine.3.8",
++    "alpine.3.7-arm64",
++    "alpine.3.7",
++    "alpine.3.6-arm64",
++    "alpine.3.6",
++    "alpine-arm64",
++    "alpine",
++    "linux-musl-arm64",
++    "linux-musl",
++    "linux-arm64",
++    "linux",
++    "unix-arm64",
++    "unix",
++    "any",
++    "base"
++  ],
++  "alpine.3.16-x64": [
++    "alpine.3.16-x64",
++    "alpine.3.16",
++    "alpine.3.15-x64",
++    "alpine.3.15",
++    "alpine.3.14-x64",
++    "alpine.3.14",
++    "alpine.3.13-x64",
++    "alpine.3.13",
++    "alpine.3.12-x64",
++    "alpine.3.12",
++    "alpine.3.11-x64",
++    "alpine.3.11",
++    "alpine.3.10-x64",
++    "alpine.3.10",
++    "alpine.3.9-x64",
++    "alpine.3.9",
++    "alpine.3.8-x64",
++    "alpine.3.8",
++    "alpine.3.7-x64",
++    "alpine.3.7",
++    "alpine.3.6-x64",
++    "alpine.3.6",
++    "alpine-x64",
++    "alpine",
++    "linux-musl-x64",
++    "linux-musl",
++    "linux-x64",
++    "linux",
++    "unix-x64",
++    "unix",
++    "any",
++    "base"
++  ],
+   "alpine.3.6": [
+     "alpine.3.6",
+     "alpine",
+@@ -7353,4 +7474,4 @@
+     "any",
+     "base"
+   ]
+-}
+\ No newline at end of file
++}
+diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+index a663a88166e..d1f8c5270f7 100644
+--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
++++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+@@ -161,6 +161,29 @@
+         "alpine.3.14-x64"
+       ]
+     },
++    "alpine.3.16": {
++      "#import": [
++        "alpine.3.15"
++      ]
++    },
++    "alpine.3.16-arm": {
++      "#import": [
++        "alpine.3.16",
++        "alpine.3.15-arm"
++      ]
++    },
++    "alpine.3.16-arm64": {
++      "#import": [
++        "alpine.3.16",
++        "alpine.3.15-arm64"
++      ]
++    },
++    "alpine.3.16-x64": {
++      "#import": [
++        "alpine.3.16",
++        "alpine.3.15-x64"
++      ]
++    },
+     "alpine.3.6": {
+       "#import": [
+         "alpine"
+@@ -3219,4 +3242,4 @@
+       ]
+     }
+   }
+-}
+\ No newline at end of file
++}
+diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+index c7a346d1672..45e189bcee4 100644
+--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
++++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+@@ -16,7 +16,7 @@
+     <RuntimeGroup Include="alpine">
+       <Parent>linux-musl</Parent>
+       <Architectures>x64;arm;arm64</Architectures>
+-      <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14;3.15</Versions>
++      <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14;3.15;3.16</Versions>
+     </RuntimeGroup>
+ 
+     <RuntimeGroup Include="android">
+2.35.1
+
diff --git a/testing/dotnet5-build/runtime_clang13-support.patch b/testing/dotnet5-build/runtime_clang13-support.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0164b9adee921a3999df7fcde8b668687ed710c0
--- /dev/null
+++ b/testing/dotnet5-build/runtime_clang13-support.patch
@@ -0,0 +1,79 @@
+From a89c562f9389fdc2bb1356d3da782d0063951e14 Mon Sep 17 00:00:00 2001
+Patch-Source: https://github.com/dotnet/runtime/pull/62170 
+From: Jan Vorlicek <jan.vorlicek@volny.cz>
+Date: Tue, 30 Nov 2021 10:55:21 +0100
+Subject: [PATCH] Fix clang 13 induced runtime issues (#62170)
+ 
+The clang 13 optimizer started to assume that "this" pointer is always
+properly aligned. That lead to elimination of some code that was actually
+needed.
+It also takes pointer aliasing rules more strictly in one place in jit.
+That caused the optimizer to falsely assume that a callee with an argument
+passed by reference is not modifying that argument and used a stale
+copy of the original value at the caller site.
+ 
+This change fixes both of the issues. With this fix, runtime compiled
+using clang 13 seems to be fully functional.
+---
+ src/coreclr/src/inc/corhlpr.h           | 8 ++++----
+ src/coreclr/src/jit/bitsetasshortlong.h | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+ 
+diff --git a/src/coreclr/src/inc/corhlpr.h b/src/coreclr/src/inc/corhlpr.h
+index 450514da95c..427e8cdc0ff 100644
+--- a/src/coreclr/src/inc/corhlpr.h
++++ b/src/coreclr/src/inc/corhlpr.h
+@@ -336,7 +336,7 @@ struct COR_ILMETHOD_SECT
+     const COR_ILMETHOD_SECT* Next() const
+     {
+         if (!More()) return(0);
+-        return ((COR_ILMETHOD_SECT*)(((BYTE *)this) + DataSize()))->Align();
++        return ((COR_ILMETHOD_SECT*)Align(((BYTE *)this) + DataSize()));
+     }
+ 
+     const BYTE* Data() const
+@@ -374,9 +374,9 @@ struct COR_ILMETHOD_SECT
+         return((AsSmall()->Kind & CorILMethod_Sect_FatFormat) != 0);
+     }
+ 
+-    const COR_ILMETHOD_SECT* Align() const
++    static const void* Align(const void* p)
+     {
+-        return((COR_ILMETHOD_SECT*) ((((UINT_PTR) this) + 3) & ~3));
++        return((void*) ((((UINT_PTR) p) + 3) & ~3));
+     }
+ 
+ protected:
+@@ -579,7 +579,7 @@ typedef struct tagCOR_ILMETHOD_FAT : IMAGE_COR_ILMETHOD_FAT
+ 
+     const COR_ILMETHOD_SECT* GetSect() const {
+         if (!More()) return (0);
+-        return(((COR_ILMETHOD_SECT*) (GetCode() + GetCodeSize()))->Align());
++        return(((COR_ILMETHOD_SECT*) COR_ILMETHOD_SECT::Align(GetCode() + GetCodeSize())));
+     }
+ } COR_ILMETHOD_FAT;
+ 
+diff --git a/src/coreclr/src/jit/bitsetasshortlong.h b/src/coreclr/src/jit/bitsetasshortlong.h
+index 078cdc810e9..4c52819853f 100644
+--- a/src/coreclr/src/jit/bitsetasshortlong.h
++++ b/src/coreclr/src/jit/bitsetasshortlong.h
+@@ -345,7 +345,7 @@ public:
+     {
+         if (IsShort(env))
+         {
+-            (size_t&)out = (size_t)out & ((size_t)gen | (size_t)in);
++            out = (BitSetShortLongRep)((size_t)out & ((size_t)gen | (size_t)in));
+         }
+         else
+         {
+@@ -361,7 +361,7 @@ public:
+     {
+         if (IsShort(env))
+         {
+-            (size_t&)in = (size_t)use | ((size_t)out & ~(size_t)def);
++            in = (BitSetShortLongRep)((size_t)use | ((size_t)out & ~(size_t)def));
+         }
+         else
+         {
+-- 
+2.33.1
diff --git a/testing/dotnet5-runtime/APKBUILD b/testing/dotnet5-runtime/APKBUILD
index 6f99c82f93206701893027b8dd33594ad83922b4..e228f364a21fc8bd057e057492a17f6ffd07c8af 100644
--- a/testing/dotnet5-runtime/APKBUILD
+++ b/testing/dotnet5-runtime/APKBUILD
@@ -8,9 +8,9 @@
 #
 
 pkgname=dotnet5-runtime
-pkgver=5.0.14
-_bldver=5.0.211-r0
-pkgrel=1
+pkgver=5.0.15
+_bldver=5.0.212-r0
+pkgrel=0
 
 # Following for dotnet build version 5.0 and under
 _pkgver_macro=${pkgver%.*}
diff --git a/testing/dotnet5-sdk/APKBUILD b/testing/dotnet5-sdk/APKBUILD
index 3bf677251653d3c2fce02f766f49a185c96f6a0c..bd61ec2182960df49c86ffb4969b1bf2b02a967f 100644
--- a/testing/dotnet5-sdk/APKBUILD
+++ b/testing/dotnet5-sdk/APKBUILD
@@ -8,9 +8,9 @@
 #
 
 pkgname=dotnet5-sdk
-pkgver=5.0.211
+pkgver=5.0.212
 _bldver=$pkgver-r0
-pkgrel=1
+pkgrel=0
 
 # Following for dotnet build version 5.0 and under
 _pkgver_macro=${pkgver%.*}