diff --git a/.dotnet8.0.metadata b/.dotnet8.0.metadata
index 4ff4bca..0b00d94 100644
--- a/.dotnet8.0.metadata
+++ b/.dotnet8.0.metadata
@@ -1 +1 @@
-2c561f672d2f5bd7d63dfbf53c48b60286c87841 SOURCES/dotnet-8.0.16.tar.gz
+6e1d9638efcfcefa05fcc729a3bc30dd687d9b0a SOURCES/dotnet-8.0.17.tar.gz
diff --git a/.gitignore b/.gitignore
index b9b6f7e..7a8d536 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-8.0.16.tar.gz
+SOURCES/dotnet-8.0.17.tar.gz
diff --git a/SOURCES/dotnet-8.0.16.tar.gz.sig b/SOURCES/dotnet-8.0.16.tar.gz.sig
deleted file mode 100644
index 32bf69a..0000000
--- a/SOURCES/dotnet-8.0.16.tar.gz.sig
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: BSN Pgp v1.0.0.0
-
-iQIcBAABCAAGBQJoE75DAAoJEP2/U8JNtIcuzP4QALyyYakoAZaSihNWJK4nwJ+H
-JcNADrJNDxw1ugiGnNEDYPeS3wyFM5+f49AUlczYnQElU5J9mxFe0WqGgHw51NQH
-2Y4rG+1peC36s60q0GGQPMr6x4h+EktGx7paQIRDT/k5QE0XLWV1r+MISodEMw/J
-7SPOBT+1mQ/hzT8b8KNIa5oHWX34iyzgRZYC8Ui4zaUVSkBLwmAjl4TQN1mO8ydt
-kOaCffVbemBIGT4JJDnDhe44ddeS+hhzD3Po7jDHlhpHWKTkiRZ0zkSzuKFXkwy7
-RUJATaGV9nsmO1jCfupOb4rOv78hjZek8J0AJth3iODAqW6BdrUde2hiJ2QpXS6t
-BQc16bz/63N4TXUbSeo2KuRg6c4mHZj6Jth8Bcmuhm/xQHJLD/6iMdAoWmD9mct+
-h4EZ/kyTgpD59Ak/2jQGToc1coa2M+6dAXsYnTGCcln4EI4bqo79AuIu3R18dhhP
-KmBBs4coLSdCqpMesFwmAJUKnbziscs+usCFigu71Oxwxfz7/pRESQ9rXKfxbndO
-MJOcVecebYJlIFD6aQ7rH1id7B69Z/zY41IeNja6XuqOGvA57WHcnqPkq4wI7qvo
-Lef6ejym6Ba0ItOdLpf6y+1g4hYQCSLUhlPrSnkIj5Q4oFjcXIlegEf1xSohuqN+
-ESPQd2IZU+pXo3aFOXu7
-=ugQv
------END PGP SIGNATURE-----
diff --git a/SOURCES/dotnet-8.0.17.tar.gz.sig b/SOURCES/dotnet-8.0.17.tar.gz.sig
new file mode 100644
index 0000000..f2e8bf4
--- /dev/null
+++ b/SOURCES/dotnet-8.0.17.tar.gz.sig
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BSN Pgp v1.0.0.0
+
+iQIcBAABCAAGBQJoNzXGAAoJEP2/U8JNtIcuPnwP/2tN7QJGqFJ0jQNfM9DTT/rk
+w+ApNZYeic1kpZ+fg+Cz4DpQbiq9s7UsU565gTrWM+OuqnJHQ9r0Mw/6SPVN10kW
+ysyELe8ylSaGxkbM/EBOrUnp7hggU4uuLQ0uDMdC6h+MN/t6oaT32xrGUD78rhqc
+VuIPx4TsiX1Sp2HkpTvintsSFU4BiVG1aVUGwagxcJ22d0iQtLYS5dWV4bU8c9Xx
+V74cEJxo91snZyvGzMO9zMQcbD6N1mHLunUjrygPF9TOJNTqokm15s2ZuldR8ImY
+APah8zL0gcle8zYYp5kkjGwJ9MdlD/55G/R7lRY0XXGREX/eWxXDsIU9Bsk82rV9
+7l8DNRKuEakyCC/3PBqpDn7vhHczx8gowDwGDg1BXYGhe4wauz50IeSThuPNfXbJ
+QR1MoypR9MXeX5rKZh+ygzTrbHp7oQw910hRJxnJ3Dh8JmmIG17sxEIEKbUzen4a
+DBR4KaIupxucsevg+HAHNWhpWM1IfDOIMU4OEiY0F4mJnMjpY+1SxcojjGXtSDmd
+sUmsJ/YlNos6tuT9z3Uyd6VlkOOsvPABWNcZREEe0q+4fLc5f/U+qEfeihbe4pLJ
+zfUqNk4v7q8kWDirxginoEA3O64yjp3vacMJWwXhgHDTRY4SEVKeFVRMBYtISHnK
+Ur3NXirV2DJgWtXXGAu/
+=6PHS
+-----END PGP SIGNATURE-----
diff --git a/SOURCES/release.json b/SOURCES/release.json
index c89fc7b..a81d552 100644
--- a/SOURCES/release.json
+++ b/SOURCES/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "8.0.16",
+  "release": "8.0.17",
   "channel": "8.0",
-  "tag": "v8.0.16",
-  "sdkVersion": "8.0.116",
-  "runtimeVersion": "8.0.16",
-  "aspNetCoreVersion": "8.0.16",
+  "tag": "v8.0.17",
+  "sdkVersion": "8.0.117",
+  "runtimeVersion": "8.0.17",
+  "aspNetCoreVersion": "8.0.17",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "82276892487288f85142cb1641df2b05dc9b937e"
+  "sourceVersion": "30c331373e55effdf3c799bdec8751e6ee5367f6"
 }
diff --git a/SPECS/dotnet8.0.spec b/SPECS/dotnet8.0.spec
index 9951242..706b9fd 100644
--- a/SPECS/dotnet8.0.spec
+++ b/SPECS/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.16
-%global runtime_version 8.0.16
+%global host_version 8.0.17
+%global runtime_version 8.0.17
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 8.0.116
+%global sdk_version 8.0.117
 %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 }')
@@ -534,8 +534,36 @@ export EXTRA_LDFLAGS="$LDFLAGS"
 # suggested compile-time change doesn't work, unfortunately.
 export COMPlus_LTTng=0
 
-VERBOSE=1 timeout 5h \
-    ./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_dotnet}
     --with-sdk previously-built-dotnet \
 %endif
@@ -550,7 +578,15 @@ VERBOSE=1 timeout 5h \
     /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,7 +775,11 @@ export COMPlus_LTTng=0
 
 
 %changelog
-* Fri May 02 2025 Omair Majid <omajid@redhat.com> - 8.0.116-1
+* Thu May 29 2025 Omair Majid <omajid@redhat.com> - 8.0.117-1
+- Update to .NET SDK 8.0.117 and Runtime 8.0.17
+- Resolves: RHEL-94415
+
+* 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-89446