diff --git a/.gitignore b/.gitignore
index 0cb2c3b..650311f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,5 @@
 /dotnet-8.0.14.tar.gz.sig
 /dotnet-8.0.15.tar.gz
 /dotnet-8.0.15.tar.gz.sig
+/dotnet-8.0.16.tar.gz
+/dotnet-8.0.16.tar.gz.sig
diff --git a/dotnet8.0.spec b/dotnet8.0.spec
index 19dcd5e..6bc5b01 100644
--- a/dotnet8.0.spec
+++ b/dotnet8.0.spec
@@ -12,10 +12,10 @@
 # dotnet-host and netstandard-targeting-pack-2.1
 %global is_latest_dotnet 0
 
-%global host_version 8.0.15
-%global runtime_version 8.0.15
+%global host_version 8.0.16
+%global runtime_version 8.0.16
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 8.0.115
+%global sdk_version 8.0.116
 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
 %global templates_version %{runtime_version}
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@@ -539,7 +539,36 @@ export EXTRA_LDFLAGS="$LDFLAGS"
 # suggested compile-time change doesn't work, unfortunately.
 export COMPlus_LTTng=0
 
-VERBOSE=1 ./build.sh \
+%ifarch ppc64le s390x
+max_attempts=3
+%else
+max_attempts=1
+%endif
+
+function retry_until_success {
+    local exit_code=1
+    local tries=$1
+    shift
+    set +e
+    while [[ $exit_code != 0 ]] && [[ $tries != 0 ]]; do
+        (( tries = tries - 1 ))
+        "$@"
+        exit_code=$?
+    done
+    set -e
+    return $exit_code
+}
+
+
+cat >dotnet-rpm-build.sh <<EOF
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+find -depth -name 'artifacts' -type d -print -exec rm -rf {} \;
+
+./build.sh \
 %if %{without bootstrap}
     --with-sdk previously-built-dotnet \
 %endif
@@ -551,7 +580,14 @@ VERBOSE=1 ./build.sh \
     /p:MinimalConsoleLogOutput=false \
     /p:ContinueOnPrebuiltBaselineError=true \
     /v:n \
-    /p:LogVerbosity=n \
+    /p:LogVerbosity=n
+EOF
+
+chmod +x dotnet-rpm-build.sh
+
+VERBOSE=1 retry_until_success $max_attempts \
+    timeout 5h \
+    ./dotnet-rpm-build.sh
 
 
 sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE21} > dotnet.sh
@@ -739,6 +775,10 @@ export COMPlus_LTTng=0
 
 
 %changelog
+* Tue May 13 2025 Omair Majid <omajid@redhat.com> - 8.0.116-2
+- Update to .NET SDK 8.0.116 and Runtime 8.0.16
+- Resolves: RHEL-89445
+
 * Wed Apr 09 2025 Omair Majid <omajid@redhat.com> - 8.0.115-2
 - Update to .NET SDK 8.0.115 and Runtime 8.0.15
 - Resolves: RHEL-85276
diff --git a/release.json b/release.json
index 430124b..c89fc7b 100644
--- a/release.json
+++ b/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "8.0.15",
+  "release": "8.0.16",
   "channel": "8.0",
-  "tag": "v8.0.15",
-  "sdkVersion": "8.0.115",
-  "runtimeVersion": "8.0.15",
-  "aspNetCoreVersion": "8.0.15",
+  "tag": "v8.0.16",
+  "sdkVersion": "8.0.116",
+  "runtimeVersion": "8.0.16",
+  "aspNetCoreVersion": "8.0.16",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "4d246579080efa41c77ddfa9ec8e133d7cf52666"
+  "sourceVersion": "82276892487288f85142cb1641df2b05dc9b937e"
 }
diff --git a/sources b/sources
index bbfe0cd..42f84cb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (dotnet-8.0.15.tar.gz) = 8f4888d7b8433c30d01e22a15289626464c92817259cf914d60c589f15f3a680ae4b19f512ec552e05caa132774aed0b8f17e91a8442be74eabf5e161b145584
-SHA512 (dotnet-8.0.15.tar.gz.sig) = 21e08ef5fdc2aa265c178558c992c36810407d5c4349a291694a69e0167f53976879379492aeaec718644a6bf6cffef6026a1a72fd765f15f1ba0eb5b0c47b44
+SHA512 (dotnet-8.0.16.tar.gz) = 6e83def1b60e3bc4888f5a8702c9e6b5420a7ff7229009e8fb2b8697b9a2c7cd750896e69b23d1f803f3c44af8fd7b4fbcaaed4fbc9a82e3bf1818e3a59ec939
+SHA512 (dotnet-8.0.16.tar.gz.sig) = 25471c2835b468563c987b860fb0094b3752d74386c63f77d332aa1a85dd9e281c933dae06891bdaf2a187f265449daf528b22e641a0ead8046a5cfe5a8a07c2