diff --git a/app/views/registrar/xml_consoles/epp_requests/domain/check.xml b/app/views/registrar/xml_consoles/epp_requests/domain/check.xml
index f6b42c7eb..4cb77bf7f 100644
--- a/app/views/registrar/xml_consoles/epp_requests/domain/check.xml
+++ b/app/views/registrar/xml_consoles/epp_requests/domain/check.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="#{Xsd::Schema.filename(for_prefix: 'epp-ee')}">
+<epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
   <command>
     <check>
       <domain:check
-       xmlns:domain="#{Xsd::Schema.filename(for_prefix: 'domain-ee')}">
+       xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
         <domain:name>example.ee</domain:name>
       </domain:check>
     </check>
diff --git a/app/views/registrar/xml_consoles/epp_requests/domain/client_hold.xml b/app/views/registrar/xml_consoles/epp_requests/domain/client_hold.xml
index f0f823446..0963708a4 100644
--- a/app/views/registrar/xml_consoles/epp_requests/domain/client_hold.xml
+++ b/app/views/registrar/xml_consoles/epp_requests/domain/client_hold.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="#{Xsd::Schema.filename(for_prefix: 'epp-ee')}">
+<epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
   <command>
     <update>
       <domain:update
-        xmlns:domain="#{Xsd::Schema.filename(for_prefix: 'domain-ee')}">
+        xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
         <domain:name>example.ee</domain:name>
         <domain:rem>
           <domain:status s="clientHold"/>
diff --git a/app/views/registrar/xml_consoles/epp_requests/domain/create.xml b/app/views/registrar/xml_consoles/epp_requests/domain/create.xml
index db057ea29..4e3aa82f0 100644
--- a/app/views/registrar/xml_consoles/epp_requests/domain/create.xml
+++ b/app/views/registrar/xml_consoles/epp_requests/domain/create.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="#{Xsd::Schema.filename(for_prefix: 'epp-ee')}">
+<epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
   <command>
     <create>
       <domain:create
-       xmlns:domain="#{Xsd::Schema.filename(for_prefix: 'domain-ee')}">
+       xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
         <domain:name>example.ee</domain:name>
         <domain:period unit="y">1</domain:period>
         <domain:ns>
diff --git a/app/views/registrar/xml_consoles/epp_requests/domain/delete.xml b/app/views/registrar/xml_consoles/epp_requests/domain/delete.xml
index 7cb6ba498..20d739380 100644
--- a/app/views/registrar/xml_consoles/epp_requests/domain/delete.xml
+++ b/app/views/registrar/xml_consoles/epp_requests/domain/delete.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="#{Xsd::Schema.filename(for_prefix: 'epp-ee')}">
+<epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
   <command>
     <delete>
       <domain:delete
-       xmlns:domain="#{Xsd::Schema.filename(for_prefix: 'domain-ee')}">
+       xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
         <domain:name>example.ee</domain:name>
       </domain:delete>
     </delete>
diff --git a/app/views/registrar/xml_consoles/epp_requests/domain/info.xml b/app/views/registrar/xml_consoles/epp_requests/domain/info.xml
index b078c5912..1643d73af 100644
--- a/app/views/registrar/xml_consoles/epp_requests/domain/info.xml
+++ b/app/views/registrar/xml_consoles/epp_requests/domain/info.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="#{Xsd::Schema.filename(for_prefix: 'epp-ee')}">
+<epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
   <command>
     <info>
       <domain:info
-       xmlns:domain="#{Xsd::Schema.filename(for_prefix: 'domain-ee')}">
+       xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
         <domain:name hosts="all">example.ee</domain:name>
         <domain:authInfo>
           <domain:pw>2fooBAR</domain:pw>
diff --git a/app/views/registrar/xml_consoles/epp_requests/domain/renew.xml b/app/views/registrar/xml_consoles/epp_requests/domain/renew.xml
index de309da60..192c6b5cc 100644
--- a/app/views/registrar/xml_consoles/epp_requests/domain/renew.xml
+++ b/app/views/registrar/xml_consoles/epp_requests/domain/renew.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="#{Xsd::Schema.filename(for_prefix: 'epp-ee')}">
+<epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
   <command>
     <renew>
       <domain:renew
-       xmlns:domain="#{Xsd::Schema.filename(for_prefix: 'domain-ee')}">
+       xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
         <domain:name>example.ee</domain:name>
         <domain:curExpDate>2014-08-07</domain:curExpDate>
         <domain:period unit="y">1</domain:period>
diff --git a/app/views/registrar/xml_consoles/epp_requests/domain/transfer.xml b/app/views/registrar/xml_consoles/epp_requests/domain/transfer.xml
index 9ff8d117f..20646f08f 100644
--- a/app/views/registrar/xml_consoles/epp_requests/domain/transfer.xml
+++ b/app/views/registrar/xml_consoles/epp_requests/domain/transfer.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="#{Xsd::Schema.filename(for_prefix: 'epp-ee')}">
+<epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
   <command>
     <transfer op="request">
       <domain:transfer
-       xmlns:domain="#{Xsd::Schema.filename(for_prefix: 'domain-ee')}">
+       xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
           <domain:pw roid="JD1234-REP">2BARfoo</domain:pw>
diff --git a/app/views/registrar/xml_consoles/epp_requests/domain/update.xml b/app/views/registrar/xml_consoles/epp_requests/domain/update.xml
index 27640fa5c..45363baf7 100644
--- a/app/views/registrar/xml_consoles/epp_requests/domain/update.xml
+++ b/app/views/registrar/xml_consoles/epp_requests/domain/update.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="#{Xsd::Schema.filename(for_prefix: 'epp-ee')}">
+<epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
   <command>
     <update>
       <domain:update
-       xmlns:domain="#{Xsd::Schema.filename(for_prefix: 'domain-ee')}">
+       xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
         <domain:name>example.ee</domain:name>
         <domain:add>
           <domain:ns>