diff --git a/.gitignore b/.gitignore
index fa08803dc..eb4f4e713 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,6 @@ policyengine_uk/calibration/*.h5
 **/*.csv
 **/*.pkl
 **/*.log
+**/*.txt
+**/ukmod.json
+*.ipynb
diff --git a/changelog_entry.yaml b/changelog_entry.yaml
index e69de29bb..28de79275 100644
--- a/changelog_entry.yaml
+++ b/changelog_entry.yaml
@@ -0,0 +1,4 @@
+- bump: minor
+  changes:
+    added:
+    - HM Treasury baseline for CPI uprating benefits.
diff --git a/policyengine_uk/parameters/calibration/uprating/september_cpi.yaml b/policyengine_uk/parameters/calibration/uprating/september_cpi.yaml
index 585252198..f5d661949 100644
--- a/policyengine_uk/parameters/calibration/uprating/september_cpi.yaml
+++ b/policyengine_uk/parameters/calibration/uprating/september_cpi.yaml
@@ -1,5 +1,7 @@
 description: September CPI
 values:
+  2024-01-01: 132.0
+  2023-04-01: 123.8
   2022-04-01: 112.4
   2021-04-01: 109.2
   2020-04-01: 108.4
diff --git a/policyengine_uk/parameters/gov/benefit_uprating_cpi.yaml b/policyengine_uk/parameters/gov/benefit_uprating_cpi.yaml
new file mode 100644
index 000000000..f5d661949
--- /dev/null
+++ b/policyengine_uk/parameters/gov/benefit_uprating_cpi.yaml
@@ -0,0 +1,28 @@
+description: September CPI
+values:
+  2024-01-01: 132.0
+  2023-04-01: 123.8
+  2022-04-01: 112.4
+  2021-04-01: 109.2
+  2020-04-01: 108.4
+  2019-04-01: 106.6
+  2018-04-01: 104.3
+  2017-04-01: 101.5
+  2016-04-01: 100.2
+  2015-04-01: 100.0
+  2014-04-01: 98.7
+  2013-04-01: 96.4
+  2012-04-01: 94.5
+  2011-04-01: 90.4
+  2010-04-01: 88.3
+  2009-04-01: 87.5
+  2008-04-01: 83.5
+  2007-04-01: 81.9
+  2006-04-01: 79.9
+  2005-04-01: 77.9
+  2004-04-01: 77.0
+  2003-04-01: 76.0
+  2002-04-01: 75.0
+  2001-04-01: 73.8
+metadata:
+  unit: currency-GBP
diff --git a/policyengine_uk/parameters/gov/contrib/benefit_uprating/inflation_adjustment.yaml b/policyengine_uk/parameters/gov/contrib/benefit_uprating/inflation_adjustment.yaml
deleted file mode 100644
index fd8fdf510..000000000
--- a/policyengine_uk/parameters/gov/contrib/benefit_uprating/inflation_adjustment.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: Increase benefits subject to inflation uprating maximum amounts by this amount. This takes place over 2024.
-values:
-  2000-01-01: 0
-metadata:
-  unit: /1
-  label: Benefit inflation adjustment
\ No newline at end of file
diff --git a/policyengine_uk/parameters/gov/dwp/JSA/income/amount_18_24.yaml b/policyengine_uk/parameters/gov/dwp/JSA/income/amount_18_24.yaml
index 8bdbcba9a..7ef6eed0b 100644
--- a/policyengine_uk/parameters/gov/dwp/JSA/income/amount_18_24.yaml
+++ b/policyengine_uk/parameters/gov/dwp/JSA/income/amount_18_24.yaml
@@ -12,5 +12,5 @@ metadata:
   period: week
   unit: currency-GBP
   label: Income-based JSA (18-24)
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
diff --git a/policyengine_uk/parameters/gov/dwp/JSA/income/amount_over_25.yaml b/policyengine_uk/parameters/gov/dwp/JSA/income/amount_over_25.yaml
index ef1e87079..8eaf32c2a 100644
--- a/policyengine_uk/parameters/gov/dwp/JSA/income/amount_over_25.yaml
+++ b/policyengine_uk/parameters/gov/dwp/JSA/income/amount_over_25.yaml
@@ -11,6 +11,6 @@ values:
 metadata:
   period: week
   label: Income-based JSA (over 25)
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
diff --git a/policyengine_uk/parameters/gov/dwp/JSA/income/couple.yaml b/policyengine_uk/parameters/gov/dwp/JSA/income/couple.yaml
index 077c0a74c..e8da69c4d 100644
--- a/policyengine_uk/parameters/gov/dwp/JSA/income/couple.yaml
+++ b/policyengine_uk/parameters/gov/dwp/JSA/income/couple.yaml
@@ -12,5 +12,5 @@ metadata:
   period: week
   unit: currency-GBP
   label: Income-based JSA (couple)
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
diff --git a/policyengine_uk/parameters/gov/dwp/LHA/rates.yaml b/policyengine_uk/parameters/gov/dwp/LHA/rates.yaml
index f3a0fdc2e..466b70f15 100644
--- a/policyengine_uk/parameters/gov/dwp/LHA/rates.yaml
+++ b/policyengine_uk/parameters/gov/dwp/LHA/rates.yaml
@@ -1,6 +1,6 @@
 metadata:
   propagate_metadata_to_children: true
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
 ASHFORD:
   A:
     description: LHA rate for Ashford homes in category CAT A
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/child.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/child.yaml
index b1d11c1bf..3c4298176 100644
--- a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/child.yaml
+++ b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/child.yaml
@@ -7,7 +7,7 @@ metadata:
   propagate_metadata_to_children: true
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
 values:
   2015-06-01: 66.9
   2021-04-01: 68.6
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/couple/SP_age.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/couple/SP_age.yaml
index 8fd4bd9ba..74c828d71 100644
--- a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/couple/SP_age.yaml
+++ b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/couple/SP_age.yaml
@@ -8,5 +8,5 @@ metadata:
   unit: currency-GBP
   name: hb_couple_pensioner
   label: HB personal allowance (couple, pensioner)
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/couple/both_under_18.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/couple/both_under_18.yaml
index c85dd95ad..4c54da1cc 100644
--- a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/couple/both_under_18.yaml
+++ b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/couple/both_under_18.yaml
@@ -8,7 +8,7 @@ metadata:
   propagate_metadata_to_children: true
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
 values:
   2015-06-01: 87.5
   2021-04-01: 89.45
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/couple/over_18.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/couple/over_18.yaml
index d56db4320..9aadd9506 100644
--- a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/couple/over_18.yaml
+++ b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/couple/over_18.yaml
@@ -6,5 +6,5 @@ metadata:
   name: hb_couple_o18
   label: HB personal allowance (couple, over 18)
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/lone_parent/SP_age.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/lone_parent/SP_age.yaml
index c24153607..adad321e1 100644
--- a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/lone_parent/SP_age.yaml
+++ b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/lone_parent/SP_age.yaml
@@ -8,7 +8,7 @@ metadata:
   propagate_metadata_to_children: true
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
 values:
   2015-06-01: 181
   2021-04-01: 191.15
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/lone_parent/over_18.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/lone_parent/over_18.yaml
index dd02d1c0e..ba9d16498 100644
--- a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/lone_parent/over_18.yaml
+++ b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/lone_parent/over_18.yaml
@@ -5,7 +5,7 @@ values:
   2022-04-06: 77.00
 metadata:
   period: week
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   name: hb_lone_parent_o18
   label: HB personal allowance (lone parent, over 18)
   unit: currency-GBP
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/lone_parent/under_18.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/lone_parent/under_18.yaml
index a4f17e0e3..6f1f29efa 100644
--- a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/lone_parent/under_18.yaml
+++ b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/lone_parent/under_18.yaml
@@ -7,7 +7,7 @@ metadata:
   propagate_metadata_to_children: true
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
 values:
   2015-06-01: 57.9
   2021-04-01: 59.2
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/single/SP_age.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/single/SP_age.yaml
index f66f3ea47..ef6455e66 100644
--- a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/single/SP_age.yaml
+++ b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/single/SP_age.yaml
@@ -5,7 +5,7 @@ values:
   2022-04-06: 197.10
 metadata:
   period: week
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   name: hb_single_pensioner
   label: HB personal allowance (single, pensioner)
   unit: currency-GBP
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/single/over_25.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/single/over_25.yaml
index 09f79c9bd..f3704e5ee 100644
--- a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/single/over_25.yaml
+++ b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/single/over_25.yaml
@@ -8,5 +8,5 @@ metadata:
   unit: currency-GBP
   name: hb_single_o25
   label: HB personal allowance (single, over 25)
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/single/under_25.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/single/under_25.yaml
index 13778f7a0..b0e081c86 100644
--- a/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/single/under_25.yaml
+++ b/policyengine_uk/parameters/gov/dwp/housing_benefit/allowances/single/under_25.yaml
@@ -8,5 +8,5 @@ metadata:
   unit: currency-GBP
   name: hb_single_u25
   label: HB personal allowance (single, under 25)
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
diff --git a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_16_24.yaml b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_16_24.yaml
index 56210d162..87ddae14e 100644
--- a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_16_24.yaml
+++ b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_16_24.yaml
@@ -5,5 +5,5 @@ metadata:
   period: week
   unit: currency-GBP
   label: Income Support applicable amount (single, 18-24)
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference: https://www.gov.uk/income-support/what-youll-get
diff --git a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_couples_16_17.yaml b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_couples_16_17.yaml
index d73e834dd..a12cd049c 100644
--- a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_couples_16_17.yaml
+++ b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_couples_16_17.yaml
@@ -5,6 +5,6 @@ metadata:
   label: Income Support applicable amount (couples, both under 18)
   reference: https://www.gov.uk/income-support/what-youll-get
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
 values:
   2015-06-01: 58.9
diff --git a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_couples_age_gap.yaml b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_couples_age_gap.yaml
index d3514703c..31d22b68d 100644
--- a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_couples_age_gap.yaml
+++ b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_couples_age_gap.yaml
@@ -6,6 +6,6 @@ metadata:
   label: Income Support applicable amount (couples, one under 18, one over 25)
   reference: https://www.gov.uk/income-support/what-youll-get
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
 values:
   2015-06-01: 74.35
diff --git a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_couples_over_18.yaml b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_couples_over_18.yaml
index 236a3c68c..512470a95 100644
--- a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_couples_over_18.yaml
+++ b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_couples_over_18.yaml
@@ -4,6 +4,6 @@ values:
 metadata:
   period: week
   label: Income Support applicable amount (couples, both over 18)
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   unit: currency-GBP
   reference: https://www.gov.uk/income-support/what-youll-get
diff --git a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_lone_16_17.yaml b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_lone_16_17.yaml
index cf1f3505a..002600e83 100644
--- a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_lone_16_17.yaml
+++ b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_lone_16_17.yaml
@@ -5,6 +5,6 @@ metadata:
   label: Income Support applicable amount (lone parent, under 18)
   reference: https://www.gov.uk/income-support/what-youll-get
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
 values:
   2015-06-01: 58.9
diff --git a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_lone_over_18.yaml b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_lone_over_18.yaml
index 5978dc730..30c9f58c4 100644
--- a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_lone_over_18.yaml
+++ b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_lone_over_18.yaml
@@ -5,5 +5,5 @@ metadata:
   period: week
   unit: currency-GBP
   label: Income Support applicable amount (lone parent, over 18)
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference: https://www.gov.uk/income-support/what-youll-get
diff --git a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_over_25.yaml b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_over_25.yaml
index c2659eb67..99438f7bd 100644
--- a/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_over_25.yaml
+++ b/policyengine_uk/parameters/gov/dwp/income_support/amounts/amount_over_25.yaml
@@ -4,6 +4,6 @@ values:
 metadata:
   period: week
   label: Income Support applicable amount (single, over 25)
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   unit: currency-GBP
   reference: https://www.gov.uk/income-support/what-youll-get
diff --git a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/carer/addition.yaml b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/carer/addition.yaml
index 6d35edc22..c18f301d7 100644
--- a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/carer/addition.yaml
+++ b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/carer/addition.yaml
@@ -9,7 +9,7 @@ metadata:
   period: week
   name: pc_carer_addition
   label: Pension Credit carer addition
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - title: The Social Security Benefits Up-rating Order 2022
       href: https://www.legislation.gov.uk/uksi/2022/292/article/30/made#article-30-2-c
\ No newline at end of file
diff --git a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/child/addition.yaml b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/child/addition.yaml
index 632b497a1..c5ac7fac5 100644
--- a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/child/addition.yaml
+++ b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/child/addition.yaml
@@ -9,7 +9,7 @@ metadata:
   - href: https://www.legislation.gov.uk/uksi/2002/1792/schedule/IIA/paragraph/9/2019-02-01
     title: The State Pension Credit Regulations 2002
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
 values:
   2019-02-01: 53.34
   2020-04-01: 54.32
diff --git a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/child/disability/addition.yaml b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/child/disability/addition.yaml
index 6b30d7b40..ce818aa30 100644
--- a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/child/disability/addition.yaml
+++ b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/child/disability/addition.yaml
@@ -10,7 +10,7 @@ metadata:
   - href: https://www.legislation.gov.uk/uksi/2002/1792/schedule/IIA/paragraph/9/2019-02-01
     title: The State Pension Credit Regulations 2002
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
 values:
   2019-01-01: 29.02
   2020-04-01: 29.52
diff --git a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/child/disability/severe/addition.yaml b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/child/disability/severe/addition.yaml
index d5991e608..46235fbd2 100644
--- a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/child/disability/severe/addition.yaml
+++ b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/child/disability/severe/addition.yaml
@@ -10,7 +10,7 @@ metadata:
   - href: https://www.legislation.gov.uk/uksi/2002/1792/schedule/IIA/paragraph/9/2019-02-01
     title: The State Pension Credit Regulations 2002
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
 values:
   2019-02-01: 88.34
   2020-04-01: 92.12
diff --git a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/minimum_guarantee.yaml b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/minimum_guarantee.yaml
index bc4761374..4479eaeca 100644
--- a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/minimum_guarantee.yaml
+++ b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/minimum_guarantee.yaml
@@ -21,7 +21,7 @@ metadata:
   period: week
   name: pc_min_guarantee
   label: Pension Credit minimum guarantee
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   unit: currency-GBP
   reference:
     - title: The State Pension Credit Regulations 2002 reg. 6
diff --git a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/severe_disability/addition.yaml b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/severe_disability/addition.yaml
index 79e362404..63b9d64c6 100644
--- a/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/severe_disability/addition.yaml
+++ b/policyengine_uk/parameters/gov/dwp/pension_credit/guarantee_credit/severe_disability/addition.yaml
@@ -10,7 +10,7 @@ metadata:
   period: week
   name: pc_severe_disability_addition
   label: Pension Credit severe disability addition
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - title: The Social Security Benefits Up-rating Order 2022
       href: https://www.legislation.gov.uk/uksi/2022/292/article/30/made#article-30-2-c
\ No newline at end of file
diff --git a/policyengine_uk/parameters/gov/dwp/pension_credit/savings_credit/threshold.yaml b/policyengine_uk/parameters/gov/dwp/pension_credit/savings_credit/threshold.yaml
index c5b16f61f..30c7b1f04 100644
--- a/policyengine_uk/parameters/gov/dwp/pension_credit/savings_credit/threshold.yaml
+++ b/policyengine_uk/parameters/gov/dwp/pension_credit/savings_credit/threshold.yaml
@@ -28,7 +28,7 @@ COUPLE:
 metadata:
   unit: currency-GBP
   period: week
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   propagate_metadata_to_children: true
   reference:
     - title: The State Pension Credit Regulations 2002 reg. 7
diff --git a/policyengine_uk/parameters/gov/dwp/tax_credits/child_tax_credit/elements/child_element.yaml b/policyengine_uk/parameters/gov/dwp/tax_credits/child_tax_credit/elements/child_element.yaml
index 724d29807..fa08cf813 100644
--- a/policyengine_uk/parameters/gov/dwp/tax_credits/child_tax_credit/elements/child_element.yaml
+++ b/policyengine_uk/parameters/gov/dwp/tax_credits/child_tax_credit/elements/child_element.yaml
@@ -13,7 +13,7 @@ metadata:
   name: ctc_child
   label: "CTC child element"
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
     - https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=27
diff --git a/policyengine_uk/parameters/gov/dwp/tax_credits/child_tax_credit/elements/dis_child_element.yaml b/policyengine_uk/parameters/gov/dwp/tax_credits/child_tax_credit/elements/dis_child_element.yaml
index 50be2e0e5..f2d9c3460 100644
--- a/policyengine_uk/parameters/gov/dwp/tax_credits/child_tax_credit/elements/dis_child_element.yaml
+++ b/policyengine_uk/parameters/gov/dwp/tax_credits/child_tax_credit/elements/dis_child_element.yaml
@@ -19,7 +19,7 @@ metadata:
   unit: currency-GBP
   name: ctc_dis_child
   label: "CTC disabled child element"
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance,
     - https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=28
diff --git a/policyengine_uk/parameters/gov/dwp/tax_credits/child_tax_credit/elements/severe_dis_child_element.yaml b/policyengine_uk/parameters/gov/dwp/tax_credits/child_tax_credit/elements/severe_dis_child_element.yaml
index e843e3fc4..1a7d24e83 100644
--- a/policyengine_uk/parameters/gov/dwp/tax_credits/child_tax_credit/elements/severe_dis_child_element.yaml
+++ b/policyengine_uk/parameters/gov/dwp/tax_credits/child_tax_credit/elements/severe_dis_child_element.yaml
@@ -19,7 +19,7 @@ metadata:
   unit: currency-GBP
   name: ctc_severe_dis_child
   label: "CTC severely disabled child element"
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance,
     - https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=28
diff --git a/policyengine_uk/parameters/gov/dwp/tax_credits/means_test/income_threshold.yaml b/policyengine_uk/parameters/gov/dwp/tax_credits/means_test/income_threshold.yaml
index 12eebecac..af77f0df9 100644
--- a/policyengine_uk/parameters/gov/dwp/tax_credits/means_test/income_threshold.yaml
+++ b/policyengine_uk/parameters/gov/dwp/tax_credits/means_test/income_threshold.yaml
@@ -10,7 +10,7 @@ metadata:
   name: tc_income_threshold
   label: "Tax Credits income threshold"
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=28
     - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
diff --git a/policyengine_uk/parameters/gov/dwp/tax_credits/means_test/income_threshold_CTC_only.yaml b/policyengine_uk/parameters/gov/dwp/tax_credits/means_test/income_threshold_CTC_only.yaml
index 89fdc930a..42e26da41 100644
--- a/policyengine_uk/parameters/gov/dwp/tax_credits/means_test/income_threshold_CTC_only.yaml
+++ b/policyengine_uk/parameters/gov/dwp/tax_credits/means_test/income_threshold_CTC_only.yaml
@@ -7,7 +7,7 @@ values:
   2022-04-01: 17_005
 metadata:
   period: year
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   unit: currency-GBP
   name: ctc_income_threshold
   label: "CTC income threshold"
diff --git a/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/basic.yaml b/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/basic.yaml
index 194f6d0bc..2e8d81faa 100644
--- a/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/basic.yaml
+++ b/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/basic.yaml
@@ -25,7 +25,7 @@ metadata:
   unit: currency-GBP
   name: wtc_basic
   label: WTC basic element
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - title: The Working Tax Credit (Entitlement and Maximum Rate) Regulations 2002
       href: https://www.legislation.gov.uk/uksi/2002/2005/schedule/2
diff --git a/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/couple.yaml b/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/couple.yaml
index 92017826b..a886879df 100644
--- a/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/couple.yaml
+++ b/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/couple.yaml
@@ -25,7 +25,7 @@ metadata:
   unit: currency-GBP
   name: wtc_couple
   label: "WTC couple element"
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     title: The Working Tax Credit (Entitlement and Maximum Rate) Regulations 2002
     href: https://www.legislation.gov.uk/uksi/2002/2005/schedule/2
diff --git a/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/disabled.yaml b/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/disabled.yaml
index 0df175259..2851359e4 100644
--- a/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/disabled.yaml
+++ b/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/disabled.yaml
@@ -25,7 +25,7 @@ metadata:
   name: wtc_dis
   label: "WTC disability element"
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     title: The Working Tax Credit (Entitlement and Maximum Rate) Regulations 2002
     href: https://www.legislation.gov.uk/uksi/2002/2005/schedule/2
diff --git a/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/lone_parent.yaml b/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/lone_parent.yaml
index 5d26d174f..4259f90b1 100644
--- a/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/lone_parent.yaml
+++ b/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/lone_parent.yaml
@@ -25,7 +25,7 @@ metadata:
   unit: currency-GBP
   name: wtc_lone_parent
   label: "WTC lone parent element"
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     title: The Working Tax Credit (Entitlement and Maximum Rate) Regulations 2002
     href: https://www.legislation.gov.uk/uksi/2002/2005/schedule/2
diff --git a/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/severely_disabled.yaml b/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/severely_disabled.yaml
index b6616f41f..a17e14f31 100644
--- a/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/severely_disabled.yaml
+++ b/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/severely_disabled.yaml
@@ -25,7 +25,7 @@ metadata:
   unit: currency-GBP
   name: wtc_severe_dis
   label: "WTC severe disability element"
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     title: The Working Tax Credit (Entitlement and Maximum Rate) Regulations 2002
     href: https://www.legislation.gov.uk/uksi/2002/2005/schedule/2
diff --git a/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/worker.yaml b/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/worker.yaml
index 9063b6c6d..9a18e3784 100644
--- a/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/worker.yaml
+++ b/policyengine_uk/parameters/gov/dwp/tax_credits/working_tax_credit/elements/worker.yaml
@@ -22,7 +22,7 @@ values:
 metadata:
   period: year
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     title: The Working Tax Credit (Entitlement and Maximum Rate) Regulations 2002
     href: https://www.legislation.gov.uk/uksi/2002/2005/schedule/2
diff --git a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/carer/amount.yaml b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/carer/amount.yaml
index f01c3207e..dcd2c38de 100644
--- a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/carer/amount.yaml
+++ b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/carer/amount.yaml
@@ -13,7 +13,7 @@ metadata:
   unit: currency-GBP
   name: UC_carer_element
   label: "UC carer element"
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - name: The Universal Credit Regulations 2013 reg. 36
       href: https://www.legislation.gov.uk/uksi/2013/376/regulation/22/2021-04-12
diff --git a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/amount.yaml b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/amount.yaml
index 61153a3af..e19bb2d91 100644
--- a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/amount.yaml
+++ b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/amount.yaml
@@ -10,7 +10,7 @@ metadata:
   unit: currency-GBP
   name: UC_child_element
   label: "UC child element"
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - name: The Universal Credit Regulations 2013 reg. 36
       href: https://www.legislation.gov.uk/uksi/2013/376/regulation/22/2021-04-12
diff --git a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/disabled/amount.yaml b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/disabled/amount.yaml
index a5145cff1..6392eb846 100644
--- a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/disabled/amount.yaml
+++ b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/disabled/amount.yaml
@@ -10,7 +10,7 @@ metadata:
   unit: currency-GBP
   name: UC_disabled_element
   label: "UC disabled element"
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - name: The Universal Credit Regulations 2013 reg. 36
       href: https://www.legislation.gov.uk/uksi/2013/376/regulation/22/2021-04-12
diff --git a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/first/higher_amount.yaml b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/first/higher_amount.yaml
index d1b7a3c84..82f5cfccc 100644
--- a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/first/higher_amount.yaml
+++ b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/first/higher_amount.yaml
@@ -10,7 +10,7 @@ metadata:
   period: month
   name: UC_first_child_element
   label: "UC first child element"
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - name: The Universal Credit Regulations 2013 reg. 36
       href: https://www.legislation.gov.uk/uksi/2013/376/regulation/22/2021-04-12
diff --git a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/severely_disabled/amount.yaml b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/severely_disabled/amount.yaml
index 2626e3d40..ed6304d73 100644
--- a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/severely_disabled/amount.yaml
+++ b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/child/severely_disabled/amount.yaml
@@ -13,7 +13,7 @@ metadata:
   unit: currency-GBP
   name: UC_severely_disabled_element
   label: "UC severely disabled element"
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - name: The Universal Credit Regulations 2013 reg. 36
       href: https://www.legislation.gov.uk/uksi/2013/376/regulation/22/2021-04-12
diff --git a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/childcare/maximum.yaml b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/childcare/maximum.yaml
index 980e2ec92..3c54df2ce 100644
--- a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/childcare/maximum.yaml
+++ b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/childcare/maximum.yaml
@@ -18,7 +18,7 @@ description: Maximum childcare costs paid by Universal Credit by the number of e
 metadata:
   period: month
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - name: The Universal Credit Regulations 2013 reg. 36
       href: https://www.legislation.gov.uk/uksi/2013/376/regulation/22/2021-04-12
diff --git a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/disabled/amount.yaml b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/disabled/amount.yaml
index 3b36f8eac..d8d22371f 100644
--- a/policyengine_uk/parameters/gov/dwp/universal_credit/elements/disabled/amount.yaml
+++ b/policyengine_uk/parameters/gov/dwp/universal_credit/elements/disabled/amount.yaml
@@ -12,7 +12,7 @@ metadata:
   period: month
   name: UC_lcwra_element
   label: "UC disability element"
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   unit: currency-GBP
   reference:
     - name: The Universal Credit Regulations 2013 reg. 36
diff --git a/policyengine_uk/parameters/gov/dwp/universal_credit/means_test/work_allowance_with_housing.yaml b/policyengine_uk/parameters/gov/dwp/universal_credit/means_test/work_allowance_with_housing.yaml
index 0436bbaa5..d577d7316 100644
--- a/policyengine_uk/parameters/gov/dwp/universal_credit/means_test/work_allowance_with_housing.yaml
+++ b/policyengine_uk/parameters/gov/dwp/universal_credit/means_test/work_allowance_with_housing.yaml
@@ -14,7 +14,7 @@ metadata:
   name: UC_work_allowance_with_housing
   period: month
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     name: The Universal Credit Regulations 2013
     href: https://www.legislation.gov.uk/uksi/2013/376/regulation/22
diff --git a/policyengine_uk/parameters/gov/dwp/universal_credit/means_test/work_allowance_without_housing.yaml b/policyengine_uk/parameters/gov/dwp/universal_credit/means_test/work_allowance_without_housing.yaml
index 8eb4990ab..1c782218a 100644
--- a/policyengine_uk/parameters/gov/dwp/universal_credit/means_test/work_allowance_without_housing.yaml
+++ b/policyengine_uk/parameters/gov/dwp/universal_credit/means_test/work_allowance_without_housing.yaml
@@ -12,7 +12,7 @@ values:
 metadata:
   label: Universal Credit Work Allowance without housing support
   name: UC_work_allowance_without_housing
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   period: month
   unit: currency-GBP
   reference:
diff --git a/policyengine_uk/parameters/gov/dwp/universal_credit/standard_allowance/amount.yaml b/policyengine_uk/parameters/gov/dwp/universal_credit/standard_allowance/amount.yaml
index ed37d947c..7c7a7dc21 100644
--- a/policyengine_uk/parameters/gov/dwp/universal_credit/standard_allowance/amount.yaml
+++ b/policyengine_uk/parameters/gov/dwp/universal_credit/standard_allowance/amount.yaml
@@ -54,7 +54,7 @@ COUPLE_OLD:
     period: month
 metadata:
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   propagate_metadata_to_children: true
   reference:
     # Values.
diff --git a/policyengine_uk/parameters/gov/hmrc/child_benefit/amount/additional.yaml b/policyengine_uk/parameters/gov/hmrc/child_benefit/amount/additional.yaml
index 1a22a9bc3..33565cc6f 100644
--- a/policyengine_uk/parameters/gov/hmrc/child_benefit/amount/additional.yaml
+++ b/policyengine_uk/parameters/gov/hmrc/child_benefit/amount/additional.yaml
@@ -44,7 +44,7 @@ metadata:
   name: CB_additional
   period: week
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - title: The Tax Credits, Child Benefit and Guardian’s Allowance Up-rating Regulations 2021(5)(b)
       href: https://www.legislation.gov.uk/uksi/2021/156/regulation/5/made
diff --git a/policyengine_uk/parameters/gov/hmrc/child_benefit/amount/eldest.yaml b/policyengine_uk/parameters/gov/hmrc/child_benefit/amount/eldest.yaml
index 0b4aec16f..21d52deb0 100644
--- a/policyengine_uk/parameters/gov/hmrc/child_benefit/amount/eldest.yaml
+++ b/policyengine_uk/parameters/gov/hmrc/child_benefit/amount/eldest.yaml
@@ -41,7 +41,7 @@ metadata:
   name: CB_eldest
   unit: currency-GBP
   period: week
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - title: The Tax Credits, Child Benefit and Guardian’s Allowance Up-rating Regulations 2021(5)(b)
       href: https://www.legislation.gov.uk/uksi/2021/156/regulation/5/made
diff --git a/policyengine_uk/parameters/gov/hmrc/income_tax/allowances/personal_allowance/amount.yaml b/policyengine_uk/parameters/gov/hmrc/income_tax/allowances/personal_allowance/amount.yaml
index acda9138e..fb1456d06 100644
--- a/policyengine_uk/parameters/gov/hmrc/income_tax/allowances/personal_allowance/amount.yaml
+++ b/policyengine_uk/parameters/gov/hmrc/income_tax/allowances/personal_allowance/amount.yaml
@@ -13,7 +13,7 @@ metadata:
   name: personal_allowance
   label: Personal allowance
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - title: Income Tax Act 2007 s. 35
       href: https://www.legislation.gov.uk/ukpga/2007/3/section/35
diff --git a/policyengine_uk/parameters/gov/hmrc/income_tax/rates/uk.yaml b/policyengine_uk/parameters/gov/hmrc/income_tax/rates/uk.yaml
index c01a61432..da3470496 100644
--- a/policyengine_uk/parameters/gov/hmrc/income_tax/rates/uk.yaml
+++ b/policyengine_uk/parameters/gov/hmrc/income_tax/rates/uk.yaml
@@ -47,7 +47,7 @@ brackets:
       - href: https://www.legislation.gov.uk/ukpga/2022/3/section/2/enacted
         title: Finance Act 2022 s. 2
       unit: currency-GBP
-      uprating: calibration.uprating.september_cpi
+      uprating: gov.benefit_uprating_cpi
     values:
       2015-06-05: 32000
       2017-06-01: 33500
diff --git a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/lower_earnings_limit.yaml b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/lower_earnings_limit.yaml
index 991804c1e..abd12603a 100644
--- a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/lower_earnings_limit.yaml
+++ b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/lower_earnings_limit.yaml
@@ -6,7 +6,7 @@ metadata:
   - https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/882271/Table-a4.pdf
   - https://www.gov.uk/government/publications/rates-and-allowances-national-insurance-contributions/rates-and-allowances-national-insurance-contributions
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   label: NI Lower Earnings Limit
 values:
   2015-04-06: 112
diff --git a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/primary_threshold.yaml b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/primary_threshold.yaml
index 2d54102f8..00419a212 100644
--- a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/primary_threshold.yaml
+++ b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/primary_threshold.yaml
@@ -29,7 +29,7 @@ metadata:
   label: NI Primary Threshold
   name: NI_PT
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   period: week
   reference:
     - title: "GOV.UK | Rates and allowances: National Insurance contributions"
diff --git a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/secondary_threshold.yaml b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/secondary_threshold.yaml
index 5e7ce743e..d4bac076a 100644
--- a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/secondary_threshold.yaml
+++ b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/secondary_threshold.yaml
@@ -8,7 +8,7 @@ metadata:
   - https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/882271/Table-a4.pdf
   - https://www.gov.uk/government/publications/rates-and-allowances-national-insurance-contributions/rates-and-allowances-national-insurance-contributions
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
 values:
   2015-04-06: 155
   2016-04-06: 155
diff --git a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/upper_earnings_limit.yaml b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/upper_earnings_limit.yaml
index 96ef9d1f1..245d0a4fe 100644
--- a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/upper_earnings_limit.yaml
+++ b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/thresholds/upper_earnings_limit.yaml
@@ -11,7 +11,7 @@ values:
 metadata:
   label: NI Upper Earnings Limit
   unit: currency-GBP
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   period: week
   reference:
     - https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/882271/Table-a4.pdf
diff --git a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_4/thresholds/lower_profits_limit.yaml b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_4/thresholds/lower_profits_limit.yaml
index f84946d00..521d69dd0 100644
--- a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_4/thresholds/lower_profits_limit.yaml
+++ b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_4/thresholds/lower_profits_limit.yaml
@@ -22,7 +22,7 @@ metadata:
   label: NI Lower Profits Limit
   unit: currency-GBP
   period: year
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/882271/Table-a4.pdf
     - https://www.gov.uk/government/publications/rates-and-allowances-national-insurance-contributions/rates-and-allowances-national-insurance-contributions
diff --git a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_4/thresholds/upper_profits_limit.yaml b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_4/thresholds/upper_profits_limit.yaml
index 8acf98035..6011f3e34 100644
--- a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_4/thresholds/upper_profits_limit.yaml
+++ b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_4/thresholds/upper_profits_limit.yaml
@@ -13,7 +13,7 @@ metadata:
   name: NI_UPL
   unit: currency-GBP
   period: year
-  uprating: calibration.uprating.september_cpi
+  uprating: gov.benefit_uprating_cpi
   reference:
     - https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/882271/Table-a4.pdf
     - https://www.gov.uk/government/publications/rates-and-allowances-national-insurance-contributions/rates-and-allowances-national-insurance-contributions
diff --git a/policyengine_uk/reforms/benefit_inflation_uprating.py b/policyengine_uk/reforms/benefit_inflation_uprating.py
deleted file mode 100644
index dd06d3192..000000000
--- a/policyengine_uk/reforms/benefit_inflation_uprating.py
+++ /dev/null
@@ -1,102 +0,0 @@
-from policyengine_uk.model_api import *
-from typing import Union, Optional
-
-
-def benefit_uprating_reform(
-    rate: float,
-) -> Reform:
-    # Applies an increase to actual benefit amounts.
-    def modify_parameters(parameters):
-        dwp = parameters.gov.dwp
-        uc = dwp.universal_credit
-        sa = uc.standard_allowance.amount
-        pc = dwp.pension_credit
-        aa = dwp.attendance_allowance
-        pip = dwp.pip
-        dla = dwp.dla
-        hmrc = parameters.gov.hmrc
-        esa = dwp.ESA
-        jsa = dwp.JSA
-        tc = dwp.tax_credits
-        wtc = tc.working_tax_credit
-        ctc = tc.child_tax_credit
-        benefit_parameters = [
-            sa.SINGLE_YOUNG,
-            sa.SINGLE_OLD,
-            sa.COUPLE_YOUNG,
-            sa.COUPLE_OLD,
-            uc.elements.child.amount,
-            uc.elements.child.first.higher_amount,
-            uc.elements.child.disabled.amount,
-            uc.elements.child.severely_disabled.amount,
-            uc.elements.carer.amount,
-            uc.elements.childcare.maximum.children["1"],
-            uc.elements.childcare.maximum.children["2"],
-            uc.means_test.work_allowance_with_housing,
-            uc.means_test.work_allowance_without_housing,
-            pc.guarantee_credit.minimum_guarantee.SINGLE,
-            pc.guarantee_credit.minimum_guarantee.COUPLE,
-            pc.savings_credit.threshold.SINGLE,
-            pc.savings_credit.threshold.COUPLE,
-            aa.higher,
-            aa.lower,
-            pip.daily_living.standard,
-            pip.daily_living.enhanced,
-            pip.mobility.standard,
-            pip.mobility.enhanced,
-            dla.mobility.lower,
-            dla.mobility.higher,
-            dla.self_care.lower,
-            dla.self_care.higher,
-            dla.self_care.middle,
-            dwp.carers_allowance.rate,
-            dwp.carer_premium.single,
-            dwp.carer_premium.couple,
-            dwp.sda.maximum,
-            dwp.IIDB.maximum,
-            hmrc.child_benefit.amount.eldest,
-            hmrc.child_benefit.amount.additional,
-            esa.income.amount_18_24,
-            esa.income.amount_over_25,
-            esa.income.couple,
-            jsa.income.amount_18_24,
-            jsa.income.amount_over_25,
-            jsa.income.couple,
-            wtc.elements.basic,
-            wtc.elements.couple,
-            wtc.elements.lone_parent,
-            wtc.elements.worker,
-            wtc.elements.disabled,
-            wtc.elements.severely_disabled,
-            ctc.elements.child_element,
-            ctc.elements.dis_child_element,
-            ctc.elements.severe_dis_child_element,
-            tc.means_test.income_threshold,
-            tc.means_test.income_threshold_CTC_only,
-        ]
-        for parameter in benefit_parameters:
-            print(parameter.name)
-            for parameter_at_instant in parameter.values_list:
-                parameter_at_instant.value *= rate
-
-        for parameter in parameters.get_descendants():
-            if isinstance(parameter, ParameterNode):
-                parameter._at_instant_cache = {}
-        parameters._at_instant_cache = {}
-        return parameters
-
-    class reform(Reform):
-        def apply(self):
-            self.modify_parameters(modify_parameters)
-
-    return reform
-
-
-def create_benefit_inflation_uprating_reform(parameters, period):
-    uprating_amount = (
-        parameters.gov.contrib.benefit_uprating.inflation_adjustment(period)
-    )
-    if uprating_amount != 0:
-        return benefit_uprating_reform(
-            rate=1 + uprating_amount,
-        )
diff --git a/policyengine_uk/reforms/reforms.py b/policyengine_uk/reforms/reforms.py
index c035ef0c0..87ce137b6 100644
--- a/policyengine_uk/reforms/reforms.py
+++ b/policyengine_uk/reforms/reforms.py
@@ -1,7 +1,4 @@
 from .cps import create_marriage_tax_reform
-from .benefit_inflation_uprating import (
-    create_benefit_inflation_uprating_reform,
-)
 from policyengine_core.model_api import *
 from policyengine_core import periods
 
@@ -9,7 +6,6 @@
 def create_structural_reforms_from_parameters(parameters, period):
     period = periods.period(period)
     reforms = [
-        create_benefit_inflation_uprating_reform(parameters, period),
         create_marriage_tax_reform(parameters, period),
     ]
     reforms = tuple(filter(lambda x: x is not None, reforms))
diff --git a/policyengine_uk/system.py b/policyengine_uk/system.py
index 882d3a88f..d2adf8e5f 100644
--- a/policyengine_uk/system.py
+++ b/policyengine_uk/system.py
@@ -31,8 +31,8 @@ class CountryTaxBenefitSystem(TaxBenefitSystem):
     ]
     modelled_policies = COUNTRY_DIR / "modelled_policies.yaml"
 
-    def __init__(self):
-        super().__init__(entities)
+    def __init__(self, reform=None):
+        super().__init__(entities, reform=reform)
 
         self.parameters.add_child("baseline", self.parameters.clone())
 
diff --git a/setup.py b/setup.py
index 113bc506c..1f65bdac5 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@
         "microdf_python>=0.3.0",
         "pandas",
         "plotly>=4.14.3",
-        "PolicyEngine-Core>=2.8.1,<3",
+        "PolicyEngine-Core>=2.10,<3",
         "pyyaml>=5.3.1",
         "pytest",
         "requests>=2.25.1",