diff --git a/.anaconda.metadata b/.anaconda.metadata
index a081827..2110267 100644
--- a/.anaconda.metadata
+++ b/.anaconda.metadata
@@ -1 +1 @@
-2fb256468ee5d4010008998335e0454240ca82e2 SOURCES/anaconda-33.16.3.20.tar.bz2
+accdf5dccf7f3991b2332d31c3b281e88eae0b5a SOURCES/anaconda-33.16.3.21.tar.bz2
diff --git a/.gitignore b/.gitignore
index 032f08b..712f98c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/anaconda-33.16.3.20.tar.bz2
+SOURCES/anaconda-33.16.3.21.tar.bz2
diff --git a/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch b/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch
deleted file mode 100644
index 687f3a4..0000000
--- a/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4dd22c6aad986c49c313999332c3791d581a1e92 Mon Sep 17 00:00:00 2001
-From: Brian Stinson <bstinson@centosproject.org>
-Date: Thu, 25 Jun 2020 18:10:13 -0500
-Subject: [PATCH] Add product data for CentOS Stream
-
----
- data/product.d/centos-stream.conf                | 7 +++++++
- tests/nosetests/pyanaconda_tests/product_test.py | 4 ++++
- 2 files changed, 11 insertions(+)
- create mode 100644 data/product.d/centos-stream.conf
-
-diff --git a/data/product.d/centos-stream.conf b/data/product.d/centos-stream.conf
-new file mode 100644
-index 000000000..c65fcbbdf
---- /dev/null
-+++ b/data/product.d/centos-stream.conf
-@@ -0,0 +1,7 @@
-+# Anaconda configuration file for CentOS Stream.
-+
-+[Product]
-+product_name = CentOS Stream
-+
-+[Base Product]
-+product_name = CentOS Linux
-diff --git a/tests/nosetests/pyanaconda_tests/product_test.py b/tests/nosetests/pyanaconda_tests/product_test.py
-index f2203f431..5967141bc 100644
---- a/tests/nosetests/pyanaconda_tests/product_test.py
-+++ b/tests/nosetests/pyanaconda_tests/product_test.py
-@@ -118,6 +118,10 @@ class ProductConfigurationTestCase(unittest.TestCase):
-             "CentOS Linux", "",
-             ["rhel.conf", "centos.conf"]
-         )
-+        self._check_default_product(
-+            "CentOS Stream", "",
-+            ["rhel.conf", "centos.conf", "centos-stream.conf"]
-+        )
-         self._check_default_product(
-             "Red Hat Virtualization", "",
-             ["rhel.conf", "rhev.conf"]
--- 
-2.26.2
-
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 975d27c..3583bec 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -1,6 +1,6 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 33.16.3.20
+Version: 33.16.3.21
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -12,9 +12,6 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # make dist
 Source0: %{name}-%{version}.tar.bz2
 
-# https://github.com/rhinstaller/anaconda/pull/2689
-Patch104: 0001-Add-product-data-for-CentOS-Stream.patch
-
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
@@ -267,9 +264,6 @@ runtime on NFS/HTTP/FTP servers or local disks.
 %prep
 %autosetup -p 1
 
-# debranding
-sed -e 's/RHEL/CentOS/' -i po/*.po
-
 %build
 # use actual build-time release number, not tarball creation time release number
 %configure ANACONDA_RELEASE=%{release}
@@ -372,6 +366,14 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Mon Aug 24 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.21-1
+- Fix traceback when removing additional repository (jkonecny)
+  Resolves: rhbz#1871037
+- Do not mount as RW in Dracut (jkonecny)
+  Resolves: rhbz#1871049
+- Clean up s390 partitioning check (vslavik)
+  Resolves: rhbz#1855724
+
 * Thu Aug 20 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.20-1
 - network: do not try to activate connection that has not been found (rvykydal)
   Resolves: rhbz#1869323