diff --git a/docs/source/Resources/Analysis/Analysis_Type.rst b/docs/source/Resources/Analysis/Analysis_Type.rst
index e0fa082..38f4497 100644
--- a/docs/source/Resources/Analysis/Analysis_Type.rst
+++ b/docs/source/Resources/Analysis/Analysis_Type.rst
@@ -13,7 +13,7 @@ ScriptFile
 
         | content: :ref:`Base64`
 
-        | language: "node" or "python"
+        | language: :ref:`RunTypeOptions`
 
 
 
@@ -34,7 +34,7 @@ AnalysisCreateInfo
 
         | file_name: Optional[str]
 
-        | runtime: Optional["node" or "python"]
+        | runtime: Optional[:ref:`RunTypeOptions`]
 
         | active: Optional[bool]
 
diff --git a/docs/source/common/Common_Type.rst b/docs/source/common/Common_Type.rst
index 079ce44..6d83287 100644
--- a/docs/source/common/Common_Type.rst
+++ b/docs/source/common/Common_Type.rst
@@ -43,6 +43,13 @@ Conditionals
 
     | **Conditionals**: Literal["<", ">", "=", "!", "><", "*"]
 
+.. _RunTypeOptions:
+
+RunTypeOptions
+----------------
+
+    | **RunTypeOptions**: Literal["node-legacy", "python-legacy", "node-rt2025", "python-rt2025", "deno-rt2025"]
+
 .. _TokenCreateResponse:
 
 TokenCreateResponse
diff --git a/src/tagoio_sdk/common/Common_Type.py b/src/tagoio_sdk/common/Common_Type.py
index b2d9f17..a7b514c 100644
--- a/src/tagoio_sdk/common/Common_Type.py
+++ b/src/tagoio_sdk/common/Common_Type.py
@@ -20,6 +20,8 @@
 
 Conditionals = Literal["<", ">", "=", "!", "><", "*"]
 
+RunTypeOptions = Literal["node-legacy", "python-legacy", "node-rt2025", "python-rt2025", "deno-rt2025"]
+
 
 class TokenCreateResponse(TypedDict):
     token: GenericToken
diff --git a/src/tagoio_sdk/modules/Resources/Analyses.py b/src/tagoio_sdk/modules/Resources/Analyses.py
index 8043c3f..4be43a9 100644
--- a/src/tagoio_sdk/modules/Resources/Analyses.py
+++ b/src/tagoio_sdk/modules/Resources/Analyses.py
@@ -85,7 +85,7 @@ def create(self, analysisObj: AnalysisCreateInfo) -> Dict[str, GenericID | Gener
             resources = Resources()
             new_analysis = resources.analyses.create({
                 "name": "My Analysis",
-                "runtime": "python",
+                "runtime": "python-rt2025",
                 "tags": [{"key": "type", "value": "data-processing"}]
             })
             print(new_analysis["id"], new_analysis["token"])  # analysis-id-123, analysis-token-123
@@ -268,7 +268,7 @@ def uploadScript(self, analysisID: GenericID, fileObj: ScriptFile) -> str:
             result = resources.analyses.uploadScript("analysis-id-123", {
                 "name": "script.py",
                 "content": "base64-encoded-content",
-                "language": "python"
+                "language": "python-rt2025"
             })
             print(result)  # Successfully Uploaded
             ```
diff --git a/src/tagoio_sdk/modules/Resources/Analysis_Types.py b/src/tagoio_sdk/modules/Resources/Analysis_Types.py
index 4d32035..566b9c2 100644
--- a/src/tagoio_sdk/modules/Resources/Analysis_Types.py
+++ b/src/tagoio_sdk/modules/Resources/Analysis_Types.py
@@ -11,13 +11,14 @@
 from tagoio_sdk.common.Common_Type import ExpireTimeOption
 from tagoio_sdk.common.Common_Type import GenericID
 from tagoio_sdk.common.Common_Type import Query
+from tagoio_sdk.common.Common_Type import RunTypeOptions
 from tagoio_sdk.common.Common_Type import TagsObj
 
 
 class ScriptFile(TypedDict):
     name: str
     content: Base64
-    language: Literal["node", "python"]
+    language: RunTypeOptions
 
 
 class AnalysisCreateInfo(TypedDict, total=False):
@@ -26,7 +27,7 @@ class AnalysisCreateInfo(TypedDict, total=False):
     interval: Optional[str]
     run_on: Optional[Literal["tago", "external"]]
     file_name: Optional[str]
-    runtime: Optional[Literal["node", "python"]]
+    runtime: Optional[RunTypeOptions]
     active: Optional[bool]
     profile: Optional[GenericID]
     variables: Optional[List[Dict[str, Union[str, int, bool]]]]
@@ -44,11 +45,7 @@ class AnalysisInfo(AnalysisCreateInfo):
 
 
 class AnalysisQuery(Query):
-    fields: Optional[
-        List[
-            Literal["name", "active", "run_on", "last_run", "created_at", "updated_at"]
-        ]
-    ]
+    fields: Optional[List[Literal["name", "active", "run_on", "last_run", "created_at", "updated_at"]]]
 
 
 class AnalysisListItem(TypedDict, total=False):
@@ -63,9 +60,7 @@ class AnalysisListItem(TypedDict, total=False):
     console: Optional[List[str]]
 
 
-SnippetRuntime = Literal[
-    "node-legacy", "python-legacy", "node-rt2025", "python-rt2025", "deno-rt2025"
-]
+SnippetRuntime = Literal["node-legacy", "python-legacy", "node-rt2025", "python-rt2025", "deno-rt2025"]
 """Available runtime environments for snippets"""