diff --git a/doh-scripts/nextdns.rsc b/doh-scripts/nextdns.rsc
index 499bc5d..79f46ae 100644
--- a/doh-scripts/nextdns.rsc
+++ b/doh-scripts/nextdns.rsc
@@ -6,27 +6,27 @@
 :local deviceName
 :set nextdnsID "abc123"
 # Avoid spaces or use unicode
-:local deviceName "MikroTik-AX2"
+:set deviceName "MikroTik-AX2"
 
 # disable doh (temporarily)
-
 /ip dns set verify-doh-cert=no
 
-# Quad9 uses DigiCert like CloudFlare.
+# NextDNS uses UserTrust ECC cert
 :local result [ /tool fetch url=http://crt.usertrust.com/USERTrustECCAddTrustCA.crt dst-path=nextdns.pem as-value ];
 :do { :delay 2s } while=( $result->"status" != "finished" )
 
-/certificate remove [find name~"nextdns.pem"]
+/certificate remove [find name~"nextdns"]
 /certificate import file-name=nextdns.pem passphrase=""
 /file remove nextdns.pem
 
 /ip dns
-    static remove [find name="dns.quad9.net"]
+    static remove [find name="dns.nextdns.io"]
     static add name=dns.nextdns.io address=45.90.28.0 type=A
     static add name=dns.nextdns.io address=45.90.30.0 type=A
     static add name=dns.nextdns.io address=2a07:a8c0:: type=AAAA
     static add name=dns.nextdns.io address=2a07:a8c1:: type=AAAA
 
+# Configure Device Name with NextDNS, if exists.
 :if ( $deviceName == "" ) do={
     set use-doh-server="https://dns.nextdns.io/$nextdnsID" verify-doh-cert=yes
 } else={
@@ -34,8 +34,8 @@
 }
 
 # optional steps
-/ip dns set servers=""
-/ip dhcp-client set use-peer-dns=no [find]
+# /ip dns set servers=""
+# /ip dhcp-client set use-peer-dns=no [find]
 
 # flush existing cache
 /ip dns cache flush