diff --git a/data.nix b/data.nix
index 5260cfc..c254eb7 100644
--- a/data.nix
+++ b/data.nix
@@ -80,12 +80,16 @@ rec {
     fwmine                       A     ${hel1a}
     hel1-a                       A     ${hel1a}
     vno1                         A     ${vno1}
-    grafana                      A     ${hosts."vno1-oh2.servers.jakst".jakstIP}
-    _acme-challenge.grafana     NS     _acme.grafana.jakstys.lt.
+
     @                           MX     10 aspmx.l.google.com.
     @                           MX     20 alt1.aspmx.l.google.com.
     @                           MX     20 alt2.aspmx.l.google.com.
     @                           MX     30 aspmx2.googlemail.com.
     @                           MX     30 aspmx3.googlemail.com.
+
+    grafana                   600     A     ${hosts."vno1-oh2.servers.jakst".jakstIP}
+    _acme-challenge.grafana   600 CNAME     _acme-endpoint.grafana
+    _acme-endpoint.grafana    600    NS     ns._acme-endpoint.grafana
+    ns._acme-endpoint.grafana 600     A     ${vno1}
   '';
 }
diff --git a/hosts/vno1-oh2/configuration.nix b/hosts/vno1-oh2/configuration.nix
index fb1250f..f7b82a4 100644
--- a/hosts/vno1-oh2/configuration.nix
+++ b/hosts/vno1-oh2/configuration.nix
@@ -175,11 +175,12 @@
       interfaces = ["0.0.0.0" "::"];
       zones = {
         "jakstys.lt.".data = myData.jakstysLTZone;
-        "_acme.grafana.jakstys.lt".data = ''
-          $ORIGIN _acme.grafana.jakstys.lt.
+        "_acme-endpoint.grafana.jakstys.lt".data = ''
+          $ORIGIN _acme-endpoint.grafana.jakstys.lt.
           $TTL 60
-          @      SOA   _acme.grafana.jakstys.lt. motiejus.jakstys.lt. (2023080701 600 600 600 600)
-          @      TXT   foo1
+          @      SOA   _acme-endpoint.grafana.jakstys.lt. motiejus.jakstys.lt. (2023080702 600 600 600 600)
+          @      TXT   foo2
+          ns      NS   ${myData.hosts."vno1-oh2.servers.jakst".publicIP}
         '';
       };
     };