diff --git a/docs/openrpc-specs/v0.json b/docs/openrpc-specs/v0.json
index c94195259854..311537baadb7 100644
--- a/docs/openrpc-specs/v0.json
+++ b/docs/openrpc-specs/v0.json
@@ -9709,6 +9709,10 @@
             "type": "integer",
             "format": "int64"
           },
+          "UpgradeGoldenWeekHeight": {
+            "type": "integer",
+            "format": "int64"
+          },
           "UpgradeHyggeHeight": {
             "type": "integer",
             "format": "int64"
@@ -9804,6 +9808,10 @@
           "UpgradeWatermelonHeight": {
             "type": "integer",
             "format": "int64"
+          },
+          "UpgradeXxxHeight": {
+            "type": "integer",
+            "format": "int64"
           }
         },
         "required": [
@@ -9837,7 +9845,9 @@
           "UpgradeWaffleHeight",
           "UpgradeTuktukHeight",
           "UpgradeTeepHeight",
-          "UpgradeTockHeight"
+          "UpgradeTockHeight",
+          "UpgradeGoldenWeekHeight",
+          "UpgradeXxxHeight"
         ]
       },
       "GasTrace": {
diff --git a/docs/openrpc-specs/v1.json b/docs/openrpc-specs/v1.json
index 771a271767c5..cfa3682dff43 100644
--- a/docs/openrpc-specs/v1.json
+++ b/docs/openrpc-specs/v1.json
@@ -10090,6 +10090,10 @@
             "type": "integer",
             "format": "int64"
           },
+          "UpgradeGoldenWeekHeight": {
+            "type": "integer",
+            "format": "int64"
+          },
           "UpgradeHyggeHeight": {
             "type": "integer",
             "format": "int64"
@@ -10185,6 +10189,10 @@
           "UpgradeWatermelonHeight": {
             "type": "integer",
             "format": "int64"
+          },
+          "UpgradeXxxHeight": {
+            "type": "integer",
+            "format": "int64"
           }
         },
         "required": [
@@ -10218,7 +10226,9 @@
           "UpgradeWaffleHeight",
           "UpgradeTuktukHeight",
           "UpgradeTeepHeight",
-          "UpgradeTockHeight"
+          "UpgradeTockHeight",
+          "UpgradeGoldenWeekHeight",
+          "UpgradeXxxHeight"
         ]
       },
       "GasTrace": {
diff --git a/src/rpc/methods/state.rs b/src/rpc/methods/state.rs
index fe3d66a18707..cc2f86d6b9f1 100644
--- a/src/rpc/methods/state.rs
+++ b/src/rpc/methods/state.rs
@@ -3142,8 +3142,8 @@ pub struct ForkUpgradeParams {
     upgrade_tuktuk_height: ChainEpoch,
     upgrade_teep_height: ChainEpoch,
     upgrade_tock_height: ChainEpoch,
-    //upgrade_golden_week_height: ChainEpoch,
-    //upgrade_xxx_height: ChainEpoch,
+    upgrade_golden_week_height: ChainEpoch,
+    upgrade_xxx_height: ChainEpoch,
 }
 
 impl TryFrom<&ChainConfig> for ForkUpgradeParams {
@@ -3191,8 +3191,8 @@ impl TryFrom<&ChainConfig> for ForkUpgradeParams {
             upgrade_tuktuk_height: get_height(TukTuk)?,
             upgrade_teep_height: get_height(Teep)?,
             upgrade_tock_height: get_height(Tock)?,
-            //upgrade_golden_week_height: get_height(GoldenWeek)?,
-            //upgrade_xxx_height: get_height(Xxx)?,
+            upgrade_golden_week_height: get_height(GoldenWeek)?,
+            upgrade_xxx_height: get_height(Xxx)?,
         })
     }
 }
diff --git a/src/rpc/snapshots/forest__rpc__tests__rpc__v0.snap b/src/rpc/snapshots/forest__rpc__tests__rpc__v0.snap
index f38d34079dcb..72f94e835831 100644
--- a/src/rpc/snapshots/forest__rpc__tests__rpc__v0.snap
+++ b/src/rpc/snapshots/forest__rpc__tests__rpc__v0.snap
@@ -6133,6 +6133,9 @@ components:
         UpgradeDragonHeight:
           type: integer
           format: int64
+        UpgradeGoldenWeekHeight:
+          type: integer
+          format: int64
         UpgradeHyggeHeight:
           type: integer
           format: int64
@@ -6205,6 +6208,9 @@ components:
         UpgradeWatermelonHeight:
           type: integer
           format: int64
+        UpgradeXxxHeight:
+          type: integer
+          format: int64
       required:
         - UpgradeSmokeHeight
         - UpgradeBreezeHeight
@@ -6237,6 +6243,8 @@ components:
         - UpgradeTuktukHeight
         - UpgradeTeepHeight
         - UpgradeTockHeight
+        - UpgradeGoldenWeekHeight
+        - UpgradeXxxHeight
     GasTrace:
       type: object
       properties:
diff --git a/src/rpc/snapshots/forest__rpc__tests__rpc__v1.snap b/src/rpc/snapshots/forest__rpc__tests__rpc__v1.snap
index bd521775b553..281aa2dd4db8 100644
--- a/src/rpc/snapshots/forest__rpc__tests__rpc__v1.snap
+++ b/src/rpc/snapshots/forest__rpc__tests__rpc__v1.snap
@@ -6371,6 +6371,9 @@ components:
         UpgradeDragonHeight:
           type: integer
           format: int64
+        UpgradeGoldenWeekHeight:
+          type: integer
+          format: int64
         UpgradeHyggeHeight:
           type: integer
           format: int64
@@ -6443,6 +6446,9 @@ components:
         UpgradeWatermelonHeight:
           type: integer
           format: int64
+        UpgradeXxxHeight:
+          type: integer
+          format: int64
       required:
         - UpgradeSmokeHeight
         - UpgradeBreezeHeight
@@ -6475,6 +6481,8 @@ components:
         - UpgradeTuktukHeight
         - UpgradeTeepHeight
         - UpgradeTockHeight
+        - UpgradeGoldenWeekHeight
+        - UpgradeXxxHeight
     GasTrace:
       type: object
       properties: