diff --git a/app/config/frameworks.php b/app/config/frameworks.php
index 956d89cb4f..0ab4a8a7db 100644
--- a/app/config/frameworks.php
+++ b/app/config/frameworks.php
@@ -215,12 +215,12 @@ return [
                 'key' => 'ssr',
                 'buildCommand' => 'npm run build',
                 'installCommand' => 'npm install',
-                'outputDirectory' => './.output',
+                'outputDirectory' => './dist',
                 'startCommand' => 'bash helpers/tanstack-start/server.sh',
             ],
             'static' => [
                 'key' => 'static',
-                'buildCommand' => 'npm run generate',
+                'buildCommand' => 'npm run build',
                 'installCommand' => 'npm install',
                 'outputDirectory' => './dist/client',
                 'startCommand' => 'bash helpers/server.sh',
diff --git a/app/config/templates/site.php b/app/config/templates/site.php
index 014d6e4df8..e552a6b9ac 100644
--- a/app/config/templates/site.php
+++ b/app/config/templates/site.php
@@ -121,7 +121,7 @@ const TEMPLATE_FRAMEWORKS = [
         'name' => 'TanStack Start',
         'installCommand' => 'npm install',
         'buildCommand' => 'npm run build',
-        'outputDirectory' => './.output',
+        'outputDirectory' => './dist',
         'buildRuntime' => 'node-22',
         'adapter' => 'ssr',
         'fallbackFile' => '',
@@ -965,6 +965,50 @@ return [
             ],
         ]
     ],
+    [
+        'key' => 'starter-for-tanstack-start',
+        'name' => 'TanStack Start starter',
+        'useCases' => [UseCases::STARTER],
+        'tagline' => 'Simple TanStack Start application integrated with Appwrite SDK.',
+        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'screenshotDark' => $url . '/images/sites/templates/starter-for-tanstack-start-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/starter-for-tanstack-start-light.png',
+        'frameworks' => [
+            getFramework('TANSTACK_START', [
+                'providerRootDirectory' => './',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'starter-for-tanstack-start',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => [
+            [
+                'name' => 'VITE_APPWRITE_ENDPOINT',
+                'description' => 'Endpoint of Appwrite server',
+                'value' => '{apiEndpoint}',
+                'placeholder' => '{apiEndpoint}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'VITE_APPWRITE_PROJECT_ID',
+                'description' => 'Your Appwrite project ID',
+                'value' => '{projectId}',
+                'placeholder' => '{projectId}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'VITE_APPWRITE_PROJECT_NAME',
+                'description' => 'Your Appwrite project name',
+                'value' => '{projectName}',
+                'placeholder' => '{projectName}',
+                'required' => true,
+                'type' => 'text'
+            ],
+        ]
+    ],
     [
         'key' => 'starter-for-nuxt',
         'name' => 'Nuxt starter',
diff --git a/public/images/sites/templates/starter-for-tanstack-start-dark.png b/public/images/sites/templates/starter-for-tanstack-start-dark.png
new file mode 100644
index 0000000000..ccd90505e6
Binary files /dev/null and b/public/images/sites/templates/starter-for-tanstack-start-dark.png differ
diff --git a/public/images/sites/templates/starter-for-tanstack-start-light.png b/public/images/sites/templates/starter-for-tanstack-start-light.png
new file mode 100644
index 0000000000..ccd90505e6
Binary files /dev/null and b/public/images/sites/templates/starter-for-tanstack-start-light.png differ