diff --git a/composer.json b/composer.json
index 62811e9d32..655493ddd7 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,7 @@
         "utopia-php/detector": "0.2.*",
         "utopia-php/domains": "0.9.*",
         "utopia-php/emails": "0.6.*",
-        "utopia-php/dns": "0.3.*",
+        "utopia-php/dns": "1.1.*",
         "utopia-php/dsn": "0.2.1",
         "utopia-php/framework": "0.33.*",
         "utopia-php/fetch": "0.4.*",
diff --git a/composer.lock b/composer.lock
index 8faa5a477c..282120c732 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a184716dd568cd37c015e1e929dd3c24",
+    "content-hash": "c5122fe03bab9e4c6813ec6d9e46b8f4",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -3974,29 +3974,28 @@
         },
         {
             "name": "utopia-php/dns",
-            "version": "0.3.0",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/dns.git",
-                "reference": "8fd4161bc3a8021a670c1101b40f6b09a97f1a54"
+                "reference": "d6eca184883262bdcb4261e57491c91b16079b9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/dns/zipball/8fd4161bc3a8021a670c1101b40f6b09a97f1a54",
-                "reference": "8fd4161bc3a8021a670c1101b40f6b09a97f1a54",
+                "url": "https://api.github.com/repos/utopia-php/dns/zipball/d6eca184883262bdcb4261e57491c91b16079b9a",
+                "reference": "d6eca184883262bdcb4261e57491c91b16079b9a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0",
-                "utopia-php/cli": "0.15.*",
-                "utopia-php/telemetry": "^0.1.1"
+                "php": ">=8.3",
+                "utopia-php/console": "0.0.*",
+                "utopia-php/telemetry": "0.1.*"
             },
             "require-dev": {
-                "laravel/pint": "1.2.*",
-                "phpstan/phpstan": "1.8.*",
-                "phpunit/phpunit": "^9.3",
-                "rregeer/phpunit-coverage-check": "^0.3.1",
-                "swoole/ide-helper": "4.6.6"
+                "laravel/pint": "1.25.*",
+                "phpstan/phpstan": "2.0.*",
+                "phpunit/phpunit": "12.4.*",
+                "swoole/ide-helper": "5.1.8"
             },
             "type": "library",
             "autoload": {
@@ -4024,9 +4023,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/dns/issues",
-                "source": "https://github.com/utopia-php/dns/tree/0.3.0"
+                "source": "https://github.com/utopia-php/dns/tree/1.1.0"
             },
-            "time": "2025-08-04T11:05:53+00:00"
+            "time": "2025-11-03T22:49:02+00:00"
         },
         {
             "name": "utopia-php/domains",
@@ -8982,7 +8981,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
@@ -9006,5 +9005,5 @@
     "platform-overrides": {
         "php": "8.3"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/src/Appwrite/Network/Validator/DNS.php b/src/Appwrite/Network/Validator/DNS.php
index f09bb42b02..e3c1d38015 100644
--- a/src/Appwrite/Network/Validator/DNS.php
+++ b/src/Appwrite/Network/Validator/DNS.php
@@ -3,118 +3,65 @@
 namespace Appwrite\Network\Validator;
 
 use Utopia\DNS\Client;
+use Utopia\DNS\Message;
+use Utopia\DNS\Message\Question;
+use Utopia\DNS\Message\Record;
 use Utopia\Domains\Domain;
 use Utopia\System\System;
 use Utopia\Validator;
 
 class DNS extends Validator
 {
-    public const RECORD_A = 'A';
-    public const RECORD_AAAA = 'AAAA';
-    public const RECORD_CNAME = 'CNAME';
-    public const RECORD_CAA = 'CAA'; // You can provide domain only (as $target) for CAA validation
-
-    /**
-     * @var mixed
-     */
-    protected mixed $logs;
-
-    /**
-     * @var string
-     */
-    protected string $dnsServer;
-
-    /**
-     * @param string $target
-     */
-    public function __construct(protected string $target, protected string $type = self::RECORD_CNAME, string $dnsServer = '')
-    {
-        if (empty($dnsServer)) {
-            $dnsServer = System::getEnv('_APP_DNS', '8.8.8.8');
-        }
-
-        $this->dnsServer = $dnsServer;
+    public function __construct(
+        protected string $target,
+        protected int $type = Record::TYPE_CNAME,
+        protected string $server = ''
+    ) {
+        $this->server = $server ?: System::getEnv('_APP_DNS', '8.8.8.8');
     }
 
-    /**
-     * @return string
-     */
     public function getDescription(): string
     {
-        return 'Invalid DNS record';
+        return 'Invalid DNS record.';
     }
 
-    /**
-     * @return mixed
-     */
-    public function getLogs(): mixed
-    {
-        return $this->logs;
-    }
-
-    /**
-     * Check if DNS record value matches specific value
-     *
-     * @param mixed $domain
-     * @return bool
-     */
     public function isValid($value): bool
     {
-        if (!is_string($value)) {
+        if (!is_string($value) || trim($value) === '') {
             return false;
         }
 
-        $dns = new Client($this->dnsServer);
-
+        $client = new Client($this->server);
         try {
-            $rawQuery = $dns->query($value, $this->type);
-
-            // Some DNS servers return all records, not only type that's asked for
-            // Likely occurs when no records of specific type are found
-            $query = array_filter($rawQuery, function ($record) {
-                return $record->getTypeName() === $this->type;
-            });
-
-            $this->logs = $query;
-        } catch (\Exception $e) {
-            $this->logs = ['error' => $e->getMessage()];
+            $response = $client->query(Message::query(
+                new Question($value, $this->type)
+            ));
+        } catch (\Throwable) {
             return false;
         }
 
-        if (empty($query)) {
-            // CAA records inherit from parent (custom CAA behaviour)
-            if ($this->type === self::RECORD_CAA) {
-                $domain = new Domain($value);
-                if ($domain->get() === $domain->getApex()) {
-                    return true; // No CAA on apex domain means anyone can issue certificate
-                }
+        $typeMatches = array_filter(
+            $response->answers,
+            fn (Record $record) => $record->type === $this->type
+        );
 
-                // Recursive validation by parent domain
-                $parts = \explode('.', $value);
-                \array_shift($parts);
-                $parentDomain = \implode('.', $parts);
-                $validator = new DNS($this->target, DNS::RECORD_CAA, $this->dnsServer);
-                return $validator->isValid($parentDomain);
+        if (empty($typeMatches)) {
+            if ($this->type === Record::TYPE_CAA) {
+                return $this->validateParentCAA($value);
             }
 
             return false;
         }
 
-        foreach ($query as $record) {
-            // CAA validation only needs to ensure domain
-            if ($this->type === self::RECORD_CAA) {
-                // Extract domain; comments showcase extraction steps in most complex scenario
-                $rdata = $record->getRdata(); // 255 issuewild "certainly.com;validationmethods=tls-alpn-01;retrytimeout=3600"
-                $rdata = \explode(' ', $rdata, 3)[2] ?? ''; // "certainly.com;validationmethods=tls-alpn-01;retrytimeout=3600"
-                $rdata = \trim($rdata, '"'); // certainly.com;validationmethods=tls-alpn-01;retrytimeout=3600
-                $rdata = \explode(';', $rdata, 2)[0] ?? ''; // certainly.com
-
-                if ($rdata === $this->target) {
+        foreach ($typeMatches as $record) {
+            if ($this->type === Record::TYPE_CAA) {
+                $valuePart = $this->extractCAAValue($record->rdata);
+                if ($valuePart !== '' && $valuePart === $this->target) {
                     return true;
                 }
             }
 
-            if ($record->getRdata() === $this->target) {
+            if ($record->rdata === $this->target) {
                 return true;
             }
         }
@@ -122,25 +69,46 @@ class DNS extends Validator
         return false;
     }
 
-    /**
-     * Is array
-     *
-     * Function will return true if object is array.
-     *
-     * @return bool
-     */
+    private function validateParentCAA(string $domain): bool
+    {
+        try {
+            $domainInfo = new Domain($domain);
+        } catch (\Throwable) {
+            return false;
+        }
+
+        if ($domainInfo->get() === $domainInfo->getApex()) {
+            return true;
+        }
+
+        $parts = explode('.', $domainInfo->get());
+        array_shift($parts);
+        $parent = implode('.', $parts);
+
+        if ($parent === '') {
+            return false;
+        }
+
+        $validator = new self($this->target, Record::TYPE_CAA, $this->server);
+        return $validator->isValid($parent);
+    }
+
+    private function extractCAAValue(string $rdata): string
+    {
+        $parts = explode(' ', $rdata, 3);
+        if (count($parts) < 3) {
+            return '';
+        }
+
+        $value = trim($parts[2], '"');
+        return explode(';', $value)[0] ?? '';
+    }
+
     public function isArray(): bool
     {
         return false;
     }
 
-    /**
-     * Get Type
-     *
-     * Returns validator type.
-     *
-     * @return string
-     */
     public function getType(): string
     {
         return self::TYPE_STRING;
diff --git a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/API/Create.php b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/API/Create.php
index 4cc8f48e7c..ff92b3a408 100644
--- a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/API/Create.php
+++ b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/API/Create.php
@@ -14,6 +14,7 @@ use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Helpers\ID;
+use Utopia\DNS\Message\Record;
 use Utopia\Domains\Domain;
 use Utopia\Platform\Action;
 use Utopia\Platform\Scope\HTTP;
@@ -135,13 +136,13 @@ class Create extends Action
             $validators = [];
             $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
             if ($targetCNAME->isKnown() && !$targetCNAME->isTest()) {
-                $validators[] = new DNS($targetCNAME->get(), DNS::RECORD_CNAME);
+                $validators[] = new DNS($targetCNAME->get(), Record::TYPE_CNAME);
             }
             if ((new IP(IP::V4))->isValid(System::getEnv('_APP_DOMAIN_TARGET_A', ''))) {
-                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), DNS::RECORD_A);
+                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), Record::TYPE_A);
             }
             if ((new IP(IP::V6))->isValid(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''))) {
-                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''), DNS::RECORD_AAAA);
+                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''), Record::TYPE_AAAA);
             }
 
             if (empty($validators)) {
diff --git a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Function/Create.php b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Function/Create.php
index 5839e03e25..6e6d9905a8 100644
--- a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Function/Create.php
+++ b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Function/Create.php
@@ -15,6 +15,7 @@ use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Validator\UID;
+use Utopia\DNS\Message\Record;
 use Utopia\Domains\Domain;
 use Utopia\Platform\Action;
 use Utopia\Platform\Scope\HTTP;
@@ -147,13 +148,13 @@ class Create extends Action
             $validators = [];
             $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
             if ($targetCNAME->isKnown() && !$targetCNAME->isTest()) {
-                $validators[] = new DNS($targetCNAME->get(), DNS::RECORD_CNAME);
+                $validators[] = new DNS($targetCNAME->get(), Record::TYPE_CNAME);
             }
             if ((new IP(IP::V4))->isValid(System::getEnv('_APP_DOMAIN_TARGET_A', ''))) {
-                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), DNS::RECORD_A);
+                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), Record::TYPE_A);
             }
             if ((new IP(IP::V6))->isValid(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''))) {
-                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''), DNS::RECORD_AAAA);
+                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''), Record::TYPE_AAAA);
             }
 
             if (empty($validators)) {
diff --git a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php
index 1dfef8bcc7..e2cc51d91f 100644
--- a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php
+++ b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php
@@ -15,6 +15,7 @@ use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Validator\UID;
+use Utopia\DNS\Message\Record;
 use Utopia\Domains\Domain;
 use Utopia\Platform\Action;
 use Utopia\Platform\Scope\HTTP;
@@ -152,13 +153,13 @@ class Create extends Action
             $validators = [];
             $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
             if ($targetCNAME->isKnown() && !$targetCNAME->isTest()) {
-                $validators[] = new DNS($targetCNAME->get(), DNS::RECORD_CNAME);
+                $validators[] = new DNS($targetCNAME->get(), Record::TYPE_CNAME);
             }
             if ((new IP(IP::V4))->isValid(System::getEnv('_APP_DOMAIN_TARGET_A', ''))) {
-                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), DNS::RECORD_A);
+                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), Record::TYPE_A);
             }
             if ((new IP(IP::V6))->isValid(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''))) {
-                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''), DNS::RECORD_AAAA);
+                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''), Record::TYPE_AAAA);
             }
 
             if (empty($validators)) {
diff --git a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Site/Create.php b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Site/Create.php
index 43cf09eaca..5154a82e16 100644
--- a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Site/Create.php
+++ b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Site/Create.php
@@ -15,6 +15,7 @@ use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Validator\UID;
+use Utopia\DNS\Message\Record;
 use Utopia\Domains\Domain;
 use Utopia\Platform\Action;
 use Utopia\Platform\Scope\HTTP;
@@ -147,13 +148,13 @@ class Create extends Action
             $validators = [];
             $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
             if ($targetCNAME->isKnown() && !$targetCNAME->isTest()) {
-                $validators[] = new DNS($targetCNAME->get(), DNS::RECORD_CNAME);
+                $validators[] = new DNS($targetCNAME->get(), Record::TYPE_CNAME);
             }
             if ((new IP(IP::V4))->isValid(System::getEnv('_APP_DOMAIN_TARGET_A', ''))) {
-                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), DNS::RECORD_A);
+                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), Record::TYPE_A);
             }
             if ((new IP(IP::V6))->isValid(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''))) {
-                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''), DNS::RECORD_AAAA);
+                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''), Record::TYPE_AAAA);
             }
 
             if (empty($validators)) {
diff --git a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php
index 3d52d203c3..af61f25f05 100644
--- a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php
+++ b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php
@@ -13,6 +13,7 @@ use Appwrite\Utopia\Response;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\UID;
+use Utopia\DNS\Message\Record;
 use Utopia\Domains\Domain;
 use Utopia\Logger\Log;
 use Utopia\Platform\Action;
@@ -113,15 +114,15 @@ class Update extends Action
 
         if (!is_null($targetCNAME)) {
             if ($targetCNAME->isKnown() && !$targetCNAME->isTest()) {
-                $validators[] = new DNS($targetCNAME->get(), DNS::RECORD_CNAME);
+                $validators[] = new DNS($targetCNAME->get(), Record::TYPE_CNAME);
             }
         }
 
         if ((new IP(IP::V4))->isValid(System::getEnv('_APP_DOMAIN_TARGET_A', ''))) {
-            $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), DNS::RECORD_A);
+            $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), Record::TYPE_A);
         }
         if ((new IP(IP::V6))->isValid(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''))) {
-            $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''), DNS::RECORD_AAAA);
+            $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''), Record::TYPE_AAAA);
         }
 
         if (empty($validators)) {
@@ -139,24 +140,13 @@ class Update extends Action
         if (!$validator->isValid($domain->get())) {
             $log->addExtra('dnsTiming', \strval(\microtime(true) - $validationStart));
             $log->addTag('dnsDomain', $domain->get());
-
-            $errors = [];
-            foreach ($validators as $validator) {
-                if (!empty($validator->getLogs())) {
-                    $errors[] = $validator->getLogs();
-                }
-            }
-
-            $error = \implode("\n", $errors);
-            $log->addExtra('dnsResponse', \is_array($error) ? \json_encode($error) : \strval($error));
-
             throw new Exception(Exception::RULE_VERIFICATION_FAILED);
         }
 
         // Ensure CAA won't block certificate issuance
         if (!empty(System::getEnv('_APP_DOMAIN_TARGET_CAA', ''))) {
             $validationStart = \microtime(true);
-            $validator = new DNS(System::getEnv('_APP_DOMAIN_TARGET_CAA', ''), DNS::RECORD_CAA);
+            $validator = new DNS(System::getEnv('_APP_DOMAIN_TARGET_CAA', ''), Record::TYPE_CAA);
             if (!$validator->isValid($domain->get())) {
                 $log->addExtra('dnsTimingCaa', \strval(\microtime(true) - $validationStart));
                 $log->addTag('dnsDomain', $domain->get());
diff --git a/src/Appwrite/Platform/Workers/Certificates.php b/src/Appwrite/Platform/Workers/Certificates.php
index 73447b5515..ac3deb31af 100644
--- a/src/Appwrite/Platform/Workers/Certificates.php
+++ b/src/Appwrite/Platform/Workers/Certificates.php
@@ -22,6 +22,7 @@ use Utopia\Database\Exception\Conflict;
 use Utopia\Database\Exception\Structure;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
+use Utopia\DNS\Message\Record;
 use Utopia\Domains\Domain;
 use Utopia\Locale\Locale;
 use Utopia\Logger\Log;
@@ -313,13 +314,13 @@ class Certificates extends Action
             $validators = [];
             $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
             if ($targetCNAME->isKnown() && !$targetCNAME->isTest()) {
-                $validators[] = new DNS($targetCNAME->get(), DNS::RECORD_CNAME);
+                $validators[] = new DNS($targetCNAME->get(), Record::TYPE_CNAME);
             }
             if ((new IP(IP::V4))->isValid(System::getEnv('_APP_DOMAIN_TARGET_A', ''))) {
-                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), DNS::RECORD_A);
+                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), Record::TYPE_A);
             }
             if ((new IP(IP::V6))->isValid(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''))) {
-                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''), DNS::RECORD_AAAA);
+                $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''), Record::TYPE_AAAA);
             }
 
             // Validate if domain target is properly configured
@@ -332,24 +333,13 @@ class Certificates extends Action
             if (!$validator->isValid($domain->get())) {
                 $log->addExtra('dnsTiming', \strval(\microtime(true) - $validationStart));
                 $log->addTag('dnsDomain', $domain->get());
-
-                $errors = [];
-                foreach ($validators as $validator) {
-                    if (!empty($validator->getLogs())) {
-                        $errors[] = $validator->getLogs();
-                    }
-                }
-
-                $error = \implode("\n", $errors);
-                $log->addExtra('dnsResponse', \is_array($error) ? \json_encode($error) : \strval($error));
-
                 throw new Exception('Failed to verify domain DNS records.');
             }
 
             // Ensure CAA won't block certificate issuance
             if (!empty(System::getEnv('_APP_DOMAIN_TARGET_CAA', ''))) {
                 $validationStart = \microtime(true);
-                $validator = new DNS(System::getEnv('_APP_DOMAIN_TARGET_CAA', ''), DNS::RECORD_CAA);
+                $validator = new DNS(System::getEnv('_APP_DOMAIN_TARGET_CAA', ''), Record::TYPE_CAA);
                 if (!$validator->isValid($domain->get())) {
                     $log->addExtra('dnsTimingCaa', \strval(\microtime(true) - $validationStart));
                     $log->addTag('dnsDomain', $domain->get());
diff --git a/tests/unit/Network/Validators/DNSTest.php b/tests/unit/Network/Validators/DNSTest.php
index c3e819e7dc..9f8928b87f 100644
--- a/tests/unit/Network/Validators/DNSTest.php
+++ b/tests/unit/Network/Validators/DNSTest.php
@@ -5,30 +5,20 @@ namespace Tests\Unit\Network\Validators;
 use Appwrite\Network\Validator\DNS;
 use Appwrite\Tests\Retry;
 use PHPUnit\Framework\TestCase;
+use Utopia\DNS\Message\Record;
 
-/*
-DNS Setup (on Appwrite Labs digital ocean team, network tab):
-
-certainly.caa.appwrite.org: CAA 0 issue "certainly.com"
-certainly-full.caa.appwrite.org: CAA 128 issuewild "certainly.com;account=123456;validationmethods=dns-01"
-letsencrypt.certainly.caa.appwrite.org: CAA 0 issue "letsencrypt.org"
-
-*/
-
+/**
+ * DNS Setup (on Appwrite Labs digital ocean team, network tab):
+ *
+ * certainly.caa.appwrite.org: CAA 0 issue "certainly.com"
+ * certainly-full.caa.appwrite.org: CAA 128 issuewild "certainly.com;account=123456;validationmethods=dns-01"
+ * letsencrypt.certainly.caa.appwrite.org: CAA 0 issue "letsencrypt.org"
+ */
 class DNSTest extends TestCase
 {
-    public function setUp(): void
-    {
-
-    }
-
-    public function tearDown(): void
-    {
-    }
-
     public function testCNAME(): void
     {
-        $validator = new DNS('appwrite.io', DNS::RECORD_CNAME);
+        $validator = new DNS('appwrite.io', Record::TYPE_CNAME);
         $this->assertEquals($validator->isValid(''), false);
         $this->assertEquals($validator->isValid(null), false);
         $this->assertEquals($validator->isValid(false), false);
@@ -39,7 +29,7 @@ class DNSTest extends TestCase
     public function testA(): void
     {
         // IPv4 for documentation purposes
-        $validator = new DNS('203.0.113.1', DNS::RECORD_A);
+        $validator = new DNS('203.0.113.1', Record::TYPE_A);
         $this->assertEquals($validator->isValid(''), false);
         $this->assertEquals($validator->isValid(null), false);
         $this->assertEquals($validator->isValid(false), false);
@@ -50,7 +40,7 @@ class DNSTest extends TestCase
     public function testAAAA(): void
     {
         // IPv6 for documentation purposes
-        $validator = new DNS('2001:db8::1', DNS::RECORD_AAAA);
+        $validator = new DNS('2001:db8::1', Record::TYPE_AAAA);
         $this->assertEquals($validator->isValid(''), false);
         $this->assertEquals($validator->isValid(null), false);
         $this->assertEquals($validator->isValid(false), false);
@@ -61,8 +51,8 @@ class DNSTest extends TestCase
     #[Retry(count: 5)]
     public function testCAA(): void
     {
-        $certainly = new DNS('certainly.com', DNS::RECORD_CAA, 'ns1.digitalocean.com');
-        $letsencrypt = new DNS('letsencrypt.org', DNS::RECORD_CAA, 'ns1.digitalocean.com');
+        $certainly = new DNS('certainly.com', Record::TYPE_CAA, 'ns1.digitalocean.com');
+        $letsencrypt = new DNS('letsencrypt.org', Record::TYPE_CAA, 'ns1.digitalocean.com');
 
         // No CAA record succeeds on main domain & subdomains for any issuer
         $this->assertEquals($certainly->isValid('caa.appwrite.org'), true);
@@ -78,11 +68,11 @@ class DNSTest extends TestCase
         $this->assertEquals($letsencrypt->isValid('certainly-full.caa.appwrite.org'), false);
 
         // Custom flags&tag are not allowed if validator includes specific flags&tag
-        $certainlyFull = new DNS('0 issue "certainly.com"', DNS::RECORD_CAA);
+        $certainlyFull = new DNS('0 issue "certainly.com"', Record::TYPE_CAA);
         $this->assertEquals($certainlyFull->isValid('certainly-full.caa.appwrite.org'), false);
 
         // Custom flags&tag still allows if they match exactly
-        $certainlyFull = new DNS('128 issuewild "certainly.com;account=123456;validationmethods=dns-01"', DNS::RECORD_CAA);
+        $certainlyFull = new DNS('128 issuewild "certainly.com;account=123456;validationmethods=dns-01"', Record::TYPE_CAA);
         $this->assertEquals($certainlyFull->isValid('certainly-full.caa.appwrite.org'), true);
 
         // Certainly CAA allows Certainly, but not LetsEncrypt; Same for subdomains