diff --git a/fedora/override.conf b/fedora/override.conf
index ec6a1ce..a215514 100644
--- a/fedora/override.conf
+++ b/fedora/override.conf
@@ -14,6 +14,14 @@ tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64', 'i386']
 # For Fedora-ELN, we do not inherit builds from parent tags.
 pkgset_koji_inherit = False
 
+# Cherry-pick packages which fail to build in ELN from Fedora 33 for now.
+pkgset_koji_builds = [
+    "shim-15-8",
+    "metacity-3.36.1-2.fc33",
+    "rng-tools-6.10-5.fc33",
+    "strace-5.7.0.6.7ab6-1.fc33"
+]
+
 # No jigdo needed in Fedora.
 create_jigdo = False
 
@@ -47,18 +55,6 @@ buildinstall_skip = [
     }),
 ]
 
-# Add the rawhide repository for missing packages
-# TODO: Once we have all the packages built in ELN repos,
-# we must remove this completely.
-lorax_extra_sources = [
-    ('^Everything$', {
-        '*': 'https://kojipkgs.fedoraproject.org/repos/f33-build/latest/$basearch/',
-    }),
-    ('^BaseOS$', {
-        '*': ['https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/$basearch/os/', 'https://kojipkgs.fedoraproject.org/repos/f33-build/latest/$basearch/'],
-    })
-]
-
 # Everything contains everything.
 additional_packages = [
     ('^Everything$', {