diff --git a/tests/e2e/Services/Avatars/AvatarsBase.php b/tests/e2e/Services/Avatars/AvatarsBase.php
index cc626be99a..aca3af6dfa 100644
--- a/tests/e2e/Services/Avatars/AvatarsBase.php
+++ b/tests/e2e/Services/Avatars/AvatarsBase.php
@@ -1293,4 +1293,32 @@ trait AvatarsBase
 
         return [];
     }
+
+    public function testGetScreenshotComparison(): array
+    {
+        /**
+         * Test screenshot comparison with stable domain (example.com)
+         * This test captures a screenshot of example.com and compares it
+         * against a reference image to ensure consistent rendering.
+         */
+        $response = $this->client->call(Client::METHOD_GET, '/avatars/screenshots', [
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], [
+            'url' => 'https://example.com',
+            'width' => 800,
+            'height' => 600,
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertEquals('image/png', $response['headers']['content-type']);
+        $this->assertNotEmpty($response['body']);
+
+        // Compare with reference screenshot
+        $referencePath = \realpath(__DIR__ . '/../../../resources/avatars');
+        $referenceScreenshot = $referencePath . '/screenshot-example-com.png';
+        $this->assertFileExists($referenceScreenshot, 'Reference example.com screenshot not found');
+        $this->assertSamePixels($referenceScreenshot, $response['body']);
+
+        return [];
+    }
 }
diff --git a/tests/e2e/Services/Sites/SitesConsoleClientTest.php b/tests/e2e/Services/Sites/SitesConsoleClientTest.php
index 227e36a50e..2b75402b25 100644
--- a/tests/e2e/Services/Sites/SitesConsoleClientTest.php
+++ b/tests/e2e/Services/Sites/SitesConsoleClientTest.php
@@ -74,8 +74,11 @@ class SitesConsoleClientTest extends Scope
         $this->assertGreaterThan(1, $file['headers']['content-length']);
         $this->assertEquals('image/png', $file['headers']['content-type']);
 
-        $screenshotHash = \md5($file['body']);
-        $this->assertNotEmpty($screenshotHash);
+        // Compare with reference screenshots
+        $referencePath = \realpath(__DIR__ . '/../../../resources/sites/static-themed');
+        $referenceScreenshotLight = $referencePath . '/screenshot-light.png';
+        $this->assertFileExists($referenceScreenshotLight, 'Reference light screenshot not found');
+        $this->assertSamePixels($referenceScreenshotLight, $file['body']);
 
         $screenshotId = $deployment['body']['screenshotDark'];
         $file = $this->client->call(Client::METHOD_GET, "/storage/buckets/screenshots/files/$screenshotId/view?project=console", array_merge($this->getHeaders(), [
@@ -87,10 +90,9 @@ class SitesConsoleClientTest extends Scope
         $this->assertGreaterThan(1, $file['headers']['content-length']);
         $this->assertEquals('image/png', $file['headers']['content-type']);
 
-        $screenshotDarkHash = \md5($file['body']);
-        $this->assertNotEmpty($screenshotDarkHash);
-
-        $this->assertNotEquals($screenshotDarkHash, $screenshotHash);
+        $referenceScreenshotDark = $referencePath . '/screenshot-dark.png';
+        $this->assertFileExists($referenceScreenshotDark, 'Reference dark screenshot not found');
+        $this->assertSamePixels($referenceScreenshotDark, $file['body']);
 
         $screenshotId = $deployment['body']['screenshotLight'];
         $file = $this->client->call(Client::METHOD_GET, "/storage/buckets/screenshots/files/$screenshotId/view?project=console");
diff --git a/tests/resources/avatars/screenshot-example-com.png b/tests/resources/avatars/screenshot-example-com.png
new file mode 100644
index 0000000000..2f8af920e0
Binary files /dev/null and b/tests/resources/avatars/screenshot-example-com.png differ
diff --git a/tests/resources/sites/static-themed/index.html b/tests/resources/sites/static-themed/index.html
index 955696b473..f6b9d42643 100644
--- a/tests/resources/sites/static-themed/index.html
+++ b/tests/resources/sites/static-themed/index.html
@@ -5,19 +5,145 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Themed website</title>
     <style>
-        /* Light theme */
-        body {
-            background-color: #ffffff;
-            color: #000000;
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
         }
+
+        /* Light theme */
+        :root {
+            --bg-primary: #ffffff;
+            --bg-secondary: #f5f5f5;
+            --text-primary: #1a1a1a;
+            --text-secondary: #666666;
+            --accent: #fd366e;
+            --border: #e0e0e0;
+        }
+
         /* Dark theme */
         @media (prefers-color-scheme: dark) {
-            body {
-                background-color: #000000;
-                color: #ffffff;
+            :root {
+                --bg-primary: #1a1a1a;
+                --bg-secondary: #2d2d2d;
+                --text-primary: #ffffff;
+                --text-secondary: #b0b0b0;
+                --accent: #fd366e;
+                --border: #404040;
             }
         }
+
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
+            background-color: var(--bg-primary);
+            color: var(--text-primary);
+            line-height: 1.6;
+            min-height: 100vh;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            padding: 2rem;
+        }
+
+        .container {
+            max-width: 600px;
+            width: 100%;
+        }
+
+        header {
+            text-align: center;
+            margin-bottom: 3rem;
+        }
+
+        h1 {
+            font-size: 2.5rem;
+            margin-bottom: 0.5rem;
+            color: var(--text-primary);
+        }
+
+        .subtitle {
+            font-size: 1.125rem;
+            color: var(--text-secondary);
+        }
+
+        .card {
+            background-color: var(--bg-secondary);
+            border: 1px solid var(--border);
+            border-radius: 12px;
+            padding: 2rem;
+            margin-bottom: 2rem;
+        }
+
+        .card h2 {
+            font-size: 1.5rem;
+            margin-bottom: 1rem;
+            color: var(--text-primary);
+        }
+
+        .card p {
+            color: var(--text-secondary);
+            margin-bottom: 1rem;
+        }
+
+        .feature-list {
+            list-style: none;
+            margin-top: 1.5rem;
+        }
+
+        .feature-list li {
+            padding: 0.75rem;
+            margin-bottom: 0.5rem;
+            background-color: var(--bg-primary);
+            border-radius: 8px;
+            border-left: 3px solid var(--accent);
+            color: var(--text-primary);
+        }
+
+        .badge {
+            display: inline-block;
+            padding: 0.25rem 0.75rem;
+            background-color: var(--accent);
+            color: white;
+            border-radius: 20px;
+            font-size: 0.875rem;
+            font-weight: 600;
+        }
+
+        footer {
+            text-align: center;
+            margin-top: 3rem;
+            color: var(--text-secondary);
+            font-size: 0.875rem;
+        }
     </style>
 </head>
-<body></body>
+<body>
+<div class="container">
+    <header>
+        <h1>Themed website</h1>
+        <p class="subtitle">Adaptive light & dark mode showcase</p>
+    </header>
+
+    <div class="card">
+        <h2>About This Site</h2>
+        <p>This is a test deployment showcasing automatic theme switching based on your system preferences.</p>
+        <span class="badge">Appwrite Sites</span>
+    </div>
+
+    <div class="card">
+        <h2>Features</h2>
+        <ul class="feature-list">
+            <li>🎨 Automatic theme detection</li>
+            <li>🌓 Light and dark mode support</li>
+            <li>📱 Responsive design</li>
+            <li>⚡ Fast static deployment</li>
+        </ul>
+    </div>
+
+    <footer>
+        <p>Powered by Appwrite Sites • E2E Test</p>
+    </footer>
+</div>
+</body>
 </html>
diff --git a/tests/resources/sites/static-themed/screenshot-dark.png b/tests/resources/sites/static-themed/screenshot-dark.png
new file mode 100644
index 0000000000..bcab317265
Binary files /dev/null and b/tests/resources/sites/static-themed/screenshot-dark.png differ
diff --git a/tests/resources/sites/static-themed/screenshot-light.png b/tests/resources/sites/static-themed/screenshot-light.png
new file mode 100644
index 0000000000..9836740a2f
Binary files /dev/null and b/tests/resources/sites/static-themed/screenshot-light.png differ