diff --git a/.env b/.env
index d71439de15..7cf7180d24 100644
--- a/.env
+++ b/.env
@@ -80,7 +80,7 @@ _APP_EXECUTOR_SECRET=your-secret-key
 _APP_EXECUTOR_HOST=http://proxy/v1
 _APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
 _APP_SITES_RUNTIMES=static-1,node-22
-_APP_SITES_FRAMEWORKS=sveltekit,nextjs,static
+_APP_SITES_FRAMEWORKS=sveltekit,nextjs,nuxt,astro,angular,remix,static
 _APP_MAINTENANCE_INTERVAL=86400
 _APP_MAINTENANCE_DELAY=
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
diff --git a/app/config/site-templates.php b/app/config/site-templates.php
index e9ebb4c959..0617e3c95f 100644
--- a/app/config/site-templates.php
+++ b/app/config/site-templates.php
@@ -75,7 +75,7 @@ return [
         'name' => 'Next.js Starter website',
         'useCases' => ['starter'],
         'demoUrl' => 'https://nextjs-starter.sites.qa17.appwrite.org/',
-        'demoImage' => 'https://qa17.appwrite.org/images/sites/nextjs-starter.png',
+        'demoImage' => 'https://qa17.appwrite.org/images/sites/templates/nextjs-starter.png',
         'frameworks' => [
             getFramework('NEXTJS', [
                 'providerRootDirectory' => './nextjs/starter',
@@ -92,7 +92,7 @@ return [
         'name' => 'Nuxt Starter website',
         'useCases' => ['starter'],
         'demoUrl' => 'https://nuxt-starter.sites.qa17.appwrite.org/',
-        'demoImage' => 'https://qa17.appwrite.org/images/sites/nuxt-starter.png',
+        'demoImage' => 'https://qa17.appwrite.org/images/sites/templates/nuxt-starter.png',
         'frameworks' => [
             getFramework('NUXT', [
                 'providerRootDirectory' => './nuxt/starter',
@@ -109,7 +109,7 @@ return [
         'name' => 'SvelteKit Starter website',
         'useCases' => ['starter'],
         'demoUrl' => 'https://sveltekit-starter.sites.qa17.appwrite.org/',
-        'demoImage' => 'https://qa17.appwrite.org/images/sites/sveltekit-starter.png',
+        'demoImage' => 'https://qa17.appwrite.org/images/sites/templates/sveltekit-starter.png',
         'frameworks' => [
             getFramework('SVELTEKIT', [
                 'providerRootDirectory' => './sveltekit/starter',
@@ -126,7 +126,7 @@ return [
         'name' => 'Astro Starter website',
         'useCases' => ['starter'],
         'demoUrl' => 'https://astro-starter.sites.qa17.appwrite.org/',
-        'demoImage' => 'https://qa17.appwrite.org/images/sites/astro-starter.png',
+        'demoImage' => 'https://qa17.appwrite.org/images/sites/templates/astro-starter.png',
         'frameworks' => [
             getFramework('ASTRO', [
                 'providerRootDirectory' => './astro/starter',
@@ -143,7 +143,7 @@ return [
         'name' => 'Remix Starter website',
         'useCases' => ['starter'],
         'demoUrl' => 'https://remix-starter.sites.qa17.appwrite.org/',
-        'demoImage' => 'https://qa17.appwrite.org/images/sites/remix-starter.png',
+        'demoImage' => 'https://qa17.appwrite.org/images/sites/templates/remix-starter.png',
         'frameworks' => [
             getFramework('REMIX', [
                 'providerRootDirectory' => './remix/starter',
@@ -160,7 +160,7 @@ return [
         'name' => 'Angular Starter website',
         'useCases' => ['starter'],
         'demoUrl' => 'https://angular-starter.sites.qa17.appwrite.org/',
-        'demoImage' => 'https://qa17.appwrite.org/images/sites/angular-starter.png',
+        'demoImage' => 'https://qa17.appwrite.org/images/sites/templates/angular-starter.png',
         'frameworks' => [
             getFramework('ANGULAR', [
                 'providerRootDirectory' => './angular/starter',
diff --git a/app/config/specs/open-api3-latest-console.json b/app/config/specs/open-api3-latest-console.json
index f73b3d21a0..62879abf67 100644
--- a/app/config/specs/open-api3-latest-console.json
+++ b/app/config/specs/open-api3-latest-console.json
@@ -37560,7 +37560,7 @@
                     "demoImage": {
                         "type": "string",
                         "description": "File URL with preview screenshot.",
-                        "x-example": "https:\/\/cloud.appwrite.io\/images\/sites\/nextjs-starter.png"
+                        "x-example": "https:\/\/cloud.appwrite.io\/images\/sites\/templates\/nextjs-starter.png"
                     },
                     "useCases": {
                         "type": "array",
diff --git a/app/config/specs/swagger2-latest-console.json b/app/config/specs/swagger2-latest-console.json
index ebb68b1e96..ac086117dd 100644
--- a/app/config/specs/swagger2-latest-console.json
+++ b/app/config/specs/swagger2-latest-console.json
@@ -38114,7 +38114,7 @@
                 "demoImage": {
                     "type": "string",
                     "description": "File URL with preview screenshot.",
-                    "x-example": "https:\/\/cloud.appwrite.io\/images\/sites\/nextjs-starter.png"
+                    "x-example": "https:\/\/cloud.appwrite.io\/images\/sites\/templates\/nextjs-starter.png"
                 },
                 "useCases": {
                     "type": "array",
diff --git a/src/Appwrite/Utopia/Response/Model/TemplateSite.php b/src/Appwrite/Utopia/Response/Model/TemplateSite.php
index 63fe0edfae..748cd9088d 100644
--- a/src/Appwrite/Utopia/Response/Model/TemplateSite.php
+++ b/src/Appwrite/Utopia/Response/Model/TemplateSite.php
@@ -32,7 +32,7 @@ class TemplateSite extends Model
                 'type' => self::TYPE_STRING,
                 'description' => 'File URL with preview screenshot.',
                 'default' => '',
-                'example' => 'https://cloud.appwrite.io/images/sites/nextjs-starter.png',
+                'example' => 'https://cloud.appwrite.io/images/sites/templates/nextjs-starter.png',
             ])
             ->addRule('useCases', [
                 'type' => self::TYPE_STRING,