diff --git a/Projects/AnalysisBase/package_filters.txt b/Projects/AnalysisBase/package_filters.txt
index 70bd05bcd6cc7e8f8f15823bbbf701aac89e7213..e1ba26312f9d52c132ca0f96072efd6e33ca665b 100644
--- a/Projects/AnalysisBase/package_filters.txt
+++ b/Projects/AnalysisBase/package_filters.txt
@@ -1,41 +1,139 @@
 #
 # Packages to build as part of AnalysisBase:
 #
+
+# These packages were picked up by patterns below, but don't compile
+# in AnalysisBase yet.  Most likely these are packages that still need
+# to be fixed up.  These lines should either be removed as the
+# packages get fixed up, or moved to the main list if these packages
+# are not intended for analysis.
+
+- PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection
+- PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection
+- PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools
+- PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection
+- PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection
+- PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis
+- Reconstruction/Jet/JetCalibTools
+- Reconstruction/Jet/JetMomentTools
+- Reconstruction/Jet/JetRec
+- Reconstruction/Jet/JetSubStructureMomentTools
+- Reconstruction/Jet/JetSubStructureUtils
+
+
+
+# Actual packages that are part of the release.  Commented out lines
+# were present in 21.2, but the packages do not compile in master yet.
+# These comments should either be removed as the packages get fixed
+# up, or the lines should be removed if these packages are not
+# intended for analysis.
+
 + AsgExternal/Asg_Test
 + AtlasTest/TestTools
 + Calorimeter/CaloGeoHelpers
-+ Control/AthContainersInterfaces
 + Control/AthContainers
++ Control/AthContainersInterfaces
 + Control/AthLinksSA
 + Control/AthToolSupport/.*
 + Control/CxxUtils
++ Control/RootUtils
 + Control/xAODDataSource
 + Control/xAODRootAccess.*
-+ Control/RootUtils
++ DataQuality/GoodRunsLists
 + DetectorDescription/GeoPrimitives
 + DetectorDescription/IRegionSelector
 + DetectorDescription/RoiDescriptor
 + Event/EventPrimitives
 + Event/FourMomUtils
 - Event/xAOD/.*AthenaPool
++ Event/xAOD/xAODMetaDataCnv
++ Event/xAOD/xAODTriggerCnv
+#+ Event/xAOD/xAODTruthCnv
 - Event/xAOD/.*Cnv
 + Event/xAOD/.*
+#+ External/AtlasPyFwdBwdPorts
+#+ ForwardDetectors/ZDC/ZdcAnalysis
+#+ ForwardDetectors/ZDC/ZdcNtuple
 + Generators/TruthUtils
+#+ InnerDetector/InDetRecTools/InDetTrackSelectionTool
+#+ InnerDetector/InDetRecTools/TrackVertexAssociationTool
+#+ MuonSpectrometer/MuonIdHelpers
 + MuonSpectrometer/MuonStationIndex
+#+ PhysicsAnalysis/Algorithms/.*
 + PhysicsAnalysis/AnalysisCommon/AssociationUtils
+#+ PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples
++ PhysicsAnalysis/AnalysisCommon/CutBookkeeperUtils
+#+ PhysicsAnalysis/AnalysisCommon/FakeBkgTools
+#+ PhysicsAnalysis/AnalysisCommon/FsrUtils
++ PhysicsAnalysis/AnalysisCommon/HDF5Utils
+#+ PhysicsAnalysis/AnalysisCommon/IsolationSelection
 + PhysicsAnalysis/AnalysisCommon/PATCore
 + PhysicsAnalysis/AnalysisCommon/PATInterfaces
+#+ PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/GammaORTools
++ PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools
+#+ PhysicsAnalysis/AnalysisCommon/PMGTools
+#+ PhysicsAnalysis/AnalysisCommon/ParticleJetTools
++ PhysicsAnalysis/AnalysisCommon/PileupReweighting
++ PhysicsAnalysis/AnalysisCommon/ReweightUtils
+#+ PhysicsAnalysis/BPhys/BPhysTools
 + PhysicsAnalysis/D3PDTools/.*
-+ PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
-+ PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces
-#+ PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections # depends on StoreGate/ReadHandleKey.h
-#+ PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections # depends on StoreGate/ReadHandleKey.h
+#+ PhysicsAnalysis/DerivationFramework/DerivationFrameworkAnalysisTests
+- PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools
++ PhysicsAnalysis/ElectronPhotonID/.*
+#+ PhysicsAnalysis/HeavyIonPhys/HIEventUtils
+#+ PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint
++ PhysicsAnalysis/Interfaces/.*
+#+ PhysicsAnalysis/JetMissingEtID/JetSelectorTools
+#+ PhysicsAnalysis/JetTagging/FlavorTagDiscriminants
++ PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface
++ PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency
+#+ PhysicsAnalysis/MCTruthClassifier
+#+ PhysicsAnalysis/MuonID/MuonIDAnalysis/.* # depends on StoreGate/ReadHandleKey.h
 #+ PhysicsAnalysis/MuonID/MuonSelectorTools # depends on StoreGate/ReadHandleKey.h
++ PhysicsAnalysis/TauID/DiTauMassTools
+#+ PhysicsAnalysis/TauID/TauAnalysisTools
++ PhysicsAnalysis/TrackingID/.*
++ Reconstruction/EventShapes/EventShapeInterface
+#+ Reconstruction/Jet/BoostedJetTaggers
+- Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM
+- Reconstruction/Jet/JetEvent.*
+- Reconstruction/Jet/JetMonitoring
+#+ Reconstruction/Jet/JetReclustering
+- Reconstruction/Jet/JetRec.+
+- Reconstruction/Jet/JetSimTools
+- Reconstruction/Jet/JetValidation
++ Reconstruction/Jet/Jet.*
++ Reconstruction/MET/METInterface
+#+ Reconstruction/MET/METUtilities
++ Reconstruction/MVAUtils
++ Reconstruction/PFlow/PFlowUtils
+#+ Reconstruction/RecoTools/IsolationTool
++ Reconstruction/RecoTools/RecoToolInterfaces
++ Reconstruction/egamma/egammaLayerRecalibTool
++ Reconstruction/egamma/egammaMVACalib
++ Reconstruction/egamma/egammaRecEvent
+#+ Reconstruction/tauRecTools
++ Tools/ART
++ Tools/DirectIOART
 + Tools/PathResolver
++ Trigger/TrigAnalysis/TrigAnalysisInterfaces
++ Trigger/TrigAnalysis/TrigBunchCrossingTool
+#+ Trigger/TrigAnalysis/TrigDecisionTool
+#+ Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection
+#+ Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauMatching
+#+ Trigger/TrigAnalysis/TriggerMatchingTool
 + Trigger/TrigConfiguration/TrigConfBase
-+ Trigger/TrigConfiguration/TrigConfL1Data
 + Trigger/TrigConfiguration/TrigConfHLTData
 + Trigger/TrigConfiguration/TrigConfHLTUtils
++ Trigger/TrigConfiguration/TrigConfInterfaces
++ Trigger/TrigConfiguration/TrigConfL1Data
+#+ Trigger/TrigConfiguration/TrigConfxAOD
++ Trigger/TrigEvent/TrigDecisionInterface
 + Trigger/TrigEvent/TrigNavStructure
++ Trigger/TrigEvent/TrigRoiConversion
++ Trigger/TrigEvent/TrigSteeringEvent
 + Trigger/TrigSteer/TrigCompositeUtils
+#+ Trigger/TrigValidation/TrigAnalysisTest
+#+ Trigger/TriggerSimulation/TrigBtagEmulationTool
+
 - .*