diff --git a/.gitignore b/.gitignore
index 654b4b9..4f79380 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v3.1.120-SDK.tar.gz
+SOURCES/dotnet-v3.1.416-SDK.tar.gz
diff --git a/.rh-dotnet31-dotnet.metadata b/.rh-dotnet31-dotnet.metadata
index 2707c2c..a0612c3 100644
--- a/.rh-dotnet31-dotnet.metadata
+++ b/.rh-dotnet31-dotnet.metadata
@@ -1 +1 @@
-ebc730cfb8f37957b9dc0153ece3fad137cc3168 SOURCES/dotnet-v3.1.120-SDK.tar.gz
+398cbf94a5494cc7b963b4e8679cbad0344cca6b SOURCES/dotnet-v3.1.416-SDK.tar.gz
diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec
index 1ff52c0..c3310c0 100644
--- a/SPECS/dotnet.spec
+++ b/SPECS/dotnet.spec
@@ -28,15 +28,15 @@
 %endif
 %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
 
-%global host_version 3.1.20
-%global runtime_version 3.1.20
+%global host_version 3.1.22
+%global runtime_version 3.1.22
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 3.1.120
+%global sdk_version 3.1.416
 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
 
 %global host_rpm_version %{host_version}
-%global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version}
 %global runtime_rpm_version %{runtime_version}
+%global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version}
 %global sdk_rpm_version %{sdk_version}
 
 %if 0%{?fedora} || 0%{?rhel} < 8
@@ -57,7 +57,7 @@
 
 Name:           %{?scl_prefix}dotnet
 Version:        %{sdk_rpm_version}
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        .NET Core CLI tools and runtime
 License:        MIT and ASL 2.0 and BSD
 URL:            https://github.com/dotnet/
@@ -285,7 +285,11 @@ These are not meant for general use.
 
 
 %prep
+%if %{with bootstrap}
+%setup T -b0 -q -n dotnet-v%{sdk_version}-SDK-x64-bootstrap
+%else
 %setup -q -n dotnet-v%{sdk_version}-SDK
+%endif
 
 %if %{without bootstrap}
 # Remove all prebuilts
@@ -306,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/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp
+sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp
 
 # Disable warnings
 sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj
@@ -314,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/dotnet-corefx.*
+pushd src/corefx.*
 %patch100 -p1
 popd
 
-pushd src/dotnet-coreclr.*
+pushd src/coreclr.*
 popd
 
-pushd src/dotnet-core-setup.*
+pushd src/core-setup.*
 %patch300 -p1
 popd
 
-pushd src/dotnet-cli.*
+pushd src/cli.*
 %patch500 -p1
 popd
 
@@ -413,7 +417,7 @@ 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/dotnet-cli.*/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet
+install src/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
@@ -490,6 +494,19 @@ echo "Testing build results for debug symbols..."
 %{_libdir}/dotnet/source-built-artifacts
 
 %changelog
+* Mon Jan 24 2022 Omair Majid <omajid@redhat.com> - 3.1.416-3
+- Disable bootstrap
+- Resolves: RHBZ#2031427
+
+* Mon Jan 24 2022 Omair Majid <omajid@redhat.com> - 3.1.416-2
+- Update to new release of .NET SDK 3.1.416 and Runtime 3.1.22
+- Resolves: RHBZ#2031427
+
+* Thu Dec 16 2021 Omair Majid <omajid@redhat.com> - 3.1.416-1
+- Update to .NET SDK 3.1.416 and Runtime 3.1.22
+- Resolves: RHBZ#2031427
+- Resolves: RHBZ#1874528
+
 * Fri Oct 08 2021 Omair Majid <omajid@redhat.com> - 3.1.120-1
 - Update to .NET SDK 3.1.120 and Runtime 3.1.20
 - Resolves: RHBZ#2011819