diff --git a/.wordlist.txt b/.wordlist.txt
index 25ff658..14c8ad7 100644
--- a/.wordlist.txt
+++ b/.wordlist.txt
@@ -1,141 +1,147 @@
-Crafter
-Goerli
-TODO
-github
-goerli
-https
-makerdao
-DAO
-SubDAO
-Onboarding
-YYYY
-MIPs
-Pragma
-solc
-Onboarding
-Onboardings
-Onboarded
-TOFIX
+AGPLv
+antipattern
+Antipatterns
+arg
+args
+auctionDuration
+auth
+authed
+authing
+AutoLine
+bytecode
 Calc
-JoinFab
-Etherscan
+CalcFab
+casted
+ChainLog
+checksummed
+Cleanup
 ClipFab
-DSS
-DssExecLib
-ExecLib
+collateralization
+collaterals
+config
+configs
+Crafter
+cron
+CUs
+DAI
+Daiwanese
+DAO
+deployer
+dev
+developerguides
 diffcheck
 diffchecked
-ChainLog
-env
+diffchecker
+ds
+DSS
+DssExecLib
+DssVestTransferrable
 EIP
-gwei
-RPC
-RWA
-MCD
+env
+EOA
+EOAs
+ERC
+ESM
+Etherscan
+EthTx
+evmVersion
+ExecLib
 Filable
-DAI
-Lerps
-MKR
-developerguides
-Mainnet
-casted
-submodule
+Fileable
+fileables
+Getter
+github
+goerli
+Goerli
+gwei
+hardcoded
+https
+IAM
+immutable
+immutables
+Integrations
 IPFS
-config
-Repo
-repos
-arg
-args
-deployer
-diffchecker
-Starknet
-upgradable
+JoinFab
+kprFlatReward
+kprPctReward
 Lerp
+Lerps
+LinearDecrease
+liquidationPenalty
+liquidationRatio
+LitePSM
+LPs
+Mainnet
+makerdao
+MCD
+medianizer
+MegaPoker
+MIPs
+MKR
+Monetalis
+multisig
+NatSpec
+OCU
+Offboarded
 Offboarding
 Offboardings
-Offboarded
-AutoLine
-RWAXXX
-CUs
-AGPLv
-evmVersion
-Cleanup
-CalcFab
+Onboarded
+Onboarding
+Onboarding
+Onboardings
+OpenZeppelin
+OSM
+params
+permissioned
+permissioning
+permittedDrop
+Pragma
 Pre
-OCU
-MegaPoker
-TechOps
+precomputed
+PR'ed
+prepended
+PSM
 README
-OSM
-medianizer
-LPs
-ERC
-auth
-authed
+redemptions
+Repo
+repos
+RPC
+RWA
+RWAXXX
+setIlkAutoLineDebtCeiling
+setIlkAutoLineParameters
 setIlkDebtCeiling
 setIlkMaxLiquidationAmount
 setIlkMinVaultAmount
-liquidationPenalty
 setIlkStabilityFee
-liquidationRatio
-startingPriceFactor
-setLiquidationBreakerPriceTolerance
-auctionDuration
-permittedDrop
-kprPctReward
-kprFlatReward
-LinearDecrease
 setLinearDecrease
-StairstepExponentialDecrease
+setLiquidationBreakerPriceTolerance
 setStairstepExponentialDecrease
-setIlkAutoLineParameters
-cron
+solc
+Solmate
+SPDX
+StairstepExponentialDecrease
+Starknet
+startingPriceFactor
+structs
+SubDAO
+SubDAOs
+submodule
 submodule
 submodules
-ds
-Integrations
-Monetalis
-precomputed
-IAM
-Timestamps
-vscode
-EthTx
+SubProxy
+TechOps
+TeleportGateway
 TeleportJoin
 TeleportRouter
-TeleportGateway
+testnet
+testnets
+Timestamps
+TODO
+TOFIX
 uint
-DssVestTransferrable
-antipattern
-Antipatterns
 upgradability
-Daiwanese
-permissioned
-permissioning
+upgradable
+vscode
 whitespace
-immutable
-immutables
-Fileable
-structs
-NatSpec
-Getter
-SPDX
-prepended
-OpenZeppelin
-Solmate
-setIlkAutoLineDebtCeiling
-ESM
-testnet
-testnets
-authing
-hardcoded
-fileables
-configs
-SubDAOs
-EOAs
-SubProxy
-PR'ed
-multisig
-EOA
-redemptions
-checksummed
-collaterals
+YYYY
diff --git a/spell/psm-checklists.md b/spell/psm-checklists.md
new file mode 100644
index 0000000..ffe3814
--- /dev/null
+++ b/spell/psm-checklists.md
@@ -0,0 +1,168 @@
+# PSM Checklists
+
+## PSM Migration Checklist
+
+- [ ] IF contracts are being on-boarded in the current spell, execute the full [LitePSM On-boarding Checklist](#litepsm-on-boarding-checklist)
+- [ ] IF a PSM is deprecated in the migration, execute the full [PSM Off-boarding Checklist](#psm-off-boarding-checklist)
+- [ ] IF present, max amount of gems to move (`dstWant`) matches the Exec Sheet
+- [ ] IF present, min amount of gems to keep (`srcKeep`) matches the Exec Sheet
+- Source PSM:
+    - [ ] ilk matches source PSM
+    - [ ] IF present, `tin` matches the value in the Exec Sheet
+    - [ ] IF present, `tout` matches the value in the Exec Sheet
+    - [ ] `AutoLine` is updated according to the Exec Sheet
+- Destination PSM:
+    - [ ] ilk matches destination PSM
+    - [ ] IF present, `tin` matches the value in the Exec Sheet
+    - [ ] IF present, `tout` matches the value in the Exec Sheet
+    - [ ] `AutoLine` is updated according to the Exec Sheet
+    - [ ] `buf` matches the value in the Exec Sheet
+    - [ ] `fill` is called conditionally (`if(rush() > 0)`) to ensure liquidity is immediately available after spell execution
+- Test coverage:
+    - [ ] Collateral amount that is fetched from the source PSM matches the collateral is added to the destination PSM
+        - [ ] `vat.urns(DST_ILK, dstPsm).art` is increased **at least** by the moved amount
+        - [ ] `gem` balance of `dstPocket` is increased **exactly** by the moved amount
+        - [ ] Dai balance of `dstPsm` is equal to `dstBuf`, UNLESS limited by the debt ceiling (`line`)
+        - [ ] `vat.urns(SRC_ILK, srcPsm).art` is decreased **exactly** by the moved amount
+        - [ ] `vat.urns(SRC_ILK, srcPsm).ink` is decreased **exactly** by the moved amount
+        - [ ] `gem` balance of `srcPsm.gemJoin()` is decreased **exactly** by the moved amount
+    - [ ] No bad debt is left behind
+        - [ ] `vat.vice()` is unchanged after the spell execution
+        - [ ] `vat.sin(MCD_PAUSE_PROXY)` is unchanged after the spell execution
+
+## LitePSM On-boarding Checklist
+
+- Deployed Contracts
+    - `DssLitePsm`
+        - [ ] Optimizer is **enabled**
+        - [ ] Optimize runs is set to `200`
+        - [ ] Contract has been reviewed by minimum 2 specialized [Active Ecosystem Actors](https://mips.makerdao.com/mips/details/MIP101#2-8-2-active-ecosystem-actors)
+        - [ ] Contract has been audited by an external party
+            - [ ] Audit report source could be confirmed (i.e. found on auditor's website)
+            - [ ] All issues found were fixed or acknowledged
+            - [ ] No code changes are done after final audit report, based on the commit hash found in the report + 
+              - [ ] EITHER code diff check for each individual file
+              - [ ] OR bytecode verification tool such as `forge verify-bytecode`
+        - [ ] Deployed contract matches the code in the [repo](https://github.com/makerdao/dss-lite-psm/)
+        - Constructor params:
+            - [ ] ilk is named `LITE-PSM-{TOKEN_SYMBOL}-A` (i.e. `LITE-PSM-USDC-A`)
+            - [ ] `gem` matches the expected token address
+            - [ ] `daiJoin` matches `MCD_JOIN_DAI` from the chainlog
+            - [ ] `pocket` matches the pocket address in the Exec Sheet
+        - [ ] Deployer no longer has privileged access (`wards(deployer) == 0`)
+        - [ ] `MCD_PAUSE_PROXY` has been authed (i.e. `require(WardsLike(LITE_PSM).wards(MCD_PAUSE_PROXY) == 1)`)
+        - [ ] Sanity check: `DssLitePsm` has `type(uint256).max` approval to spend `gem` on behalf of `pocket`
+    - `DssLitePsmMom`
+        - [ ] Optimizer is **enabled**
+        - [ ] Optimize runs is set to `200`
+        - [ ] Contract has been reviewed by minimum 2 specialized [Active Ecosystem Actors](https://mips.makerdao.com/mips/details/MIP101#2-8-2-active-ecosystem-actors)
+        - [ ] Contract has been audited by an external party
+            - [ ] Audit report source could be confirmed (i.e. found on auditor's website)
+            - [ ] All issues found were fixed or acknowledged
+            - [ ] No code changes are done after final audit report, based on the commit hash found in the report + 
+              - [ ] EITHER code diff check for each individual file
+              - [ ] OR bytecode verification tool such as `forge verify-bytecode`
+        - [ ] Deployed contract matches the code in the [repo](https://github.com/makerdao/dss-lite-psm/)
+        - [ ] Deployer is no longer the `owner`
+        - [ ] `MCD_PAUSE_PROXY` is the `owner` of the contract (i.e. `require(MomLike(MOM).owner() == MCD_PAUSE_PROXY`))
+    - `LitePsmJob`
+        - [ ] Uses the default Solidity version in [`dss-cron`](https://github.com/makerdao/dss-cron)
+        - [ ] Optimizer is **enabled**
+        - [ ] Deployed contract matches the code in the [repo](https://github.com/makerdao/dss-cron)
+        - Constructor params:
+            - [ ] `_sequencer` matches `CRON_SEQUENCER` address from the chainlog
+            - [ ] `_litePsm` matches `DssLitePsm` address
+            - [ ] `_rushThreshold` matches the Exec Sheet (it might be named as "fill threshold")
+            - [ ] `_gushThreshold` matches the Exec Sheet (it might be named as "trim threshold")
+            - [ ] `_cutThreshold` matches the Exec Sheet (it might be named as "chug threshold")
+- Initialization
+    - `DssLitePsm`:
+        - [ ] `buf` is set to the value specified in the Exec Sheet
+        - [ ] `vow` is set to `MCD_VOW` from the chainlog
+        - [ ] `MCD_PAUSE_PROXY` is whitelisted to execute swaps with no fees (i.e. `KissLike(LITE_PSM).kiss(MCD_PAUSE_PROXY)`)
+        - [ ] `DssLitePsmMom` is authed (i.e. `RelyLike(LITE_PSM).rely(MOM)`)
+    - `DssLitePsmMom`:
+        - [ ] The chief (`MCD_ADM`) is set as the `authority` (i.e. `MomLike(MOM).setAuthority(MCD_ADM)`)
+    - `LitePsmJob`:
+        - [ ] Job is added to `CRON_SEQUENCER`
+    - [ ] `MCD_VAT`: new ilk is initialized
+    - [ ] `MCD_JUG`: new ilk is initialized
+    - `MCD_SPOT`:
+        - [ ] Sanity check: Dai parity (`par`) current value is 1 (`1 * RAY`)
+        - [ ] Collateralization ratio (`mat`) is set to 100% (`1 * WAD`) for the ilk 
+        - IF a new `pip` is being used:
+            - [ ] `pip` is set for the ilk
+            - [ ] `pip` is a `DSValue` instance
+            - [ ] The value on `pip` is set to 1 (`1 * WAD`)
+            - [ ] `pip` deployer is no longer the `owner`
+            - [ ] `MCD_PAUSE_PROXY` is the `owner` on `pip`
+        - OTHERWISE when reusing an existing `pip`:
+            - [ ] `pip` is set for the ilk
+            - [ ] `pip` in the chainlog matches `gem` symbol (i.e. `PIP_USDC` for `USDC`)
+    - [ ] `ILK_REGISTRY`: new ilk is added to the registry
+    - `CHAINLOG`:
+        - [ ] `DssLitePsm` is added to the chainlog and `addresses_mainnet.sol` according to the Exec Sheet
+        - [ ] `pocket` is added to the chainlog and `addresses_mainnet.sol` according to the Exec Sheet
+        - [ ] `DssLitePsmMom` is added to the chainlog and `addresses_mainnet.sol` according to the Exec Sheet
+        - [ ] `LitePsmJob` is added to the chainlog and `addresses_mainnet.sol` according to the Exec Sheet
+        - [ ] IF a new `pip` is being added, it is added to the chainlog and `addresses_mainnet.sol` as `PIP_{TOKEN_SYMBOL}` (i.e. `PIP_USDC`)
+- Test coverage:
+    - `DssLitePsm`:
+        - [ ] `vow` is set to `MCD_VOW`
+        - [ ] `buf` matches the Exec Sheet
+        - [ ] `MCD_PAUSE_PROXY` is whitelisted to execute swaps with no fees (i.e. `KissLike(LITE_PSM).bud(MCD_PAUSE_PROXY) == 1`)
+        - [ ] `DssLitePsmMom` is authed (i.e. `WardsLike(LITE_PSM).wards(MOM) == 1`)
+        - E2E tests:
+            - [ ] `buyGem` works as expected
+            - [ ] `sellGem` works as expected
+            - [ ] `buyGemNoFee` works as expected
+            - [ ] `sellGemNoFee` works as expected
+    - `DssLitePsmMom`:
+        - Chief (`MCD_ADM`) is set as the `authority` (i.e. `MomLike(MOM).authority() == MCD_ADM`)
+        - E2E tests:
+            - [ ] `halt` works as expected
+    - `LitePsmJob`: 
+        - [ ] Job is added to `CRON_SEQUENCER` (i.e.: `SequencerLike(CRON_SEQUENCER).hasJob(LITE_PSM_JOB) == true`)
+        - [ ] `_sequencer` matches `CRON_SEQUENCER` address from the chainlog
+        - [ ] `_litePsm` matches `DssLitePsm` address
+        - [ ] `_rushThreshold` matches the Exec Sheet (it might be named as "fill threshold")
+        - [ ] `_gushThreshold` matches the Exec Sheet (it might be named as "trim threshold")
+        - [ ] `_cutThreshold` matches the Exec Sheet (it might be named as "chug threshold")
+        - E2E tests:
+            - [ ] `workable` returns the correct value:
+                - [ ] IF `rush() > 0`, returns `(true, litePsm.fill.selector)`
+                - [ ] OTHERWISE IF `cut() > 0`, returns `(true, litePsm.chug.selector)`
+                - [ ] OTHERWISE IF `gush() > 0`, returns `(true, litePsm.trim.selector)`
+                - [ ] OTHERWISE returns `(false, "")`
+            - [ ] `work` has the desired effect:
+                - [ ] IF `rush() > 0`, `fill` is called
+                - [ ] OTHERWISE IF `cut() > 0`, `chug` is called
+                - [ ] OTHERWISE IF `gush() > 0`, `trim` is called
+                - [ ] OTHERWISE reverts
+    - [ ] `MCD_VAT`: `urns[ilk][LITE_PSM].ink` is set to the max value that will not cause an overflow (`int256(type(uint256).max / RAY)`)
+    - [ ] `MCD_JUG`: Stability fee (`duty`) is set to 0% (`1 * RAY`) for the ilk (:information_source: covered in `config.sol`)
+    - `MCD_SPOT`:
+        - [ ] `spotter(DST_ILK).mat` is set to 100% (`1 * RAY`) (:information_source: covered in `config.sol`)
+        - [ ] `spotter(DST_ILK).pip` is set correctly 
+    - [ ] `CHAINLOG`: version is bumped: `{x}.{y}.{z+1}` (:information_source: covered in `config.sol`)
+    - `ILK_REGISTRY`:
+        - [ ] New ilk is added to the registry
+        - [ ] `name` matches `gem` name
+        - [ ] `symbol` matches `gem` symbol
+        - [ ] `class` for join-less ilks is used (`REG_CLASS = 6`)
+        - [ ] `gem` matches the configured gem
+        - [ ] `pip` matches the configured pip
+        - [ ] `gemJoin` is set to `address(0)`
+        - [ ] `clip` is set to `address(0)`
+
+## PSM Off-boarding Checklist
+
+- [ ] ilk is removed from `AutoLine`
+- [ ] ilk `line` is set to `0`
+- [ ] `ink` for the PSM is set to 0 on `MCD_VAT` after execution, UNLESS there has been a donation
+- [ ] Global `Line` is adjusted accordingly
+- [ ] ilk is removed from `ILK_REGISTRY`
+- [ ] PSM contracts (`Psm`, `GemJoin` and others, as applicable) are being removed from the chainlog
+- [ ] Chainlog version is bumped: `{x}.{y+1}.0`
+- [ ] PSM contracts (`Psm`, `GemJoin` and others, as applicable) are being scuttled
+    - [ ] `MCD_PAUSE_PROXY` is de-authed from all applicable contracts
diff --git a/spell/spell-reviewer-mainnet-checklist.md b/spell/spell-reviewer-mainnet-checklist.md
index 5faf437..4668620 100644
--- a/spell/spell-reviewer-mainnet-checklist.md
+++ b/spell/spell-reviewer-mainnet-checklist.md
@@ -140,6 +140,9 @@
     * [Collateral Onboarding](./collateral-onboarding-checklist.md)
     * [RWA Onboarding](./rwa-onboarding-checklist.md)
     * [Teleport Onboarding](./teleport-onboarding-checklist.md)
+* IF PSM migration, onboarding or offboarding is present:
+  * [ ] Insert and follow the relevant checklists below:
+    * [PSM Checklists](./psm-checklists.md)
 * IF collateral offboarding is present in the spell
   * 1st stage collateral offboarding
     * [ ] Collateral type (`ilk`) is removed from AutoLine (`MCD_IAM_AUTO_LINE`) IF currently enabled