diff --git a/CHANGELOG.md b/CHANGELOG.md
index a577fda6333..77051b1b85b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,9 @@
 - [#5053](https://github.com/ChainSafe/forest/pull/5053) Added support for the
   NV25 _Teep_ network upgrade for `2k` and `butterflynet` networks.
 
+- [#5040](https://github.com/ChainSafe/forest/issues/5040) Added support for the
+  NV25 _Teep_ network upgrade for `calibration` network.
+
 ### Changed
 
 ### Removed
diff --git a/build/manifest.json b/build/manifest.json
index 785ff671ea3..4749d728666 100644
--- a/build/manifest.json
+++ b/build/manifest.json
@@ -966,6 +966,98 @@
       "actor_list_cid": "bafy2bzacecdrk2d3hpoey65nconxq4hklxho6rsl7s4y6bdljzxgqcve7moo2"
     }
   },
+  {
+    "network": {
+      "type": "calibnet"
+    },
+    "version": "v16.0.0-rc1",
+    "bundle_cid": "bafy2bzacecnhy2ffkabgzkvbjh26ne7ssi6w4ze5wivs5xvblzjeoolwt7cik",
+    "manifest": {
+      "actors": [
+        [
+          "system",
+          1,
+          "bafk2bzacebzreyva3m7svmdk7rvrg2e2kgomhhjhlgohdqhghyefanst4q2xi"
+        ],
+        [
+          "init",
+          2,
+          "bafk2bzaceapbix6qtxgy7uqeufs2sgpkbrvh24f2d25k35ijaibte5vv7v22w"
+        ],
+        [
+          "cron",
+          3,
+          "bafk2bzacebyatbqsjismirnvq3xrnukkt6nxbrvpbn6nqlcjjrqvoi5kta4po"
+        ],
+        [
+          "account",
+          4,
+          "bafk2bzacebhtin3dmygqrknd4lklq54acuty6xzkmk6ns3xbu64bgbudhjg7q"
+        ],
+        [
+          "storagepower",
+          5,
+          "bafk2bzaceakvmhul2njhpbqlegop4nid64h37opx47jjxqwdoqsxo7zbo4qjs"
+        ],
+        [
+          "storageminer",
+          6,
+          "bafk2bzacec52wt3anzm2rzfk6kzgdxgaooa2p26fbslgmexxmgnyefiou774g"
+        ],
+        [
+          "storagemarket",
+          7,
+          "bafk2bzaceclswjt5oxdwtrchrmlz3p4jo5i7wpv3j5rmosdvizafdwctuvox2"
+        ],
+        [
+          "paymentchannel",
+          8,
+          "bafk2bzacecofzu4t4jgda6uzg4hnla432egslx4o5lw6deytee66ddpkyh3w2"
+        ],
+        [
+          "multisig",
+          9,
+          "bafk2bzacebt4uhg46auji5hqtabmtcxb2pryex4dgcf66w7asdnzm24kc3xak"
+        ],
+        [
+          "reward",
+          10,
+          "bafk2bzacebvl5mzxtqrzavh7nigwiuuarsrht5c6q566ilw4azzbl7sthqj7o"
+        ],
+        [
+          "verifiedregistry",
+          11,
+          "bafk2bzaceavjhcx4kn7h4pjkydih7al2rrzpw3vatp4qnrmydmp56epsem76i"
+        ],
+        [
+          "datacap",
+          12,
+          "bafk2bzacecrkvyfc7u4ugyduc452jym5jh3tsdouyni4lrk7hjbo27fbdwuuc"
+        ],
+        [
+          "placeholder",
+          13,
+          "bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"
+        ],
+        [
+          "evm",
+          14,
+          "bafk2bzacedznjpmamqff5h3soivlqtcsjftgpuek3sbkhnxma2fkkvvsm2onw"
+        ],
+        [
+          "eam",
+          15,
+          "bafk2bzacecqrk6orfccd6aqcm3y5edtffy6psrb7pfz55bhf767bicokmogz2"
+        ],
+        [
+          "ethaccount",
+          16,
+          "bafk2bzaceauk66kcd33z3fxg5od2mcugtfimpfkzbcl5yuypboapcbclzqodu"
+        ]
+      ],
+      "actor_list_cid": "bafy2bzacecjjtxk67oq7zjbuoqbbn2byh35famdfq2ddtgrawxvqtl4qxzyc6"
+    }
+  },
   {
     "network": {
       "type": "butterflynet"
diff --git a/src/networks/actors_bundle.rs b/src/networks/actors_bundle.rs
index 04513c28980..7d547fb937b 100644
--- a/src/networks/actors_bundle.rs
+++ b/src/networks/actors_bundle.rs
@@ -82,6 +82,7 @@ pub static ACTOR_BUNDLES: Lazy<Box<[ActorBundleInfo]>> = Lazy::new(|| {
         "bafy2bzacect4ktyujrwp6mjlsitnpvuw2pbuppz6w52sfljyo4agjevzm75qs" @ "v13.0.0" for "calibrationnet",
         "bafy2bzacebq3hncszqpojglh2dkwekybq4zn6qpc4gceqbx36wndps5qehtau" @ "v14.0.0-rc.1" for "calibrationnet",
         "bafy2bzaceax5zkysst7vtyup4whdxwzlpnaya3qp34rnoi6gyt4pongps7obw" @ "v15.0.0-rc1" for "calibrationnet",
+        "bafy2bzacecnhy2ffkabgzkvbjh26ne7ssi6w4ze5wivs5xvblzjeoolwt7cik" @ "v16.0.0-rc1" for "calibrationnet",
         "bafy2bzacearjal5rsmzloz3ny7aoju2rgw66wgxdrydgg27thcsazbmf5qihq" @ "v15.0.0-rc1" for "butterflynet",
         "bafy2bzaced3uzaynkdi7wiqiwbje7l3lllpwbokuf7slak627gx7bk5pryjpa" @ "v16.0.0-dev" for "butterflynet",
         "bafy2bzacedozk3jh2j4nobqotkbofodq4chbrabioxbfrygpldgoxs3zwgggk" @ "v9.0.3" for "devnet",
diff --git a/src/networks/calibnet/mod.rs b/src/networks/calibnet/mod.rs
index 774d7c6298f..3abdab64c10 100644
--- a/src/networks/calibnet/mod.rs
+++ b/src/networks/calibnet/mod.rs
@@ -75,8 +75,8 @@ pub static HEIGHT_INFOS: Lazy<HashMap<Height, HeightInfo>> = Lazy::new(|| {
         make_height!(Waffle, 1_779_094, get_bundle_cid("v14.0.0-rc.1")),
         // 2024-10-23T13:30:00Z
         make_height!(TukTuk, 2_078_794, get_bundle_cid("v15.0.0-rc1")),
-        // TODO(forest): https://github.com/ChainSafe/forest/issues/5040
-        make_height!(Teep, i64::MAX, get_bundle_cid("v15.0.0-rc1")),
+        // Mon 16 Dec 23:00:00 UTC 2024
+        make_height!(Teep, 2_235_454, get_bundle_cid("v16.0.0-rc1")),
     ])
 });
 
diff --git a/src/state_migration/mod.rs b/src/state_migration/mod.rs
index e124844a2cf..74571db84fc 100644
--- a/src/state_migration/mod.rs
+++ b/src/state_migration/mod.rs
@@ -64,8 +64,7 @@ where
                 (Height::Dragon, nv22::run_migration::<DB>),
                 (Height::DragonFix, nv22fix::run_migration::<DB>),
                 (Height::Waffle, nv23::run_migration::<DB>),
-                // TODO(forest): https://github.com/ChainSafe/forest/issues/5040
-                // (Height::Teep, nv25::run_migration::<DB>),
+                (Height::Teep, nv25::run_migration::<DB>),
             ]
         }
         NetworkChain::Butterflynet => {