diff --git a/.gitignore b/.gitignore
index 4f79380..f753834 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v3.1.416-SDK.tar.gz
+SOURCES/dotnet-v3.1.417-SDK.tar.gz
diff --git a/.rh-dotnet31-dotnet.metadata b/.rh-dotnet31-dotnet.metadata
index a0612c3..2b88228 100644
--- a/.rh-dotnet31-dotnet.metadata
+++ b/.rh-dotnet31-dotnet.metadata
@@ -1 +1 @@
-398cbf94a5494cc7b963b4e8679cbad0344cca6b SOURCES/dotnet-v3.1.416-SDK.tar.gz
+f43d93d88acb1eadc593ca0ef041a87566c69920 SOURCES/dotnet-v3.1.417-SDK.tar.gz
diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec
index c3310c0..bf1b0ba 100644
--- a/SPECS/dotnet.spec
+++ b/SPECS/dotnet.spec
@@ -28,10 +28,10 @@
 %endif
 %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
 
-%global host_version 3.1.22
-%global runtime_version 3.1.22
+%global host_version 3.1.23
+%global runtime_version 3.1.23
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 3.1.416
+%global sdk_version 3.1.417
 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
 
 %global host_rpm_version %{host_version}
@@ -57,7 +57,7 @@
 
 Name:           %{?scl_prefix}dotnet
 Version:        %{sdk_rpm_version}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        .NET Core CLI tools and runtime
 License:        MIT and ASL 2.0 and BSD
 URL:            https://github.com/dotnet/
@@ -310,7 +310,7 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages
 
 
 # Fix bad hardcoded path in build
-sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp
+sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp
 
 # Disable warnings
 sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj
@@ -318,18 +318,18 @@ sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj
 # This patch was added when building the tarball; we use a better version
 rm -f patches/corefx/build-corefx-werror.patch
 
-pushd src/corefx.*
+pushd src/dotnet-corefx.*
 %patch100 -p1
 popd
 
-pushd src/coreclr.*
+pushd src/dotnet-coreclr.*
 popd
 
-pushd src/core-setup.*
+pushd src/dotnet-core-setup.*
 %patch300 -p1
 popd
 
-pushd src/cli.*
+pushd src/dotnet-cli.*
 %patch500 -p1
 popd
 
@@ -417,11 +417,11 @@ install %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/
 
 install -dm 0755 %{buildroot}/%{_root_datadir}/bash-completion/completions
 # dynamic completion needs the file to be named the same as the base command
-install src/cli.*/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet
+install src/dotnet-cli.*/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet
 
 # TODO: the zsh completion script needs to be ported to use #compdef
 #install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions
-#install src/cli.*/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet
+#install src/dotnet-cli.*/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet
 
 install -dm 0755 %{buildroot}%{_bindir}
 ln -s ../../../../../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/
@@ -494,6 +494,10 @@ echo "Testing build results for debug symbols..."
 %{_libdir}/dotnet/source-built-artifacts
 
 %changelog
+* Fri Mar 04 2022 Omair Majid <omajid@redhat.com> - 3.1.417-1
+- Update to .NET SDK 3.1.417 and Runtime 3.1.23
+- Resolves: RHBZ#2060565
+
 * Mon Jan 24 2022 Omair Majid <omajid@redhat.com> - 3.1.416-3
 - Disable bootstrap
 - Resolves: RHBZ#2031427