diff --git a/.dotnet3.1.metadata b/.dotnet3.1.metadata
index cdba9c6..f7e8002 100644
--- a/.dotnet3.1.metadata
+++ b/.dotnet3.1.metadata
@@ -1 +1 @@
-f32e4c0d50bd5566b4f85a5bfa953158d7c636f3 SOURCES/dotnet-v3.1.119-SDK.tar.gz
+c7b68fa84aebce86eda4642b4d0755b9cfb731f2 SOURCES/dotnet-v3.1.416-SDK-x64-bootstrap.tar.gz
diff --git a/.gitignore b/.gitignore
index 8814cd4..1c846d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v3.1.119-SDK.tar.gz
+SOURCES/dotnet-v3.1.416-SDK-x64-bootstrap.tar.gz
diff --git a/SPECS/dotnet3.1.spec b/SPECS/dotnet3.1.spec
index 12bca8c..f39aa24 100644
--- a/SPECS/dotnet3.1.spec
+++ b/SPECS/dotnet3.1.spec
@@ -1,4 +1,4 @@
-%bcond_with bootstrap
+%bcond_without bootstrap
 
 # Avoid provides/requires from private libraries
 %global privlibs             libhostfxr
@@ -25,10 +25,10 @@
 %endif
 %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
 
-%global host_version 3.1.19
-%global runtime_version 3.1.19
+%global host_version 3.1.22
+%global runtime_version 3.1.22
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 3.1.119
+%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}
@@ -61,14 +61,14 @@
 
 Name:           dotnet3.1
 Version:        %{sdk_rpm_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        .NET Core CLI tools and runtime
 License:        MIT and ASL 2.0 and BSD
 URL:            https://github.com/dotnet/
 
 # ./build-dotnet-tarball dotnet-v%%{sdk_version}-SDK
-Source0:        dotnet-v%{sdk_version}-SDK.tar.gz
-#Source1:        dotnet-v%%{sdk_version}-SDK-rhel.8-arm64.tar.gz
+#Source0:        dotnet-v%%{sdk_version}-SDK.tar.gz
+Source0:        dotnet-v%{sdk_version}-SDK-x64-bootstrap.tar.gz
 
 Source100:      check-debug-symbols.py
 Source101:      dotnet.sh.in
@@ -308,11 +308,17 @@ These are not meant for general use.
 
 
 %prep
+%if %{with bootstrap}
+
 %ifarch x86_64
-%setup T -b0 -q -n dotnet-v%{sdk_version}-SDK
+%setup T -b0 -q -n dotnet-v%{sdk_version}-SDK-%{runtime_arch}-bootstrap
 %endif
 %ifarch aarch64
-%setup T -b1 -q -n dotnet-v%{sdk_version}-SDK-rhel.8-arm64
+%setup T -b1 -q -n dotnet-v%{sdk_version}-SDK-%{runtime_arch}-bootstrap
+%endif
+
+%else
+%setup -q -n dotnet-v%{sdk_version}-SDK
 %endif
 
 %if %{without bootstrap}
@@ -333,28 +339,28 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages
 %endif
 
 # 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.common.props
 
 %patch1 -p1
 
-pushd src/corefx.*
+pushd src/dotnet-corefx.*
 %patch100 -p1
 %patch103 -p1
 popd
 
-pushd src/coreclr.*
+pushd src/dotnet-coreclr.*
 %patch200 -p1
 #%%patch201 -p1
 popd
 
-pushd src/core-setup.*
+pushd src/dotnet-core-setup.*
 %patch300 -p1
 popd
 
-pushd src/cli.*
+pushd src/dotnet-cli.*
 %patch500 -p1
 popd
 
@@ -501,6 +507,18 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
 %{_libdir}/dotnet/source-built-artifacts
 
 %changelog
+* Tue Dec 14 2021 Omair Majid <omajid@redhat.com> - 3.1.416-1
+- Update to .NET SDK 3.1.416 and Runtime 3.1.22
+- Resolves: RHBZ#2031429
+
+* Fri Oct 15 2021 Omair Majid <omajid@redhat.com> - 3.1.120-2
+- Rebuild to fix version
+- Resolves: RHBZ#2011820
+
+* Wed Oct 13 2021 Omair Majid <omajid@redhat.com> - 3.1.120-1
+- Update to .NET SDK 3.1.120 and Runtime 3.1.20
+- Resolves: RHBZ#2011820
+
 * Thu Sep 23 2021 Omair Majid <omajid@redhat.com> - 3.1.119-2
 - Update to .NET SDK 3.1.119 and Runtime 3.1.19
 - Resolves: RHBZ#2000313