diff --git a/.anaconda.metadata b/.anaconda.metadata
index 050cbc1..22a6a40 100644
--- a/.anaconda.metadata
+++ b/.anaconda.metadata
@@ -1 +1 @@
-8dfbf6b1c01a27b19142f3f82d81410561c73a1c SOURCES/anaconda-33.16.3.10.tar.bz2
+943cbbf90edd1624ddf39986a374ecc83eb0f921 SOURCES/anaconda-33.16.4.11.tar.bz2
diff --git a/.gitignore b/.gitignore
index 7c7a1c6..5899e0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/anaconda-33.16.3.10.tar.bz2
+SOURCES/anaconda-33.16.4.11.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/SPECS/anaconda.spec b/SPECS/anaconda.spec
index e77a619..df88654 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -1,6 +1,6 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 33.16.3.10
+Version: 33.16.4.11
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -51,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
@@ -148,11 +149,6 @@ Obsoletes: anaconda-runtime < %{version}-%{release}
 Provides: anaconda-runtime = %{version}-%{release}
 Obsoletes: booty <= 0.107-1
 
-# native i686 installations are not supported on RHEL8 and Anaconda
-# is not a i686 compatibility library, so building it for i686 does not
-# make sense
-ExcludeArch: i686
-
 %description core
 The anaconda-core package contains the program which was used to install your
 system.
@@ -371,6 +367,345 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* 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)
+  Resolves: rhbz#1878784
+
+* Thu Sep 17 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.25-1
+- Root password is mandatory if there is *not* admin user. (rvykydal)
+  Related: rhbz#1876727
+- Make locked root be completed only for kickstart (vslavik)
+  Resolves: rhbz#1876727
+
+* Mon Sep 07 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.24-1
+- network: do not add superfluous quotes to inst.dhcpclass identifier
+  (rvykydal)
+  Related: rhbz#1870692
+
+* Fri Sep 04 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.23-1
+- subscription: Assure payload restart on DVD install after registration
+  (mkolman)
+  Resolves: rhbz#1873164
+- Document the restart_payload argument of subscription helper functions
+  (mkolman)
+  Related: rhbz#1873164
+
+* Thu Sep 03 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.22-1
+- network: fix inst.dhcpclass boot option (rvykydal)
+  Resolves: rhbz#1870692
+- network: fix kickstart network --dhcpclass option (rvykydal)
+  Resolves: rhbz#1869224
+
+* 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
+- network: add timeout for synchronous activation of a connection (rvykydal)
+  Related: rhbz#1869323
+
+* Wed Aug 19 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.19-1
+- Propagate verify_ssl to RHSM (mkolman)
+  Resolves: rhbz#1858126
+
+* Wed Aug 12 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.18-1
+- subscription: Only restart payload when needed (mkolman)
+  Resolves: rhbz#1861351
+- Reset the state of the custom partitioning spoke (vponcova)
+  Resolves: rhbz#1868330
+- network: fix parsing of hostname from ip= if mac is defined in dhcp
+  (rvykydal)
+  Resolves: rhbz#1852560
+
+* Thu Aug 06 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.17-1
+- Revert root password spoke to 8.2 behavior (vslavik)
+  Resolves: rhbz#1851220
+- Remove the DBus method ConfigureNTPServiceEnablementWithTask (vponcova)
+  Resolves: rhbz#1862492
+- Add the function is_service_installed (vponcova)
+  Related: rhbz#1862492
+
+* Tue Aug 04 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.16-1
+- Implement get_source_proxy() in payload base class (mkolman)
+  Resolves: rhbz#1861456
+- Restore RHEL-specific stylesheet data (vponcova)
+  Resolves: rhbz#1865882
+- subscription: Convert the RHSM default config values to expected format
+  (mkolman)
+  Resolves: rhbz#1862116
+- Create ssh user using only existing fields (vslavik)
+  Resolves: rhbz#1860058
+- Remove subscription workaround to not use treeinfo repositories (jkonecny)
+  Related: rhbz#1851207
+- Fix issue that treeinfo repositories were never disabled (jkonecny)
+  Related: rhbz#1851207
+- Keep treeinfo repositories disabled after payload reset (jkonecny)
+  Related: rhbz#1851207
+- Reset repositories from the main thread (vponcova)
+  Related: rhbz#1851207
+- Initialize the closest mirror from the main thread (vponcova)
+  Related: rhbz#1851207
+- Fix crash on first entering of source spoke (jkonecny)
+  Related: rhbz#1851207
+- Remove treeinfo repositories instead of disabling (jkonecny)
+  Related: rhbz#1851207
+- Reload treeinfo repositories on every payload reset (jkonecny)
+  Resolves: rhbz#1851207
+
+* Thu Jul 30 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.15-1
+- Apply onboot policy even when network was configured in UI. (rvykydal)
+  Resolves: rhbz#1856632
+- Fix creating cached LVs on encrypted PVs (vtrefny)
+  Resolves: rhbz#1855973
+
+* Mon Jul 27 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.14-1
+- Fix everything in payload should be mounted as read only (jkonecny)
+  Related: rhbz#1856264
+- Add support for mount options to device_tree.MountDevice (jkonecny)
+  Related: rhbz#1856264
+- Adapt tests for CDRom for the new inst.stage2 discovery (jkonecny)
+  Related: rhbz#1856264
+- CDRom source should prioritize stage2 device during discover (jkonecny)
+  Resolves: rhbz#1856264
+- Protect all devices with the iso9660 file system (vponcova)
+  Related: rhbz#1856264
+- Don't ignore NVDIMM devices with the iso9660 file system (vponcova)
+  Related: rhbz#1856264
+- Add tests for the DBus method FindOpticalMedia (vponcova)
+  Related: rhbz#1856264
+- Don't return negative container free space (vponcova)
+  Resolves: rhbz#1853071
+- Revert "Do not build Anaconda on i686" (mkolman)
+  Resolves: rhbz#1857180
+- Move slower part of Subscription spoke initialization to a thread (mkolman)
+  Related: rhbz#1823578
+- Only pass one initrd image to kexec (javierm)
+  Resolves: rhbz#1855290
+- Wait for payload initialization to finish in Subscription spoke (mkolman)
+  Related: rhbz#1823578
+
+* 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
+- Add workaround to fix support for installtree without repo (jkonecny)
+  Resolves: rhbz#1854825
+- Revert "Update pyanaconda/exception.py" (jstodola)
+  Resolves: rhbz#1853470
+- network: fix configuration of virtual devices by boot options (rvykydal)
+  Resolves: rhbz#1851218
+
+* Wed Jul 08 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.12-1
+- subscription: Fix rhsm --proxy kickstart command usage with no username
+  specified (mkolman)
+  Resolves: rhbz#1849792
+- Create the initial storage model during the initialization (vponcova)
+  Resolves: rhbz#1844098
+- Make spoke tiles stack more tightly (vslavik)
+  Resolves: rhbz#1845493
+- Reconfigure DNF payload after options are set (vslavik)
+  Resolves: rhbz#1847603
+
+* Thu Jul 02 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.11-1
+- Fix displaying of empty software group description (rvykydal)
+  Resolves: rhbz#1812061
+- Fix software spoke message when source changes (mkolman)
+  Resolves: rhbz#1788458
+
 * Mon Jun 29 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.10-1
 - Fix RHSM HTTP proxy configuration crash in the GUI (mkolman)
   Resolves: rhbz#1849792