diff --git a/.anaconda.metadata b/.anaconda.metadata
index 706f43c..c779a9c 100644
--- a/.anaconda.metadata
+++ b/.anaconda.metadata
@@ -1 +1 @@
-ac88148a627674029887fd6e5a8a7c3d05985096 SOURCES/anaconda-33.16.3.26.tar.bz2
+e78dc24b54b77e6c2c11d4775fa8d09009152aa3 SOURCES/anaconda-33.16.4.15.tar.bz2
diff --git a/.gitignore b/.gitignore
index 13cf230..8724c7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/anaconda-33.16.3.26.tar.bz2
+SOURCES/anaconda-33.16.4.15.tar.bz2
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/0001-network-do-not-crash-on-infiniband-devices-activated.patch b/SOURCES/0001-network-do-not-crash-on-infiniband-devices-activated.patch
deleted file mode 100644
index 44909d4..0000000
--- a/SOURCES/0001-network-do-not-crash-on-infiniband-devices-activated.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5994e5ab09719656ca09a279e5b38f1ce3184d8d Mon Sep 17 00:00:00 2001
-From: Radek Vykydal <rvykydal@redhat.com>
-Date: Wed, 26 Aug 2020 09:52:24 +0200
-Subject: [PATCH] network: do not crash on infiniband devices activated in
- initramfs
-
-Resolves: rhbz#1890009
----
- pyanaconda/modules/network/initialization.py | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/pyanaconda/modules/network/initialization.py b/pyanaconda/modules/network/initialization.py
-index 5e33d0494..b27a46976 100644
---- a/pyanaconda/modules/network/initialization.py
-+++ b/pyanaconda/modules/network/initialization.py
-@@ -411,13 +411,14 @@ class DumpMissingIfcfgFilesTask(Task):
-         s_con.set_property(NM.SETTING_CONNECTION_ID, iface)
-         s_con.set_property(NM.SETTING_CONNECTION_INTERFACE_NAME, iface)
-         s_wired = con.get_setting_wired()
--        # By default connections are bound to interface name
--        s_wired.set_property(NM.SETTING_WIRED_MAC_ADDRESS, None)
--        bound_mac = bound_hwaddr_of_device(self._nm_client, iface, self._ifname_option_values)
--        if bound_mac:
--            s_wired.set_property(NM.SETTING_WIRED_MAC_ADDRESS, bound_mac)
--            log.debug("%s: iface %s bound to mac address %s by ifname boot option",
--                      self.name, iface, bound_mac)
-+        if s_wired:
-+            # By default connections are bound to interface name
-+            s_wired.set_property(NM.SETTING_WIRED_MAC_ADDRESS, None)
-+            bound_mac = bound_hwaddr_of_device(self._nm_client, iface, self._ifname_option_values)
-+            if bound_mac:
-+                s_wired.set_property(NM.SETTING_WIRED_MAC_ADDRESS, bound_mac)
-+                log.debug("%s: iface %s bound to mac address %s by ifname boot option",
-+                          self.name, iface, bound_mac)
- 
-     @guard_by_system_configuration(return_value=[])
-     def run(self):
--- 
-2.21.1
-
diff --git a/SOURCES/0002-CentOS-disable-cdn-radiobutton.patch b/SOURCES/0002-CentOS-disable-cdn-radiobutton.patch
deleted file mode 100644
index 9cbde67..0000000
--- a/SOURCES/0002-CentOS-disable-cdn-radiobutton.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNrp anaconda-33.16.3.26.orig/pyanaconda/ui/gui/spokes/installation_source.py anaconda-33.16.3.26/pyanaconda/ui/gui/spokes/installation_source.py
---- anaconda-33.16.3.26.orig/pyanaconda/ui/gui/spokes/installation_source.py	2020-08-24 05:10:07.000000000 -0500
-+++ anaconda-33.16.3.26/pyanaconda/ui/gui/spokes/installation_source.py	2020-11-16 10:41:09.663907591 -0600
-@@ -704,6 +704,8 @@ class SourceSpoke(NormalSpoke, GUISpokeI
-         self._network_button = self.builder.get_object("networkRadioButton")
-         self._network_box = self.builder.get_object("networkBox")
- 
-+        really_hide(self._cdn_button)
-+
-         self._url_entry = self.builder.get_object("urlEntry")
-         self._protocol_combo_box = self.builder.get_object("protocolComboBox")
-         self._iso_chooser_button = self.builder.get_object("isoChooserButton")
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index a81144b..6031d9e 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -1,7 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 33.16.3.26
-Release: 2%{?dist}.centos
+Version: 33.16.4.15
+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
 
-Patch1: 0001-network-do-not-crash-on-infiniband-devices-activated.patch
-Patch99: 0002-CentOS-disable-cdn-radiobutton.patch
-
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
@@ -54,6 +51,7 @@ BuildRequires: gobject-introspection-devel
 BuildRequires: glade-devel
 BuildRequires: libgnomekbd-devel
 BuildRequires: libxklavier-devel >= %{libxklavierver}
+BuildRequires: make
 BuildRequires: pango-devel
 BuildRequires: python3-kickstart >= %{pykickstartver}
 BuildRequires: python3-devel
@@ -369,10 +367,221 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
-* Thu Oct 22 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.26-2
-- network: do not crash on infiniband devices activated in initramfs
+* Wed Mar 24 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.15-1
+- network: clone connections from intramfs to persistent config (rvykydal)
+  Resolves: rhbz#1910438
+- network: match also connections named by MAC created by NM in initramfs
+  (rvykydal)
+  Related: rhbz#1910438
+- network: do not reset ipv6.addr-gen-mode in tui network configuration
   (rvykydal)
-  Resolves: rhbz#1890261
+  Related: rhbz#1873021
+- network: set addr-gen-mode of Anaconda default connections to eui64
+  (rvykydal)
+  Related: rhbz#1873021
+- network: default to addr-gen-mode eui64 (rvykydal)
+  Resolves: rhbz#1873021
+
+* Mon Mar 22 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.14-1
+- Fix crash in NTP servers GUI dialog on late network configuration (rvykydal)
+  Resolves: rhbz#1938168
+
+* Mon Mar 15 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.13-1
+- ostree: ignore exit code 65 for systemd-tmpfiles (christian)
+  Resolves: rhbz#1935648
+
+* Fri Mar 05 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.12-1
+- Pull in new translations (rvykydal)
+  Related: rhbz#1899672
+
+* Thu Feb 04 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.11-1
+- Take dnf substitutions from installer environment configuration (rvykydal)
+  Resolves: rhbz#1920735
+- Fix exclude arguments of tar payload extracting. (rvykydal)
+  Resolves: rhbz#1924118
+
+* Wed Feb 03 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.10-1
+- Mark the rhsm and syspurpose kickstart commands as useless (vponcova)
+  Resolves: rhbz#1921787
+- Fix getting kernel version list for liveimg (rvykydal)
+  Resolves: rhbz#1919463
+
+* Tue Feb 02 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.9-1
+- Change warning messages of missing prefix for RH products (jkonecny)
+  Resolves: rhbz#1897657
+- Do not use cache for container build (jkonecny)
+  Related: rhbz#1885635
+- Fix missing inst. prefixes for bootloader options in documentation (jkonecny)
+  Related: rhbz#1897657
+- Fix show missing inst. prefix warning appropriately (jkonencny)
+  Related: rhbz#1897657
+- Remove docs where we tell users that inst. prefix is not required (jkonecny)
+  Related: rhbz#1897657
+- Print warning for boot options without inst. prefix (jkonecny)
+  Related: rhbz#1897657
+- Add missing dracut commands as missing inst. prefix warning (jkonecny)
+  Related: rhbz#1897657
+- Enable warning when inst. prefix is not used (jkonecny)
+  Related: rhbz#1897657
+
+* Mon Jan 18 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.8-1
+- network: handle wireless configure button sensitiveness (rvykydal)
+  Resolves: rhbz#1917437
+
+* Thu Jan 14 2021 Martin Kolman <mkolman@redhat.com> - 33.16.4.7-1
+- Allow to disable the Security module (vponcova)
+  Resolves: rhbz#1913689
+- Allow to disable the Services module (vponcova)
+  Resolves: rhbz#1913689
+- Support should_run for standalone GUI spokes (vponcova)
+  Resolves: rhbz#1913689
+- Allow to disable the Localization module (vponcova)
+  Resolves: rhbz#1913689
+- Allow to disable the Timezone module (vponcova)
+  Resolves: rhbz#1913689
+- Allow to disable the network installation (vponcova)
+  Resolves: rhbz#1913689
+- Allow to disable the Users module (vponcova)
+  Resolves: rhbz#1913689
+- Always show pykickstart parse warnings (vslavik)
+  Resolves: rhbz#1897663
+
+* Mon Jan 11 2021 Martin Kolman <mkolman@redhat.com> - 33.16.4.6-1
+- Initialize librepo logger (pkratoch)
+  Resolves: rhbz#1908286
+- Add RPM tests support for owners on rhel-8 (jkonecny)
+  Related: rhbz#1885635
+- Use latests RHEL-8 buildroot in containers (jkonecny)
+  Related: rhbz#1885635
+- Implement rpm-tests execution in the container (jkonecny)
+  Related: rhbz#1885635
+
+* Tue Jan 05 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.5-1
+- network: fix double-free using libnm function filter_connections() (rvykydal)
+  Resolves: rhbz#1873561
+
+* Tue Dec 08 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.4-1
+- network: rename Gtk cell renderer to prevent name collision (rvykydal)
+  Related: rhbz#1847681
+- network: add unit tests for SecretsAgent (rvykydal)
+  Related: rhbz#1847681
+- network: make SecretAgentDialog a bit more robust (rvykydal)
+  Related: rhbz#1847681
+- network: move wireless secret agent bits into a separate file (rvykydal)
+  Related: rhbz#1847681
+- network: migrate SecretAgent from python-dbus to dasbus (rvykydal)
+  Related: rhbz#1847681
+- network: do not use dialog for just single wireless connection to configure
+  (rvykydal)
+  Related: rhbz#1847681
+- network: fix configuration of wireless networks (rvykydal)
+  Related: rhbz#1847681
+- network: use dialog instead of combobox to select wireless network (rvykydal)
+  Related: rhbz#1847681
+- network: deal with obsolete ssid when configuring wireless (rvykydal)
+  Related: rhbz#1847681
+- network: use function instead of assigned lambda in wireless activation
+  (rvykydal)
+  Related: rhbz#1847681
+- network: do not update wireless AP combo active item when not necessary
+  (rvykydal)
+  Related: rhbz#1847681
+- network: do not use obsolete access points in wireless configuration
+  (rvykydal)
+  Resolves: rhbz#1847681
+- Update the function get_default_partitioning (vponcova)
+  Related: rhbz#1887370
+- Update the property default_partitioning (vponcova)
+  Related: rhbz#1887370
+- Change the default_partitioning option (vponcova)
+  Resolves: rhbz#1887370
+
+* Wed Nov 25 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.3-1
+- Fix incomplete configuration of repositories loaded from treeinfo
+  (honza.stodola)
+  Resolves: rhbz#1745064
+- Fix checking ssl certificate for metadata (honza.stodola)
+  Resolves: rhbz#1745064
+- Apply pylint excessive memory usage fix (mpitt)
+  Related: rhbz#1885635
+- Use bootlist command to update the PowerPC-64 Boot Order (javierm)
+  Resolves: rhbz#1854307
+- Discard current boot list when updating the boot-device NRVAM variable
+  (javierm)
+  Resolves: rhbz#1854307
+- Improve the error dialog for storage reset (vponcova)
+  Resolves: rhbz#1877050
+- Fix issue when ns_info cannot be retrieved for NVDimm namespace (jkonecny)
+  Resolves: rhbz#1891827
+- Relabel the anaconda logs after copying them to the installed system
+  (jstodola)
+  Resolves: rhbz#1870493
+- post-scripts need to be sorted (honza.stodola)
+  Related: rhbz#1870493
+
+* Mon Nov 23 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.2-1
+- Install Red Hat IT root certificate into anaconda-ci container (mpitt)
+  Related: rhbz#1885635
+- Install python-copr into anaconda-ci container (mpitt)
+  Related: rhbz#1885635
+- Change handling of UID and GID values (vslavik)
+  Related: rhbz#1786680
+- Send UID and GID over D-Bus as UInt32 (vslavik)
+  Related: rhbz#1786680
+- Correct limits for UIDs and GIDs in GUI (vslavik)
+  Resolves: rhbz#1786680
+- Add rhel unit-tests workflow for pull_request_trigger back (jkonecny)
+  Related: rhbz#1885635
+- Select disks for implicit partitions (vponcova)
+  Resolves: rhbz#1642391
+- Extend the PartSpec class (vponcova)
+  Related: rhbz#1642391
+
+* Fri Nov 06 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.1-1
+- Allow to format selected DASDs (vponcova)
+  Resolves: rhbz#1874394
+- Don't clobber host checkout on `make container-ci` (mpitt)
+  Related: rhbz#1885635
+- Drop anaconda-ci container entrypoint (mpitt)
+  Related: rhbz#1885635
+- Remove PR test trigger (mpitt)
+  Related: rhbz#1885635
+- Rename ci-tasks container to anaconda-ci (jkonecny)
+  Related: rhbz#1885635
+- network: do not crash on infiniband devices activated in initramfs (rvykydal)
+  Resolves: rhbz#1890009
+- Fix testing target branch instead of PR branch (jkonecny)
+  Related: rhbz#1885635
+- Add a mechanism to hide help button, use on inst. progress (vslavik)
+  Resolves: rhbz#1890092
+- Document how to start a self-hosted GitHub actions runner locally (mpitt)
+  Related: rhbz#1885635
+- Run unit tests on self-hosted GitHub runner (mpitt)
+  Related: rhbz#1885635
+- Fix local tests run inside of container (jkonecny)
+  Related: rhbz#1885635
+- Fix ci-tasks container shell instructions (mpitt)
+  Related: rhbz#1885635
+- More aggressive pylint downscaling (mpitt)
+  Related: rhbz#1885635
+- Fix pylint downscaling (mpitt)
+  Related: rhbz#1885635
+- Add ci-tasks container for running unit tests (mpitt)
+  Related: rhbz#1885635
+- Restrict pylint parallelism to available RAM (mpitt)
+  Related: rhbz#1885635
+- Separate RPM installability test from rpm_tests (martin)
+  Related: rhbz#1885635
+- Define make targets for building source and binary rpms (martin)
+  Related: rhbz#1885635
+- Drop superfluous build in `make run-rpm-tests-only` (martin)
+  Related: rhbz#1885635
+- Mock system operations in MountFilesystemsTask task (martin)
+  Related: rhbz#1885635
+- Add missing "rpm-build" test dependency (martin)
+  Related: rhbz#1885635
+- Add missing "make" BuildRequires (martin)
+  Related: rhbz#1885635
 
 * Tue Sep 22 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.26-1
 - Never mount partitions on a disk with the iso9660 filesystem (vponcova)
@@ -497,10 +706,6 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 - Wait for payload initialization to finish in Subscription spoke (mkolman)
   Related: rhbz#1823578
 
-* Wed Jul 22 2020 Martin Kolman <mkolman@redhat.com> - 33.16.3.13-2
-- Boot over HTTP via UEFI blocker fixes (vponcova)(jkonecny)
-  Resolves: rhbz#1856264
-
 * Thu Jul 09 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.13-1
 - Fix the position of the info bar in standalone spokes (vponcova)
   Resolves: rhbz#1847423