diff --git a/.dotnet5.0.metadata b/.dotnet5.0.metadata
index 4c72127..8605702 100644
--- a/.dotnet5.0.metadata
+++ b/.dotnet5.0.metadata
@@ -1 +1 @@
-1c965a7ecefcf4745de02ad9d17de1fefb5f2165 SOURCES/dotnet-v5.0.202-SDK.tar.gz
+91830adf51334e34ee9b0c3c51526eb16a2fe8c7 SOURCES/dotnet-v5.0.204-SDK.tar.gz
diff --git a/.gitignore b/.gitignore
index 5b12c0e..807c33f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v5.0.202-SDK.tar.gz
+SOURCES/dotnet-v5.0.204-SDK.tar.gz
diff --git a/SPECS/dotnet5.0.spec b/SPECS/dotnet5.0.spec
index f9deb65..6ba4eb4 100644
--- a/SPECS/dotnet5.0.spec
+++ b/SPECS/dotnet5.0.spec
@@ -1,4 +1,4 @@
-%bcond_without bootstrap
+%bcond_with bootstrap
 
 # Avoid provides/requires from private libraries
 %global privlibs             libhostfxr
@@ -20,10 +20,10 @@
 # until that's done, disable LTO.  This has to happen before setting the flags below.
 %define _lto_cflags %{nil}
 
-%global host_version 5.0.5
-%global runtime_version 5.0.5
+%global host_version 5.0.7
+%global runtime_version 5.0.7
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 5.0.202
+%global sdk_version 5.0.204
 %global templates_version %{runtime_version}
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
 
@@ -56,7 +56,7 @@
 
 Name:           dotnet5.0
 Version:        %{sdk_rpm_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        .NET Runtime and SDK
 License:        MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
 URL:            https://github.com/dotnet/
@@ -82,7 +82,7 @@ BuildRequires:  cmake
 BuildRequires:  coreutils
 BuildRequires:  dotnet-sdk-5.0
 %if %{without bootstrap}
-BuildRequires:  dotnet-build-reference-packages
+BuildRequires:  dotnet5.0-build-reference-packages
 BuildRequires:  dotnet-sdk-5.0-source-built-artifacts
 %endif
 BuildRequires:  findutils
@@ -318,22 +318,21 @@ rm -rf packages/source-built
 %endif
 
 %if %{without bootstrap}
-sed -i -e 's|5.0.100-preview1-014459|5.0.103|' global.json
 mkdir -p packages/archive
 ln -s %{_libdir}/dotnet/source-built-artifacts/*.tar.gz packages/archive/
 ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages*.tar.gz packages/archive
 %endif
 
 # Fix bad hardcoded path in build
-sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-runtime.*/src/installer/corehost/cli/hostmisc/pal.unix.cpp
+sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime.*/src/installer/corehost/cli/hostmisc/pal.unix.cpp
 
 # Disable warnings
 sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props
 
-pushd src/dotnet-runtime.*
+pushd src/runtime.*
 popd
 
-pushd src/dotnet-sdk.*
+pushd src/sdk.*
 %patch500 -p1
 popd
 
@@ -442,7 +441,7 @@ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
 
 install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions
 # dynamic completion needs the file to be named the same as the base command
-install src/dotnet-sdk.*/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet
+install src/sdk.*/scripts/register-completions.bash %{buildroot}/%{_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
@@ -519,6 +518,15 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Fri Jun 11 2021 Omair Majid <omajid@redhat.com> - 5.0.204-1
+- Update to .NET SDK 5.0.204 and Runtime 5.0.7
+- Resolves: RHBZ#1966164
+- Resolves: RHBZ#1966996
+
+* Fri Jun 11 2021 Omair Majid <omajid@redhat.com> - 5.0.203-1
+- Update to .NET SDK 5.0.203 and Runtime 5.0.6
+- Resolves: RHBZ#1954327
+
 * Thu Apr 22 2021 Omair Majid <omajid@redhat.com> - 5.0.202-2
 - Update to .NET SDK 5.0.202 and Runtime 5.0.5
 - Create -source-built-artifacts subpackage