A new 5-year Common Agricultural Policy has been in place since January 2023. Like its predecessors, this new policy will fail to deliver significant climatic and environmental benefits. We show how the Green Architecture of the policy relying on the three instruments of conditionality, eco-schemes, and agri-environment and climate measures could have been used more consistently and effectively. Our proposals are based on core principles of public economics and fiscal federalism as well as on research results in agronomy and ecology. Conditionality criteria are the minimal requirements that every agricultural producer must meet. Farmers should be rewarded for efforts that go beyond these basic requirements through eco-schemes for global public goods complemented by agri-environment and climate measures centred on local public goods. Eco-schemes should cover the whole agricultural area by targeting permanent grasslands, crop diversification, and green cover and non-productive agro-ecological infrastructures. We discuss trade-offs that our proposals could generate.