diff --git a/CHANGELOG.md b/CHANGELOG.md
index 519890b..242286c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+2.0.0
+* EPP XML schema "eis-1.0.xsd" replaced with "ee-1.1.xsd"
+
 1.2.0
 * lib/epp-xml/epp-xml.rb
   - added additional attributes to set prefix and version of schema
diff --git a/epp-xml.gemspec b/epp-xml.gemspec
index fc5ae85..51d1e70 100644
--- a/epp-xml.gemspec
+++ b/epp-xml.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'epp-xml'
-  s.version     = '1.2.0'
+  s.version     = '2.0.0'
   s.summary     = 'Gem for generating XML for EIS EPP requests'
   s.description = 'Gem for generating valid XML for EIS Extensible Provisioning Protocol requests'
   s.author      = 'Estonian Internet Foundation'
diff --git a/lib/epp-xml.rb b/lib/epp-xml.rb
index 1a3fa23..22c33cc 100644
--- a/lib/epp-xml.rb
+++ b/lib/epp-xml.rb
@@ -66,7 +66,7 @@ def custom_ext(xml, custom_params)
         xml.extension do
           if custom_params.any?
             xml.tag!('eis:extdata',
-                     'xmlns:eis' => 'https://epp.tld.ee/schema/eis-1.0.xsd') do
+                     'xmlns:eis' => 'https://epp.tld.ee/schema/ee-1.1.xsd') do
               EppXml.generate_xml_from_hash(custom_params, xml, 'eis:')
             end
           end
diff --git a/lib/epp-xml/domain.rb b/lib/epp-xml/domain.rb
index ca7bfdd..f46aed0 100644
--- a/lib/epp-xml/domain.rb
+++ b/lib/epp-xml/domain.rb
@@ -11,7 +11,7 @@ class Domain
 
     XMLNS_SECDNS  = 'urn:ietf:params:xml:ns:secDNS-1.1'.freeze
 
-    XMLNS_EIS     = 'https://epp.tld.ee/schema/eis-1.0.xsd'.freeze
+    XMLNS_EIS     = 'https://epp.tld.ee/schema/ee-1.1.xsd'.freeze
 
     def info(xml_params = {}, custom_params = {})
       build('info', xml_params, custom_params)
diff --git a/lib/epp-xml/keyrelay.rb b/lib/epp-xml/keyrelay.rb
index 5e6084a..8188ee9 100644
--- a/lib/epp-xml/keyrelay.rb
+++ b/lib/epp-xml/keyrelay.rb
@@ -34,7 +34,7 @@ def keyrelay(xml_params = {}, custom_params = {})
           end
 
           xml.tag!('eis:extdata',
-            'xmlns:eis' => 'https://epp.tld.ee/schema/eis-1.0.xsd') do
+            'xmlns:eis' => 'https://epp.tld.ee/schema/ee-1.1.xsd') do
             EppXml.generate_xml_from_hash(custom_params, xml, 'eis:')
           end if custom_params.any?
 
diff --git a/lib/epp-xml/session.rb b/lib/epp-xml/session.rb
index 64689f0..4c5e28a 100644
--- a/lib/epp-xml/session.rb
+++ b/lib/epp-xml/session.rb
@@ -22,7 +22,7 @@ def login(xml_params = {})
           ],
           svcExtension: [
             { extURI: { value: 'urn:ietf:params:xml:ns:secDNS-1.1' } },
-            { extURI: { value: 'https://epp.tld.ee/schema/eis-1.0.xsd' } }
+            { extURI: { value: 'https://epp.tld.ee/schema/ee-1.1.xsd' } }
           ]
         }
       }
diff --git a/spec/contact_spec.rb b/spec/contact_spec.rb
index 76d77ff..8e311d6 100644
--- a/spec/contact_spec.rb
+++ b/spec/contact_spec.rb
@@ -32,8 +32,8 @@
           </check>
 
           <extension>
-            <eis:extdata xmlns:eis="https://epp.tld.ee/schema/eis-1.0.xsd">
-              <eis:legalDocument type="ddoc">base64</eis:legalDocument>
+            <eis:extdata xmlns:eis="https://epp.tld.ee/schema/ee-1.1.xsd">
+              <eis:legalDocument type="bdoc">base64</eis:legalDocument>
             </eis:extdata>
           </extension>
           <clTRID>ABC-12345</clTRID>
@@ -49,7 +49,7 @@
                                   ]
                                 }, {
                                   _anonymus: [
-                                    legalDocument: { value: 'base64', attrs: { type: 'ddoc' } }
+                                    legalDocument: { value: 'base64', attrs: { type: 'bdoc' } }
                                   ]
                                 })
 
@@ -148,8 +148,8 @@
           </transfer>
 
           <extension>
-            <eis:extdata xmlns:eis="https://epp.tld.ee/schema/eis-1.0.xsd">
-              <eis:legalDocument type="ddoc">base64</eis:legalDocument>
+            <eis:extdata xmlns:eis="https://epp.tld.ee/schema/ee-1.1.xsd">
+              <eis:legalDocument type="bdoc">base64</eis:legalDocument>
             </eis:extdata>
           </extension>
           <clTRID>ABC-12345</clTRID>
@@ -164,7 +164,7 @@
                                      }
                                    }, 'query', {
                                      _anonymus: [
-                                       legalDocument: { value: 'base64', attrs: { type: 'ddoc' } }
+                                       legalDocument: { value: 'base64', attrs: { type: 'bdoc' } }
                                      ]
                                    })
 
diff --git a/spec/domain_spec.rb b/spec/domain_spec.rb
index d728e5f..37648b0 100644
--- a/spec/domain_spec.rb
+++ b/spec/domain_spec.rb
@@ -207,8 +207,8 @@
             </domain:create>
           </create>
           <extension>
-            <eis:extdata xmlns:eis="https://epp.tld.ee/schema/eis-1.0.xsd">
-              <eis:legalDocument type="ddoc">base64</eis:legalDocument>
+            <eis:extdata xmlns:eis="https://epp.tld.ee/schema/ee-1.1.xsd">
+              <eis:legalDocument type="bdoc">base64</eis:legalDocument>
             </eis:extdata>
           </extension>
           <clTRID>ABC-12345</clTRID>
@@ -241,7 +241,7 @@
       ]
     }, {}, {
       _anonymus: [
-        legalDocument: { value: 'base64', attrs: { type: 'ddoc' } }
+        legalDocument: { value: 'base64', attrs: { type: 'bdoc' } }
       ]
     })
 
@@ -529,8 +529,8 @@
                 </secDNS:dsData>
               </secDNS:add>
             </secDNS:update>
-            <eis:extdata xmlns:eis="https://epp.tld.ee/schema/eis-1.0.xsd">
-              <eis:legalDocument type="ddoc">base64</eis:legalDocument>
+            <eis:extdata xmlns:eis="https://epp.tld.ee/schema/ee-1.1.xsd">
+              <eis:legalDocument type="bdoc">base64</eis:legalDocument>
             </eis:extdata>
           </extension>
           <clTRID>ABC-12345</clTRID>
@@ -571,7 +571,7 @@
       ]
     }, {
       _anonymus: [
-        legalDocument: { value: 'base64', attrs: { type: 'ddoc' } }
+        legalDocument: { value: 'base64', attrs: { type: 'bdoc' } }
       ]
     })
 
@@ -607,8 +607,8 @@
           </delete>
 
           <extension>
-            <eis:extdata xmlns:eis="https://epp.tld.ee/schema/eis-1.0.xsd">
-              <eis:legalDocument type="ddoc">base64</eis:legalDocument>
+            <eis:extdata xmlns:eis="https://epp.tld.ee/schema/ee-1.1.xsd">
+              <eis:legalDocument type="bdoc">base64</eis:legalDocument>
             </eis:extdata>
           </extension>
           <clTRID>ABC-12345</clTRID>
@@ -620,7 +620,7 @@
       name: { value: 'one.ee' }
     }, {
       _anonymus: [
-        legalDocument: { value: 'base64', attrs: { type: 'ddoc' } }
+        legalDocument: { value: 'base64', attrs: { type: 'bdoc' } }
       ]
     })
 
diff --git a/spec/keyrelay_spec.rb b/spec/keyrelay_spec.rb
index ff0c5de..cda91bc 100644
--- a/spec/keyrelay_spec.rb
+++ b/spec/keyrelay_spec.rb
@@ -25,8 +25,8 @@
                <ext:relative>P1M13D</ext:relative>
             </ext:expiry>
           </ext:keyrelay>
-          <eis:extdata xmlns:eis="https://epp.tld.ee/schema/eis-1.0.xsd">
-            <eis:legalDocument type="ddoc">base64</eis:legalDocument>
+          <eis:extdata xmlns:eis="https://epp.tld.ee/schema/ee-1.1.xsd">
+            <eis:legalDocument type="bdoc">base64</eis:legalDocument>
           </eis:extdata>
           <ext:clTRID>ABC-12345</ext:clTRID>
         </command>
@@ -49,7 +49,7 @@
       }
     }, {
       _anonymus: [
-        legalDocument: { value: 'base64', attrs: { type: 'ddoc' } }
+        legalDocument: { value: 'base64', attrs: { type: 'bdoc' } }
       ]
     })
 
diff --git a/spec/session_spec.rb b/spec/session_spec.rb
index 8b4d5f1..f61c92e 100644
--- a/spec/session_spec.rb
+++ b/spec/session_spec.rb
@@ -21,7 +21,7 @@
               <objURI>urn:ietf:params:xml:ns:keyrelay-1.0</objURI>
               <svcExtension>
                 <extURI>urn:ietf:params:xml:ns:secDNS-1.1</extURI>
-                <extURI>https://epp.tld.ee/schema/eis-1.0.xsd</extURI>
+                <extURI>https://epp.tld.ee/schema/ee-1.1.xsd</extURI>
               </svcExtension>
             </svcs>
           </login>
@@ -53,7 +53,7 @@
               <objURI>urn:ietf:params:xml:ns:keyrelay-1.0</objURI>
               <svcExtension>
                 <extURI>urn:ietf:params:xml:ns:secDNS-1.1</extURI>
-                <extURI>https://epp.tld.ee/schema/eis-1.0.xsd</extURI>
+                <extURI>https://epp.tld.ee/schema/ee-1.1.xsd</extURI>
               </svcExtension>
             </svcs>
           </login>
@@ -113,8 +113,8 @@
           <poll op="ack" msgID="12345" />
 
           <extension>
-            <eis:extdata xmlns:eis="https://epp.tld.ee/schema/eis-1.0.xsd">
-              <eis:legalDocument type="ddoc">base64</eis:legalDocument>
+            <eis:extdata xmlns:eis="https://epp.tld.ee/schema/ee-1.1.xsd">
+              <eis:legalDocument type="bdoc">base64</eis:legalDocument>
             </eis:extdata>
           </extension>
           <clTRID>ABC-12345</clTRID>
@@ -128,7 +128,7 @@
       }
     }, {
       _anonymus: [
-        legalDocument: { value: 'base64', attrs: { type: 'ddoc' } }
+        legalDocument: { value: 'base64', attrs: { type: 'bdoc' } }
       ]
     })