diff --git a/app/cli.php b/app/cli.php
index 9a022eaacc..ecff5180a2 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -1,12 +1,12 @@
 <?php
 
 require_once __DIR__ . '/init.php';
-require_once __DIR__ . '/controllers/general.php';
 
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Func;
 use Appwrite\Platform\Appwrite;
+use Appwrite\Runtimes\Runtimes;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\CLI;
@@ -23,6 +23,12 @@ use Utopia\Queue\Connection;
 use Utopia\Registry\Registry;
 use Utopia\System\System;
 
+// overwriting runtimes to be architectur agnostic for CLI
+Config::setParam('runtimes', (new Runtimes('v4'))->getAll(supported: false));
+
+// require controllers after overwriting runtimes
+require_once __DIR__ . '/controllers/general.php';
+
 Authorization::disable();
 
 CLI::setResource('register', fn () => $register);
diff --git a/app/config/specs/open-api3-1.6.x-console.json b/app/config/specs/open-api3-1.6.x-console.json
index 7ea59065e6..99fd60228a 100644
--- a/app/config/specs/open-api3-1.6.x-console.json
+++ b/app/config/specs/open-api3-1.6.x-console.json
@@ -9451,6 +9451,9 @@
                                             "python-3.11",
                                             "python-3.12",
                                             "python-ml-3.11",
+                                            "deno-1.21",
+                                            "deno-1.24",
+                                            "deno-1.35",
                                             "deno-1.40",
                                             "dart-2.15",
                                             "dart-2.16",
@@ -10096,6 +10099,9 @@
                                             "python-3.11",
                                             "python-3.12",
                                             "python-ml-3.11",
+                                            "deno-1.21",
+                                            "deno-1.24",
+                                            "deno-1.35",
                                             "deno-1.40",
                                             "dart-2.15",
                                             "dart-2.16",
diff --git a/app/config/specs/open-api3-1.6.x-server.json b/app/config/specs/open-api3-1.6.x-server.json
index b19e6c7e20..ef41688ca8 100644
--- a/app/config/specs/open-api3-1.6.x-server.json
+++ b/app/config/specs/open-api3-1.6.x-server.json
@@ -8559,6 +8559,9 @@
                                             "python-3.11",
                                             "python-3.12",
                                             "python-ml-3.11",
+                                            "deno-1.21",
+                                            "deno-1.24",
+                                            "deno-1.35",
                                             "deno-1.40",
                                             "dart-2.15",
                                             "dart-2.16",
@@ -8970,6 +8973,9 @@
                                             "python-3.11",
                                             "python-3.12",
                                             "python-ml-3.11",
+                                            "deno-1.21",
+                                            "deno-1.24",
+                                            "deno-1.35",
                                             "deno-1.40",
                                             "dart-2.15",
                                             "dart-2.16",
diff --git a/app/config/specs/open-api3-latest-console.json b/app/config/specs/open-api3-latest-console.json
index 7ea59065e6..99fd60228a 100644
--- a/app/config/specs/open-api3-latest-console.json
+++ b/app/config/specs/open-api3-latest-console.json
@@ -9451,6 +9451,9 @@
                                             "python-3.11",
                                             "python-3.12",
                                             "python-ml-3.11",
+                                            "deno-1.21",
+                                            "deno-1.24",
+                                            "deno-1.35",
                                             "deno-1.40",
                                             "dart-2.15",
                                             "dart-2.16",
@@ -10096,6 +10099,9 @@
                                             "python-3.11",
                                             "python-3.12",
                                             "python-ml-3.11",
+                                            "deno-1.21",
+                                            "deno-1.24",
+                                            "deno-1.35",
                                             "deno-1.40",
                                             "dart-2.15",
                                             "dart-2.16",
diff --git a/app/config/specs/open-api3-latest-server.json b/app/config/specs/open-api3-latest-server.json
index b19e6c7e20..ef41688ca8 100644
--- a/app/config/specs/open-api3-latest-server.json
+++ b/app/config/specs/open-api3-latest-server.json
@@ -8559,6 +8559,9 @@
                                             "python-3.11",
                                             "python-3.12",
                                             "python-ml-3.11",
+                                            "deno-1.21",
+                                            "deno-1.24",
+                                            "deno-1.35",
                                             "deno-1.40",
                                             "dart-2.15",
                                             "dart-2.16",
@@ -8970,6 +8973,9 @@
                                             "python-3.11",
                                             "python-3.12",
                                             "python-ml-3.11",
+                                            "deno-1.21",
+                                            "deno-1.24",
+                                            "deno-1.35",
                                             "deno-1.40",
                                             "dart-2.15",
                                             "dart-2.16",
diff --git a/app/config/specs/swagger2-1.6.x-console.json b/app/config/specs/swagger2-1.6.x-console.json
index 4cd2a65aac..b1a45d3288 100644
--- a/app/config/specs/swagger2-1.6.x-console.json
+++ b/app/config/specs/swagger2-1.6.x-console.json
@@ -9573,6 +9573,9 @@
                                         "python-3.11",
                                         "python-3.12",
                                         "python-ml-3.11",
+                                        "deno-1.21",
+                                        "deno-1.24",
+                                        "deno-1.35",
                                         "deno-1.40",
                                         "dart-2.15",
                                         "dart-2.16",
@@ -10237,6 +10240,9 @@
                                         "python-3.11",
                                         "python-3.12",
                                         "python-ml-3.11",
+                                        "deno-1.21",
+                                        "deno-1.24",
+                                        "deno-1.35",
                                         "deno-1.40",
                                         "dart-2.15",
                                         "dart-2.16",
diff --git a/app/config/specs/swagger2-1.6.x-server.json b/app/config/specs/swagger2-1.6.x-server.json
index 1e94841e6a..af6274226f 100644
--- a/app/config/specs/swagger2-1.6.x-server.json
+++ b/app/config/specs/swagger2-1.6.x-server.json
@@ -8683,6 +8683,9 @@
                                         "python-3.11",
                                         "python-3.12",
                                         "python-ml-3.11",
+                                        "deno-1.21",
+                                        "deno-1.24",
+                                        "deno-1.35",
                                         "deno-1.40",
                                         "dart-2.15",
                                         "dart-2.16",
@@ -9117,6 +9120,9 @@
                                         "python-3.11",
                                         "python-3.12",
                                         "python-ml-3.11",
+                                        "deno-1.21",
+                                        "deno-1.24",
+                                        "deno-1.35",
                                         "deno-1.40",
                                         "dart-2.15",
                                         "dart-2.16",
diff --git a/app/config/specs/swagger2-latest-console.json b/app/config/specs/swagger2-latest-console.json
index 4cd2a65aac..b1a45d3288 100644
--- a/app/config/specs/swagger2-latest-console.json
+++ b/app/config/specs/swagger2-latest-console.json
@@ -9573,6 +9573,9 @@
                                         "python-3.11",
                                         "python-3.12",
                                         "python-ml-3.11",
+                                        "deno-1.21",
+                                        "deno-1.24",
+                                        "deno-1.35",
                                         "deno-1.40",
                                         "dart-2.15",
                                         "dart-2.16",
@@ -10237,6 +10240,9 @@
                                         "python-3.11",
                                         "python-3.12",
                                         "python-ml-3.11",
+                                        "deno-1.21",
+                                        "deno-1.24",
+                                        "deno-1.35",
                                         "deno-1.40",
                                         "dart-2.15",
                                         "dart-2.16",
diff --git a/app/config/specs/swagger2-latest-server.json b/app/config/specs/swagger2-latest-server.json
index 1e94841e6a..af6274226f 100644
--- a/app/config/specs/swagger2-latest-server.json
+++ b/app/config/specs/swagger2-latest-server.json
@@ -8683,6 +8683,9 @@
                                         "python-3.11",
                                         "python-3.12",
                                         "python-ml-3.11",
+                                        "deno-1.21",
+                                        "deno-1.24",
+                                        "deno-1.35",
                                         "deno-1.40",
                                         "dart-2.15",
                                         "dart-2.16",
@@ -9117,6 +9120,9 @@
                                         "python-3.11",
                                         "python-3.12",
                                         "python-ml-3.11",
+                                        "deno-1.21",
+                                        "deno-1.24",
+                                        "deno-1.35",
                                         "deno-1.40",
                                         "dart-2.15",
                                         "dart-2.16",