Background & aims: Currently available non-invasive tests, including fibrosis-4 index (FIB-4) and liver stiffness measurement (LSM by VCTE), are highly effective at excluding advanced fibrosis (AF) (F ≥3) or cirrhosis in people with non-alcoholic fatty liver disease (NAFLD), but only have moderate ability to rule-in these conditions. Our objective was to develop and validate two new scores (Agile 4 and Agile 3+) to identify cirrhosis or AF, respectively, with optimized positive predictive value and fewer indeterminate results, in individuals with NAFLD attending liver clinics. Methods: This international study included seven adult cohorts with suspected NAFLD who underwent liver biopsy, LSM and blood sampling during routine clinical practice or screening for trials. The population was randomly divided into a training set and an internal validation set, on which the best-fitting logistic regression model was built, and performance and goodness of fit were assessed, respectively. Furthermore, both scores were externally validated on two large cohorts. Cut-offs for high sensitivity and specificity were derived in the training set to rule-out and rule-in cirrhosis or AF and then tested in the validation set and compared to FIB-4 and LSM. Results: Each score combined LSM, AST/ALT ratio, platelets, sex and diabetes status, as well as age for Agile 3+. Calibration plots for Agile 4 and Agile 3+ indicated satisfactory to excellent goodness of fit. Agile 4 and Agile 3+ outperformed FIB-4 and LSM in terms of AUROC, percentage of patients with indeterminate results and positive predictive value to rule-in cirrhosis or AF. Conclusions: The two novel non-invasive scores improve identification of cirrhosis or AF among individuals with NAFLD attending liver clinics and reduce the need for liver biopsy in this population. Impact and implications: Non-invasive tests currently used to identify patients with advanced fibrosis or cirrhosis, such as fibrosis-4 index and liver stiffness measurement by vibration-controlled transient elastography, have high negative predictive values but high false positive rates, while results are indeterminate for a large number of cases. This study provides scores that will help the clinician diagnose advanced fibrosis or cirrhosis. These new easy-to-implement scores will help liver specialists to better identify (1) patients who need more intensive follow-up, (2) patients who should be referred for inclusion in therapeutic trials, and (3) which patients should be treated with pharmacological agents when effective therapies are approved.