diff --git a/app/config/services.php b/app/config/services.php
index 64fe12f62e..696184d0c5 100644
--- a/app/config/services.php
+++ b/app/config/services.php
@@ -55,7 +55,7 @@ return [
     ],
     'databases' => [
         'key' => 'databases',
-        'name' => 'Databases (Legacy)',
+        'name' => 'Databases (legacy)',
         'subtitle' => 'The Databases service allows you to create structured collections of documents, query and filter lists of documents',
         'description' => '/docs/services/databases.md',
         'controller' => '', // Uses modules
diff --git a/app/config/specs/open-api3-1.8.x-client.json b/app/config/specs/open-api3-1.8.x-client.json
index 54e08925d5..b9cc9f7b07 100644
--- a/app/config/specs/open-api3-1.8.x-client.json
+++ b/app/config/specs/open-api3-1.8.x-client.json
@@ -5122,30 +5122,6 @@
                                 }
                             ],
                             "description": "Create a new Row. Before using this route, you should create a new table resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateTable) API or directly from your database console."
-                        },
-                        {
-                            "name": "createRows",
-                            "auth": {
-                                "Admin": [],
-                                "Key": []
-                            },
-                            "parameters": [
-                                "databaseId",
-                                "tableId",
-                                "rows"
-                            ],
-                            "required": [
-                                "databaseId",
-                                "tableId",
-                                "rows"
-                            ],
-                            "responses": [
-                                {
-                                    "code": 201,
-                                    "model": "#\/components\/schemas\/rowList"
-                                }
-                            ],
-                            "description": "Create new Rows. Before using this route, you should create a new table resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateTable) API or directly from your database console."
                         }
                     ],
                     "auth": {
@@ -8414,6 +8390,10 @@
             "name": "databases",
             "description": "The Databases service allows you to create structured collections of documents, query and filter lists of documents"
         },
+        {
+            "name": "tables",
+            "description": "The Tables service allows you to create structured tables of rows, query and filter lists of rows"
+        },
         {
             "name": "locale",
             "description": "The Locale service allows you to customize your app based on your users' location."
diff --git a/app/config/specs/open-api3-1.8.x-console.json b/app/config/specs/open-api3-1.8.x-console.json
index 859a4e00a9..0a96ef4660 100644
--- a/app/config/specs/open-api3-1.8.x-console.json
+++ b/app/config/specs/open-api3-1.8.x-console.json
@@ -27922,6 +27922,7 @@
                                             "account",
                                             "avatars",
                                             "databases",
+                                            "tables",
                                             "locale",
                                             "health",
                                             "storage",
@@ -40273,6 +40274,10 @@
             "name": "databases",
             "description": "The Databases service allows you to create structured collections of documents, query and filter lists of documents"
         },
+        {
+            "name": "tables",
+            "description": "The Tables service allows you to create structured tables of rows, query and filter lists of rows"
+        },
         {
             "name": "locale",
             "description": "The Locale service allows you to customize your app based on your users' location."
@@ -46625,7 +46630,12 @@
                     },
                     "serviceStatusForDatabases": {
                         "type": "boolean",
-                        "description": "Databases service status",
+                        "description": "Databases (legacy) service status",
+                        "x-example": true
+                    },
+                    "serviceStatusForTables": {
+                        "type": "boolean",
+                        "description": "Tables service status",
                         "x-example": true
                     },
                     "serviceStatusForLocale": {
@@ -46727,6 +46737,7 @@
                     "serviceStatusForAccount",
                     "serviceStatusForAvatars",
                     "serviceStatusForDatabases",
+                    "serviceStatusForTables",
                     "serviceStatusForLocale",
                     "serviceStatusForHealth",
                     "serviceStatusForStorage",
diff --git a/app/config/specs/open-api3-1.8.x-server.json b/app/config/specs/open-api3-1.8.x-server.json
index c2dfdd7715..f849e89a4e 100644
--- a/app/config/specs/open-api3-1.8.x-server.json
+++ b/app/config/specs/open-api3-1.8.x-server.json
@@ -30249,6 +30249,10 @@
             "name": "databases",
             "description": "The Databases service allows you to create structured collections of documents, query and filter lists of documents"
         },
+        {
+            "name": "tables",
+            "description": "The Tables service allows you to create structured tables of rows, query and filter lists of rows"
+        },
         {
             "name": "locale",
             "description": "The Locale service allows you to customize your app based on your users' location."
diff --git a/app/config/specs/open-api3-latest-client.json b/app/config/specs/open-api3-latest-client.json
index 54e08925d5..b9cc9f7b07 100644
--- a/app/config/specs/open-api3-latest-client.json
+++ b/app/config/specs/open-api3-latest-client.json
@@ -5122,30 +5122,6 @@
                                 }
                             ],
                             "description": "Create a new Row. Before using this route, you should create a new table resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateTable) API or directly from your database console."
-                        },
-                        {
-                            "name": "createRows",
-                            "auth": {
-                                "Admin": [],
-                                "Key": []
-                            },
-                            "parameters": [
-                                "databaseId",
-                                "tableId",
-                                "rows"
-                            ],
-                            "required": [
-                                "databaseId",
-                                "tableId",
-                                "rows"
-                            ],
-                            "responses": [
-                                {
-                                    "code": 201,
-                                    "model": "#\/components\/schemas\/rowList"
-                                }
-                            ],
-                            "description": "Create new Rows. Before using this route, you should create a new table resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateTable) API or directly from your database console."
                         }
                     ],
                     "auth": {
@@ -8414,6 +8390,10 @@
             "name": "databases",
             "description": "The Databases service allows you to create structured collections of documents, query and filter lists of documents"
         },
+        {
+            "name": "tables",
+            "description": "The Tables service allows you to create structured tables of rows, query and filter lists of rows"
+        },
         {
             "name": "locale",
             "description": "The Locale service allows you to customize your app based on your users' location."
diff --git a/app/config/specs/open-api3-latest-console.json b/app/config/specs/open-api3-latest-console.json
index 859a4e00a9..0a96ef4660 100644
--- a/app/config/specs/open-api3-latest-console.json
+++ b/app/config/specs/open-api3-latest-console.json
@@ -27922,6 +27922,7 @@
                                             "account",
                                             "avatars",
                                             "databases",
+                                            "tables",
                                             "locale",
                                             "health",
                                             "storage",
@@ -40273,6 +40274,10 @@
             "name": "databases",
             "description": "The Databases service allows you to create structured collections of documents, query and filter lists of documents"
         },
+        {
+            "name": "tables",
+            "description": "The Tables service allows you to create structured tables of rows, query and filter lists of rows"
+        },
         {
             "name": "locale",
             "description": "The Locale service allows you to customize your app based on your users' location."
@@ -46625,7 +46630,12 @@
                     },
                     "serviceStatusForDatabases": {
                         "type": "boolean",
-                        "description": "Databases service status",
+                        "description": "Databases (legacy) service status",
+                        "x-example": true
+                    },
+                    "serviceStatusForTables": {
+                        "type": "boolean",
+                        "description": "Tables service status",
                         "x-example": true
                     },
                     "serviceStatusForLocale": {
@@ -46727,6 +46737,7 @@
                     "serviceStatusForAccount",
                     "serviceStatusForAvatars",
                     "serviceStatusForDatabases",
+                    "serviceStatusForTables",
                     "serviceStatusForLocale",
                     "serviceStatusForHealth",
                     "serviceStatusForStorage",
diff --git a/app/config/specs/open-api3-latest-server.json b/app/config/specs/open-api3-latest-server.json
index c2dfdd7715..f849e89a4e 100644
--- a/app/config/specs/open-api3-latest-server.json
+++ b/app/config/specs/open-api3-latest-server.json
@@ -30249,6 +30249,10 @@
             "name": "databases",
             "description": "The Databases service allows you to create structured collections of documents, query and filter lists of documents"
         },
+        {
+            "name": "tables",
+            "description": "The Tables service allows you to create structured tables of rows, query and filter lists of rows"
+        },
         {
             "name": "locale",
             "description": "The Locale service allows you to customize your app based on your users' location."
diff --git a/app/config/specs/swagger2-1.8.x-client.json b/app/config/specs/swagger2-1.8.x-client.json
index dd4eb9ed38..0dda6df3b1 100644
--- a/app/config/specs/swagger2-1.8.x-client.json
+++ b/app/config/specs/swagger2-1.8.x-client.json
@@ -5231,30 +5231,6 @@
                                 }
                             ],
                             "description": "Create a new Row. Before using this route, you should create a new table resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateTable) API or directly from your database console."
-                        },
-                        {
-                            "name": "createRows",
-                            "auth": {
-                                "Admin": [],
-                                "Key": []
-                            },
-                            "parameters": [
-                                "databaseId",
-                                "tableId",
-                                "rows"
-                            ],
-                            "required": [
-                                "databaseId",
-                                "tableId",
-                                "rows"
-                            ],
-                            "responses": [
-                                {
-                                    "code": 201,
-                                    "model": "#\/definitions\/rowList"
-                                }
-                            ],
-                            "description": "Create new Rows. Before using this route, you should create a new table resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateTable) API or directly from your database console."
                         }
                     ],
                     "auth": {
@@ -8462,6 +8438,10 @@
             "name": "databases",
             "description": "The Databases service allows you to create structured collections of documents, query and filter lists of documents"
         },
+        {
+            "name": "tables",
+            "description": "The Tables service allows you to create structured tables of rows, query and filter lists of rows"
+        },
         {
             "name": "locale",
             "description": "The Locale service allows you to customize your app based on your users' location."
diff --git a/app/config/specs/swagger2-1.8.x-console.json b/app/config/specs/swagger2-1.8.x-console.json
index 3982fdaa33..75f81550da 100644
--- a/app/config/specs/swagger2-1.8.x-console.json
+++ b/app/config/specs/swagger2-1.8.x-console.json
@@ -28016,6 +28016,7 @@
                                         "account",
                                         "avatars",
                                         "databases",
+                                        "tables",
                                         "locale",
                                         "health",
                                         "storage",
@@ -40314,6 +40315,10 @@
             "name": "databases",
             "description": "The Databases service allows you to create structured collections of documents, query and filter lists of documents"
         },
+        {
+            "name": "tables",
+            "description": "The Tables service allows you to create structured tables of rows, query and filter lists of rows"
+        },
         {
             "name": "locale",
             "description": "The Locale service allows you to customize your app based on your users' location."
@@ -46702,7 +46707,12 @@
                 },
                 "serviceStatusForDatabases": {
                     "type": "boolean",
-                    "description": "Databases service status",
+                    "description": "Databases (legacy) service status",
+                    "x-example": true
+                },
+                "serviceStatusForTables": {
+                    "type": "boolean",
+                    "description": "Tables service status",
                     "x-example": true
                 },
                 "serviceStatusForLocale": {
@@ -46804,6 +46814,7 @@
                 "serviceStatusForAccount",
                 "serviceStatusForAvatars",
                 "serviceStatusForDatabases",
+                "serviceStatusForTables",
                 "serviceStatusForLocale",
                 "serviceStatusForHealth",
                 "serviceStatusForStorage",
diff --git a/app/config/specs/swagger2-1.8.x-server.json b/app/config/specs/swagger2-1.8.x-server.json
index 08a4f03093..d55457e34b 100644
--- a/app/config/specs/swagger2-1.8.x-server.json
+++ b/app/config/specs/swagger2-1.8.x-server.json
@@ -30390,6 +30390,10 @@
             "name": "databases",
             "description": "The Databases service allows you to create structured collections of documents, query and filter lists of documents"
         },
+        {
+            "name": "tables",
+            "description": "The Tables service allows you to create structured tables of rows, query and filter lists of rows"
+        },
         {
             "name": "locale",
             "description": "The Locale service allows you to customize your app based on your users' location."
diff --git a/app/config/specs/swagger2-latest-client.json b/app/config/specs/swagger2-latest-client.json
index dd4eb9ed38..0dda6df3b1 100644
--- a/app/config/specs/swagger2-latest-client.json
+++ b/app/config/specs/swagger2-latest-client.json
@@ -5231,30 +5231,6 @@
                                 }
                             ],
                             "description": "Create a new Row. Before using this route, you should create a new table resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateTable) API or directly from your database console."
-                        },
-                        {
-                            "name": "createRows",
-                            "auth": {
-                                "Admin": [],
-                                "Key": []
-                            },
-                            "parameters": [
-                                "databaseId",
-                                "tableId",
-                                "rows"
-                            ],
-                            "required": [
-                                "databaseId",
-                                "tableId",
-                                "rows"
-                            ],
-                            "responses": [
-                                {
-                                    "code": 201,
-                                    "model": "#\/definitions\/rowList"
-                                }
-                            ],
-                            "description": "Create new Rows. Before using this route, you should create a new table resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateTable) API or directly from your database console."
                         }
                     ],
                     "auth": {
@@ -8462,6 +8438,10 @@
             "name": "databases",
             "description": "The Databases service allows you to create structured collections of documents, query and filter lists of documents"
         },
+        {
+            "name": "tables",
+            "description": "The Tables service allows you to create structured tables of rows, query and filter lists of rows"
+        },
         {
             "name": "locale",
             "description": "The Locale service allows you to customize your app based on your users' location."
diff --git a/app/config/specs/swagger2-latest-console.json b/app/config/specs/swagger2-latest-console.json
index 3982fdaa33..75f81550da 100644
--- a/app/config/specs/swagger2-latest-console.json
+++ b/app/config/specs/swagger2-latest-console.json
@@ -28016,6 +28016,7 @@
                                         "account",
                                         "avatars",
                                         "databases",
+                                        "tables",
                                         "locale",
                                         "health",
                                         "storage",
@@ -40314,6 +40315,10 @@
             "name": "databases",
             "description": "The Databases service allows you to create structured collections of documents, query and filter lists of documents"
         },
+        {
+            "name": "tables",
+            "description": "The Tables service allows you to create structured tables of rows, query and filter lists of rows"
+        },
         {
             "name": "locale",
             "description": "The Locale service allows you to customize your app based on your users' location."
@@ -46702,7 +46707,12 @@
                 },
                 "serviceStatusForDatabases": {
                     "type": "boolean",
-                    "description": "Databases service status",
+                    "description": "Databases (legacy) service status",
+                    "x-example": true
+                },
+                "serviceStatusForTables": {
+                    "type": "boolean",
+                    "description": "Tables service status",
                     "x-example": true
                 },
                 "serviceStatusForLocale": {
@@ -46804,6 +46814,7 @@
                 "serviceStatusForAccount",
                 "serviceStatusForAvatars",
                 "serviceStatusForDatabases",
+                "serviceStatusForTables",
                 "serviceStatusForLocale",
                 "serviceStatusForHealth",
                 "serviceStatusForStorage",
diff --git a/app/config/specs/swagger2-latest-server.json b/app/config/specs/swagger2-latest-server.json
index 08a4f03093..d55457e34b 100644
--- a/app/config/specs/swagger2-latest-server.json
+++ b/app/config/specs/swagger2-latest-server.json
@@ -30390,6 +30390,10 @@
             "name": "databases",
             "description": "The Databases service allows you to create structured collections of documents, query and filter lists of documents"
         },
+        {
+            "name": "tables",
+            "description": "The Tables service allows you to create structured tables of rows, query and filter lists of rows"
+        },
         {
             "name": "locale",
             "description": "The Locale service allows you to customize your app based on your users' location."