diff --git a/pricing/google.json b/pricing/google.json
index 6ae662f67..39c52cc4b 100644
--- a/pricing/google.json
+++ b/pricing/google.json
@@ -2234,142 +2234,6 @@
     }
   },
   "gemini-3.1-pro-preview-lte-200k": {
-    "pricing_config": {
-      "pay_as_you_go": {
-        "request_token": {
-          "price": 0.0002
-        },
-        "response_token": {
-          "price": 0.0012
-        },
-        "cache_write_input_token": {
-          "price": 0.00002
-        },
-        "cache_read_input_token": {
-          "price": 0.00045
-        },
-        "additional_units": {
-          "web_search": {
-            "price": 3.5
-          },
-          "search": {
-            "price": 3.5
-          }
-        }
-      },
-      "batch_config": {
-        "request_token": {
-          "price": 0.0001
-        },
-        "response_token": {
-          "price": 0.0006
-        }
-      }
-    }
-  },
-  "gemini-3.1-pro-preview-gt-200k": {
-    "pricing_config": {
-      "pay_as_you_go": {
-        "request_token": {
-          "price": 0.0004
-        },
-        "response_token": {
-          "price": 0.0018
-        },
-        "cache_write_input_token": {
-          "price": 0.00004
-        },
-        "cache_read_input_token": {
-          "price": 0.00045
-        },
-        "additional_units": {
-          "web_search": {
-            "price": 3.5
-          },
-          "search": {
-            "price": 3.5
-          }
-        }
-      },
-      "batch_config": {
-        "request_token": {
-          "price": 0.0002
-        },
-        "response_token": {
-          "price": 0.0009
-        }
-      }
-    }
-  },
-  "gemini-3.1-pro-preview-customtools-lte-200k": {
-    "pricing_config": {
-      "pay_as_you_go": {
-        "request_token": {
-          "price": 0.0002
-        },
-        "response_token": {
-          "price": 0.0012
-        },
-        "cache_write_input_token": {
-          "price": 0.00002
-        },
-        "cache_read_input_token": {
-          "price": 0.00045
-        },
-        "additional_units": {
-          "web_search": {
-            "price": 3.5
-          },
-          "search": {
-            "price": 3.5
-          }
-        }
-      },
-      "batch_config": {
-        "request_token": {
-          "price": 0.0001
-        },
-        "response_token": {
-          "price": 0.0006
-        }
-      }
-    }
-  },
-  "gemini-3.1-pro-preview-customtools-gt-200k": {
-    "pricing_config": {
-      "pay_as_you_go": {
-        "request_token": {
-          "price": 0.0004
-        },
-        "response_token": {
-          "price": 0.0018
-        },
-        "cache_write_input_token": {
-          "price": 0.00004
-        },
-        "cache_read_input_token": {
-          "price": 0.00045
-        },
-        "additional_units": {
-          "web_search": {
-            "price": 3.5
-          },
-          "search": {
-            "price": 3.5
-          }
-        }
-      },
-      "batch_config": {
-        "request_token": {
-          "price": 0.0002
-        },
-        "response_token": {
-          "price": 0.0009
-        }
-      }
-    }
-  },
-  "gemini-3.1-pro-preview-lte-128k": {
     "pricing_config": {
       "pay_as_you_go": {
         "request_token": {
@@ -2379,7 +2243,7 @@
           "price": 0.0012
         },
         "cache_read_input_token": {
-          "price": 0.00002
+          "price": 2e-05
         },
         "additional_units": {
           "web_search": {
@@ -2400,7 +2264,7 @@
       }
     }
   },
-  "gemini-3.1-pro-preview-gt-128k": {
+  "gemini-3.1-pro-preview-gt-200k": {
     "pricing_config": {
       "pay_as_you_go": {
         "request_token": {
@@ -2410,7 +2274,7 @@
           "price": 0.0018
         },
         "cache_read_input_token": {
-          "price": 0.00004
+          "price": 4e-05
         },
         "additional_units": {
           "web_search": {
@@ -2431,7 +2295,7 @@
       }
     }
   },
-  "gemini-3.1-pro-preview-customtools-lte-128k": {
+  "gemini-3.1-pro-preview-customtools-lte-200k": {
     "pricing_config": {
       "pay_as_you_go": {
         "request_token": {
@@ -2441,7 +2305,7 @@
           "price": 0.0012
         },
         "cache_read_input_token": {
-          "price": 0.00002
+          "price": 2e-05
         },
         "additional_units": {
           "web_search": {
@@ -2462,7 +2326,7 @@
       }
     }
   },
-  "gemini-3.1-pro-preview-customtools-gt-128k": {
+  "gemini-3.1-pro-preview-customtools-gt-200k": {
     "pricing_config": {
       "pay_as_you_go": {
         "request_token": {
@@ -2472,7 +2336,7 @@
           "price": 0.0018
         },
         "cache_read_input_token": {
-          "price": 0.00004
+          "price": 4e-05
         },
         "additional_units": {
           "web_search": {
@@ -4112,5 +3976,247 @@
         }
       }
     }
+  },
+  "gemini-3.1-pro-preview": {
+    "pricing_config": {
+      "pay_as_you_go": {
+        "request_token": {
+          "price": 0.0002
+        },
+        "response_token": {
+          "price": 0.0012
+        },
+        "cache_read_input_token": {
+          "price": 2e-05
+        },
+        "additional_units": {
+          "web_search": {
+            "price": 1.4
+          },
+          "search": {
+            "price": 1.4
+          }
+        }
+      },
+      "batch_config": {
+        "request_token": {
+          "price": 0.0001
+        },
+        "response_token": {
+          "price": 0.0006
+        }
+      }
+    },
+    "custom_pricing": {
+      "context_tier_map": {
+        "0": "lte-200k",
+        "200000": "gt-200k"
+      },
+      "regions": {
+        "default": {
+          "execution_modes": {
+            "standard": {
+              "context_tiers": {
+                "lte-200k": {
+                  "pricing_config": {
+                    "pay_as_you_go": {
+                      "request_token": {
+                        "price": 0.0002
+                      },
+                      "response_token": {
+                        "price": 0.0012
+                      },
+                      "cache_read_input_token": {
+                        "price": 2e-05
+                      },
+                      "additional_units": {
+                        "web_search": {
+                          "price": 1.4
+                        },
+                        "search": {
+                          "price": 1.4
+                        }
+                      }
+                    }
+                  }
+                },
+                "gt-200k": {
+                  "pricing_config": {
+                    "pay_as_you_go": {
+                      "request_token": {
+                        "price": 0.0004
+                      },
+                      "response_token": {
+                        "price": 0.0018
+                      },
+                      "cache_read_input_token": {
+                        "price": 4e-05
+                      },
+                      "additional_units": {
+                        "web_search": {
+                          "price": 1.4
+                        },
+                        "search": {
+                          "price": 1.4
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "batch": {
+              "context_tiers": {
+                "lte-200k": {
+                  "pricing_config": {
+                    "pay_as_you_go": {
+                      "request_token": {
+                        "price": 0.0001
+                      },
+                      "response_token": {
+                        "price": 0.0006
+                      }
+                    }
+                  }
+                },
+                "gt-200k": {
+                  "pricing_config": {
+                    "pay_as_you_go": {
+                      "request_token": {
+                        "price": 0.0002
+                      },
+                      "response_token": {
+                        "price": 0.0009
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "gemini-3.1-pro-preview-customtools": {
+    "pricing_config": {
+      "pay_as_you_go": {
+        "request_token": {
+          "price": 0.0002
+        },
+        "response_token": {
+          "price": 0.0012
+        },
+        "cache_read_input_token": {
+          "price": 2e-05
+        },
+        "additional_units": {
+          "web_search": {
+            "price": 1.4
+          },
+          "search": {
+            "price": 1.4
+          }
+        }
+      },
+      "batch_config": {
+        "request_token": {
+          "price": 0.0001
+        },
+        "response_token": {
+          "price": 0.0006
+        }
+      }
+    },
+    "custom_pricing": {
+      "context_tier_map": {
+        "0": "lte-200k",
+        "200000": "gt-200k"
+      },
+      "regions": {
+        "default": {
+          "execution_modes": {
+            "standard": {
+              "context_tiers": {
+                "lte-200k": {
+                  "pricing_config": {
+                    "pay_as_you_go": {
+                      "request_token": {
+                        "price": 0.0002
+                      },
+                      "response_token": {
+                        "price": 0.0012
+                      },
+                      "cache_read_input_token": {
+                        "price": 2e-05
+                      },
+                      "additional_units": {
+                        "web_search": {
+                          "price": 1.4
+                        },
+                        "search": {
+                          "price": 1.4
+                        }
+                      }
+                    }
+                  }
+                },
+                "gt-200k": {
+                  "pricing_config": {
+                    "pay_as_you_go": {
+                      "request_token": {
+                        "price": 0.0004
+                      },
+                      "response_token": {
+                        "price": 0.0018
+                      },
+                      "cache_read_input_token": {
+                        "price": 4e-05
+                      },
+                      "additional_units": {
+                        "web_search": {
+                          "price": 1.4
+                        },
+                        "search": {
+                          "price": 1.4
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "batch": {
+              "context_tiers": {
+                "lte-200k": {
+                  "pricing_config": {
+                    "pay_as_you_go": {
+                      "request_token": {
+                        "price": 0.0001
+                      },
+                      "response_token": {
+                        "price": 0.0006
+                      }
+                    }
+                  }
+                },
+                "gt-200k": {
+                  "pricing_config": {
+                    "pay_as_you_go": {
+                      "request_token": {
+                        "price": 0.0002
+                      },
+                      "response_token": {
+                        "price": 0.0009
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   }
 }