diff --git a/flyteidl/README.md b/flyteidl/README.md
index a1be04d742..67685f45b7 100644
--- a/flyteidl/README.md
+++ b/flyteidl/README.md
@@ -7,7 +7,7 @@ This is one of the core repositories of Flyte. It contains the Specification of
 
 * [flyte.org](https://flyte.org)
 * [Flyte Docs](http://docs.flyte.org)
-* [Flyteidl API reference documentation](https://docs.flyte.org/projects/flyteidl/en/stable/index.html)
+* [Flyteidl API reference documentation](https://docs.flyte.org/en/latest/reference_flyteidl.html)
 
 ## Contributing to Flyteidl
 
diff --git a/flyteidl/clients/go/assets/admin.swagger.json b/flyteidl/clients/go/assets/admin.swagger.json
index 7b9045cbe3..64a6af5899 100644
--- a/flyteidl/clients/go/assets/admin.swagger.json
+++ b/flyteidl/clients/go/assets/admin.swagger.json
@@ -7908,7 +7908,7 @@
       "properties": {
         "statement": {
           "type": "string",
-          "title": "The actual query to run, the query can have templated parameters.\nWe use Flyte's Golang templating format for Query templating.\nRefer to the templating documentation.\nhttps://docs.flyte.org/projects/cookbook/en/latest/auto/integrations/external_services/hive/hive.html#sphx-glr-auto-integrations-external-services-hive-hive-py\nFor example,\ninsert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet\nselect *\nfrom my_table\nwhere ds = '{{ .Inputs.ds }}'"
+          "title": "The actual query to run, the query can have templated parameters.\nWe use Flyte's Golang templating format for Query templating.\nFor example,\ninsert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet\nselect *\nfrom my_table\nwhere ds = '{{ .Inputs.ds }}'"
         },
         "dialect": {
           "$ref": "#/definitions/SqlDialect"
diff --git a/flyteidl/gen/pb-es/flyteidl/core/tasks_pb.ts b/flyteidl/gen/pb-es/flyteidl/core/tasks_pb.ts
index afd4e5f98b..5cc011314c 100644
--- a/flyteidl/gen/pb-es/flyteidl/core/tasks_pb.ts
+++ b/flyteidl/gen/pb-es/flyteidl/core/tasks_pb.ts
@@ -1180,8 +1180,6 @@ export class Sql extends Message<Sql> {
   /**
    * The actual query to run, the query can have templated parameters.
    * We use Flyte's Golang templating format for Query templating.
-   * Refer to the templating documentation.
-   * https://docs.flyte.org/projects/cookbook/en/latest/auto/integrations/external_services/hive/hive.html#sphx-glr-auto-integrations-external-services-hive-hive-py
    * For example,
    * insert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet
    * select *
diff --git a/flyteidl/gen/pb-go/flyteidl/core/tasks.pb.go b/flyteidl/gen/pb-go/flyteidl/core/tasks.pb.go
index 92a40b8e01..122ddce559 100644
--- a/flyteidl/gen/pb-go/flyteidl/core/tasks.pb.go
+++ b/flyteidl/gen/pb-go/flyteidl/core/tasks.pb.go
@@ -1514,8 +1514,6 @@ type Sql struct {
 
 	// The actual query to run, the query can have templated parameters.
 	// We use Flyte's Golang templating format for Query templating.
-	// Refer to the templating documentation.
-	// https://docs.flyte.org/projects/cookbook/en/latest/auto/integrations/external_services/hive/hive.html#sphx-glr-auto-integrations-external-services-hive-hive-py
 	// For example,
 	// insert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet
 	// select *
diff --git a/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.swagger.json b/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.swagger.json
index 7b9045cbe3..64a6af5899 100644
--- a/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.swagger.json
+++ b/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.swagger.json
@@ -7908,7 +7908,7 @@
       "properties": {
         "statement": {
           "type": "string",
-          "title": "The actual query to run, the query can have templated parameters.\nWe use Flyte's Golang templating format for Query templating.\nRefer to the templating documentation.\nhttps://docs.flyte.org/projects/cookbook/en/latest/auto/integrations/external_services/hive/hive.html#sphx-glr-auto-integrations-external-services-hive-hive-py\nFor example,\ninsert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet\nselect *\nfrom my_table\nwhere ds = '{{ .Inputs.ds }}'"
+          "title": "The actual query to run, the query can have templated parameters.\nWe use Flyte's Golang templating format for Query templating.\nFor example,\ninsert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet\nselect *\nfrom my_table\nwhere ds = '{{ .Inputs.ds }}'"
         },
         "dialect": {
           "$ref": "#/definitions/SqlDialect"
diff --git a/flyteidl/gen/pb-go/gateway/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/gateway/flyteidl/service/agent.swagger.json
index 2680d36bda..9a6175929f 100644
--- a/flyteidl/gen/pb-go/gateway/flyteidl/service/agent.swagger.json
+++ b/flyteidl/gen/pb-go/gateway/flyteidl/service/agent.swagger.json
@@ -1624,7 +1624,7 @@
       "properties": {
         "statement": {
           "type": "string",
-          "title": "The actual query to run, the query can have templated parameters.\nWe use Flyte's Golang templating format for Query templating.\nRefer to the templating documentation.\nhttps://docs.flyte.org/projects/cookbook/en/latest/auto/integrations/external_services/hive/hive.html#sphx-glr-auto-integrations-external-services-hive-hive-py\nFor example,\ninsert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet\nselect *\nfrom my_table\nwhere ds = '{{ .Inputs.ds }}'"
+          "title": "The actual query to run, the query can have templated parameters.\nWe use Flyte's Golang templating format for Query templating.\nFor example,\ninsert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet\nselect *\nfrom my_table\nwhere ds = '{{ .Inputs.ds }}'"
         },
         "dialect": {
           "$ref": "#/definitions/SqlDialect"
diff --git a/flyteidl/gen/pb-go/gateway/flyteidl/service/external_plugin_service.swagger.json b/flyteidl/gen/pb-go/gateway/flyteidl/service/external_plugin_service.swagger.json
index cebc48b75b..f488a49c00 100644
--- a/flyteidl/gen/pb-go/gateway/flyteidl/service/external_plugin_service.swagger.json
+++ b/flyteidl/gen/pb-go/gateway/flyteidl/service/external_plugin_service.swagger.json
@@ -928,7 +928,7 @@
       "properties": {
         "statement": {
           "type": "string",
-          "title": "The actual query to run, the query can have templated parameters.\nWe use Flyte's Golang templating format for Query templating.\nRefer to the templating documentation.\nhttps://docs.flyte.org/projects/cookbook/en/latest/auto/integrations/external_services/hive/hive.html#sphx-glr-auto-integrations-external-services-hive-hive-py\nFor example,\ninsert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet\nselect *\nfrom my_table\nwhere ds = '{{ .Inputs.ds }}'"
+          "title": "The actual query to run, the query can have templated parameters.\nWe use Flyte's Golang templating format for Query templating.\nFor example,\ninsert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet\nselect *\nfrom my_table\nwhere ds = '{{ .Inputs.ds }}'"
         },
         "dialect": {
           "$ref": "#/definitions/SqlDialect"
diff --git a/flyteidl/gen/pb_rust/flyteidl.core.rs b/flyteidl/gen/pb_rust/flyteidl.core.rs
index a36add78f2..280140c75d 100644
--- a/flyteidl/gen/pb_rust/flyteidl.core.rs
+++ b/flyteidl/gen/pb_rust/flyteidl.core.rs
@@ -1729,8 +1729,6 @@ pub struct K8sObjectMetadata {
 pub struct Sql {
     /// The actual query to run, the query can have templated parameters.
     /// We use Flyte's Golang templating format for Query templating.
-    /// Refer to the templating documentation.
-    /// <https://docs.flyte.org/projects/cookbook/en/latest/auto/integrations/external_services/hive/hive.html#sphx-glr-auto-integrations-external-services-hive-hive-py>
     /// For example,
     /// insert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet
     /// select *
diff --git a/flyteidl/index.rst b/flyteidl/index.rst
index f06f0e0e50..bbe9037b82 100644
--- a/flyteidl/index.rst
+++ b/flyteidl/index.rst
@@ -17,12 +17,12 @@ This specification is used to generate client stubs for `Flytekit <https://flyte
    :maxdepth: 1
    :hidden:
 
-   |plane| Getting Started <https://docs.flyte.org/en/latest/getting_started.html>
-   |book-reader| User Guide <https://docs.flyte.org/projects/cookbook/en/latest/user_guide.html>
-   |chalkboard| Tutorials <https://docs.flyte.org/projects/cookbook/en/latest/tutorials.html>
+   |plane| Getting Started <https://docs.flyte.org/en/latest/introduction.html>
+   |book-reader| User Guide <https://docs.flyte.org/en/latest/user_guide/index.html>
+   |chalkboard| Tutorials <https://docs.flyte.org/en/latest/flytesnacks/tutorials.html>
    |project-diagram| Concepts <https://docs.flyte.org/en/latest/concepts/basics.html>
    |rocket| Deployment <https://docs.flyte.org/en/latest/deployment/index.html>
-   |book| API Reference <https://docs.flyte.org/en/latest/reference/index.html>
+   |book| API Reference <https://docs.flyte.org/en/latest/api/flytekit/docs_index.html>
    |hands-helping| Community <https://docs.flyte.org/en/latest/community/index.html>
 
 .. NOTE: the caption text is important for the sphinx theme to correctly render the nav header
diff --git a/flyteidl/protos/docs/core/core.rst b/flyteidl/protos/docs/core/core.rst
index 43bf4c9c6e..dd3cf71341 100644
--- a/flyteidl/protos/docs/core/core.rst
+++ b/flyteidl/protos/docs/core/core.rst
@@ -2206,7 +2206,7 @@ Sql represents a generic sql workload with a statement and dialect.
    :header: "Field", "Type", "Label", "Description"
    :widths: auto
 
-   "statement", ":ref:`ref_string`", "", "The actual query to run, the query can have templated parameters. We use Flyte's Golang templating format for Query templating. Refer to the templating documentation. https://docs.flyte.org/projects/cookbook/en/latest/auto/integrations/external_services/hive/hive.html#sphx-glr-auto-integrations-external-services-hive-hive-py For example, insert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet select * from my_table where ds = '{{ .Inputs.ds }}'"
+   "statement", ":ref:`ref_string`", "", "The actual query to run, the query can have templated parameters. We use Flyte's Golang templating format for Query templating. For example, insert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet select * from my_table where ds = '{{ .Inputs.ds }}'"
    "dialect", ":ref:`ref_flyteidl.core.Sql.Dialect`", "", ""
 
 
diff --git a/flyteidl/protos/flyteidl/core/tasks.proto b/flyteidl/protos/flyteidl/core/tasks.proto
index ab96615be7..20a1fa0cbf 100644
--- a/flyteidl/protos/flyteidl/core/tasks.proto
+++ b/flyteidl/protos/flyteidl/core/tasks.proto
@@ -332,8 +332,6 @@ message K8sObjectMetadata {
 message Sql {
     // The actual query to run, the query can have templated parameters.
     // We use Flyte's Golang templating format for Query templating.
-    // Refer to the templating documentation.
-    // https://docs.flyte.org/projects/cookbook/en/latest/auto/integrations/external_services/hive/hive.html#sphx-glr-auto-integrations-external-services-hive-hive-py
     // For example,
     // insert overwrite directory '{{ .rawOutputDataPrefix }}' stored as parquet
     // select *