diff --git a/app/config/platforms.php b/app/config/platforms.php
index 7ecd048683..219b00a70a 100644
--- a/app/config/platforms.php
+++ b/app/config/platforms.php
@@ -108,6 +108,38 @@ return [
                 'gitRepoName' => 'sdk-for-apple',
                 'gitUserName' => 'appwrite',
             ],
+            [
+                'key' => 'watchos',
+                'name' => 'watchOS',
+                'url' => 'https://github.com/appwrite/sdk-for-apple',
+                'package' => 'https://github.com/appwrite/sdk-for-apple',
+                'enabled' => true,
+                'beta' => false,
+                'dev' => true,
+                'hidden' => false,
+                'family' => APP_PLATFORM_CLIENT,
+                'prism' => 'swift',
+                'source' => \realpath(__DIR__ . '/../sdks/client-apple'),
+                'gitUrl' => 'git@github.com:appwrite/sdk-for-apple.git',
+                'gitRepoName' => 'sdk-for-apple',
+                'gitUserName' => 'appwrite',
+            ],
+            [
+                'key' => 'tvos',
+                'name' => 'tvOS',
+                'url' => 'https://github.com/appwrite/sdk-for-apple',
+                'package' => 'https://github.com/appwrite/sdk-for-apple',
+                'enabled' => true,
+                'beta' => false,
+                'dev' => true,
+                'hidden' => false,
+                'family' => APP_PLATFORM_CLIENT,
+                'prism' => 'swift',
+                'source' => \realpath(__DIR__ . '/../sdks/client-apple'),
+                'gitUrl' => 'git@github.com:appwrite/sdk-for-apple.git',
+                'gitRepoName' => 'sdk-for-apple',
+                'gitUserName' => 'appwrite',
+            ],
             [
                 'key' => 'objective-c',
                 'name' => 'Objective C',
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index ff71999ce4..996c999674 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -1314,7 +1314,7 @@ App::post('/v1/projects/:projectId/platforms')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PLATFORM)
     ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('type', null, new WhiteList(['web', 'flutter-ios', 'flutter-android', 'flutter-linux', 'flutter-macos', 'flutter-windows', 'ios', 'macos', 'android', 'unity'], true), 'Platform type.')
+    ->param('type', null, new WhiteList(['web', 'flutter-ios', 'flutter-android', 'flutter-linux', 'flutter-macos', 'flutter-windows', 'ios', 'macos', 'watchos', 'tvos', 'android', 'unity'], true), 'Platform type.')
     ->param('name', null, new Text(128), 'Platform name. Max length: 128 chars.')
     ->param('key', '', new Text(256), 'Package name for Android or bundle ID for iOS or macOS. Max length: 256 chars.', true)
     ->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true)
diff --git a/app/views/console/home/index.phtml b/app/views/console/home/index.phtml
index bbb36e2bc7..494510cc3f 100644
--- a/app/views/console/home/index.phtml
+++ b/app/views/console/home/index.phtml
@@ -248,6 +248,12 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             <li>
                 <div class="link macos-new"><img src="/images/clients/macos.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="macOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New macOS App</div>
             </li>
+            <li>
+                <div class="link watchos-new"><img src="/images/clients/watchos.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="watchOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New watchOS App</div>
+            </li>
+            <li>
+                <div class="link tvos-new"><img src="/images/clients/tvos.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="tvOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New tvOS App</div>
+            </li>
             <li class="disabled">
                 <div class="link unity-new"><img src="/images/clients/unity.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Unity Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New Unity Game  <span class="text-fade text-size-small">(soon)</span></div>
             </li>
@@ -439,6 +445,78 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
     </form>
 </div>
 
+<div data-ui-modal class="modal box close" data-button-alias=".watchos-new">
+    <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
+    <h1>Register your watchOS App</h1>
+
+    <form
+            data-analytics
+            data-analytics-activity
+            data-analytics-event="submit"
+            data-analytics-category="console"
+            data-analytics-label="Create Project Platform (watchOS)"
+            data-service="projects.createPlatform"
+            data-scope="console"
+            data-event="submit"
+            data-success="alert,trigger,reset"
+            data-success-param-alert-text="Registered new platform successfully"
+            data-success-param-trigger-events="projects.createPlatform"
+            data-failure="alert"
+            data-failure-param-alert-text="Failed to register platform"
+            data-failure-param-alert-classname="error">
+
+        <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
+        <input type="hidden" name="type" data-ls-bind="watchos" />
+
+        <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
+        <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My watchOS App" maxlength="128" />
+
+        <label for="key">Bundle ID <span class="tooltip large" data-tooltip="You can find your Bundle Identifier in the General tab for your app's primary target in Xcode."><i class="icon-question"></i></span></label>
+        <input type="text" class="full-width" name="key" required autocomplete="off" placeholder="com.company.appname" />
+
+        <hr />
+
+        <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Back</button>
+    </form>
+</div>
+
+<div data-ui-modal class="modal box close" data-button-alias=".tvos-new">
+    <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
+    <h1>Register your tvOS App</h1>
+
+    <form
+            data-analytics
+            data-analytics-activity
+            data-analytics-event="submit"
+            data-analytics-category="console"
+            data-analytics-label="Create Project Platform (tvOS)"
+            data-service="projects.createPlatform"
+            data-scope="console"
+            data-event="submit"
+            data-success="alert,trigger,reset"
+            data-success-param-alert-text="Registered new platform successfully"
+            data-success-param-trigger-events="projects.createPlatform"
+            data-failure="alert"
+            data-failure-param-alert-text="Failed to register platform"
+            data-failure-param-alert-classname="error">
+
+        <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
+        <input type="hidden" name="type" data-ls-bind="tvos" />
+
+        <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
+        <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My macOS App" maxlength="128" />
+
+        <label for="key">Bundle ID <span class="tooltip large" data-tooltip="You can find your Bundle Identifier in the General tab for your app's primary target in Xcode."><i class="icon-question"></i></span></label>
+        <input type="text" class="full-width" name="key" required autocomplete="off" placeholder="com.company.appname" />
+
+        <hr />
+
+        <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Back</button>
+    </form>
+</div>
+
 <div data-ui-modal class="modal box close width-large" data-button-alias=".flutter-new">
     <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
 
@@ -620,7 +698,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
         data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="console"
-        data-analytics-label="Update Project Platform (Flutter / iOS)"
+        data-analytics-label="Update Project Platform (iOS)"
         data-service="projects.updatePlatform"
         data-scope="console"
         data-event="submit"
@@ -709,6 +787,70 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
     </form>
 </script>
 
+<script type="text/html" id="template-watchos-update">
+    <form
+            data-analytics
+            data-analytics-activity
+            data-analytics-event="submit"
+            data-analytics-category="console"
+            data-analytics-label="Update Project Platform (watchOS)"
+            data-service="projects.updatePlatform"
+            data-scope="console"
+            data-event="submit"
+            data-success="alert,trigger"
+            data-success-param-alert-text="Updated platform successfully"
+            data-success-param-trigger-events="projects.updatePlatform"
+            data-failure="alert"
+            data-failure-param-alert-text="Failed to update platform"
+            data-failure-param-alert-classname="error">
+
+        <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
+        <input type="hidden" name="platformId" data-ls-bind="{{platform.$id}}" />
+
+        <label data-ls-attrs="for=name-{{platform.$id}}">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
+        <input type="text" class="full-width" data-ls-attrs="id=name-{{platform.$id}}" name="name" required autocomplete="off" data-ls-bind="{{platform.name}}" placeholder="My watchOS App" maxlength="128" />
+
+        <label data-ls-attrs="for=key-{{platform.$id}}">Bundle ID <span class="tooltip large" data-tooltip="You can find your Bundle Identifier in the General tab for your app's primary target in Xcode."><i class="icon-question"></i></span></label>
+        <input name="key" type="text" class="margin-bottom" autocomplete="off" placeholder="com.company.appname" data-ls-bind="{{platform.key}}" required />
+
+        <hr />
+
+        <button type="submit">Update</button> &nbsp; <button data-ls-ui-trigger="modal-close" type="button" class="reverse">Back</button>
+    </form>
+</script>
+
+<script type="text/html" id="template-tvos-update">
+    <form
+            data-analytics
+            data-analytics-activity
+            data-analytics-event="submit"
+            data-analytics-category="console"
+            data-analytics-label="Update Project Platform (tvOS)"
+            data-service="projects.updatePlatform"
+            data-scope="console"
+            data-event="submit"
+            data-success="alert,trigger"
+            data-success-param-alert-text="Updated platform successfully"
+            data-success-param-trigger-events="projects.updatePlatform"
+            data-failure="alert"
+            data-failure-param-alert-text="Failed to update platform"
+            data-failure-param-alert-classname="error">
+
+        <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
+        <input type="hidden" name="platformId" data-ls-bind="{{platform.$id}}" />
+
+        <label data-ls-attrs="for=name-{{platform.$id}}">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
+        <input type="text" class="full-width" data-ls-attrs="id=name-{{platform.$id}}" name="name" required autocomplete="off" data-ls-bind="{{platform.name}}" placeholder="My tvOS App" maxlength="128" />
+
+        <label data-ls-attrs="for=key-{{platform.$id}}">Bundle ID <span class="tooltip large" data-tooltip="You can find your Bundle Identifier in the General tab for your app's primary target in Xcode."><i class="icon-question"></i></span></label>
+        <input name="key" type="text" class="margin-bottom" autocomplete="off" placeholder="com.company.appname" data-ls-bind="{{platform.key}}" required />
+
+        <hr />
+
+        <button type="submit">Update</button> &nbsp; <button data-ls-ui-trigger="modal-close" type="button" class="reverse">Back</button>
+    </form>
+</script>
+
 <script type="text/html" id="template-flutter-ios-update">
     <div data-ls-template="template-ios-update" data-type="script"></div>
 </script>
diff --git a/public/images/clients/tvos.png b/public/images/clients/tvos.png
new file mode 100644
index 0000000000..cd8694ccfe
Binary files /dev/null and b/public/images/clients/tvos.png differ
diff --git a/public/images/clients/watchos.png b/public/images/clients/watchos.png
new file mode 100644
index 0000000000..a4310cbbe6
Binary files /dev/null and b/public/images/clients/watchos.png differ