diff --git a/app/views/epp/contacts/check.xml.builder b/app/views/epp/contacts/check.xml.builder
index 4df3597e3..efa5ae231 100644
--- a/app/views/epp/contacts/check.xml.builder
+++ b/app/views/epp/contacts/check.xml.builder
@@ -15,6 +15,6 @@ xml.epp_head do
       end
     end
 
-    xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
   end
 end
diff --git a/app/views/epp/contacts/create.xml.builder b/app/views/epp/contacts/create.xml.builder
index 85f5f50c1..8e96f27f0 100644
--- a/app/views/epp/contacts/create.xml.builder
+++ b/app/views/epp/contacts/create.xml.builder
@@ -11,6 +11,6 @@ xml.epp_head do
       end
     end
 
-    xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
   end
 end
diff --git a/app/views/epp/contacts/delete.xml.builder b/app/views/epp/contacts/delete.xml.builder
index 4490335a9..a111f92d0 100644
--- a/app/views/epp/contacts/delete.xml.builder
+++ b/app/views/epp/contacts/delete.xml.builder
@@ -4,6 +4,6 @@ xml.epp_head do
       xml.msg 'Command completed successfully'
     end
 
-    xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
   end
 end
diff --git a/app/views/epp/contacts/info.xml.builder b/app/views/epp/contacts/info.xml.builder
index cdec58fe2..ce692020c 100644
--- a/app/views/epp/contacts/info.xml.builder
+++ b/app/views/epp/contacts/info.xml.builder
@@ -28,11 +28,11 @@ xml.epp_head do
         end
 
         xml.tag!('contact:clID', @contact.registrar.try(:name))
-        xml.tag!('contact:crID', @contact.creator.try(:registrar)) 
+        xml.tag!('contact:crID', @contact.creator.try(:registrar))
         xml.tag!('contact:crDate', @contact.created_at)
         if @contact.updated_at != @contact.created_at
           xml.tag!('contact:upID', @contact.updator.try(:registrar))
-          xml.tag!('contact:upDate', @contact.updated_at) 
+          xml.tag!('contact:upDate', @contact.updated_at)
         end
         # xml.tag!('contact:trDate', '123') if false
         if can? :view_password, @contact, @password
@@ -49,12 +49,12 @@ xml.epp_head do
     if can? :view_full_info, @contact, @password
       xml.tag!('extension') do
         xml.tag!('eis:extdata', 'xmlns:eis' => 'urn:ee:eis:xml:epp:eis-1.0') do
-          xml.tag!('eis:ident', @contact.ident, 
+          xml.tag!('eis:ident', @contact.ident,
                    type: @contact.ident_type, cc: @contact.ident_country_code)
         end
       end
     end
 
-    xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
   end
 end
diff --git a/app/views/epp/contacts/update.xml.builder b/app/views/epp/contacts/update.xml.builder
index 85f5f50c1..8e96f27f0 100644
--- a/app/views/epp/contacts/update.xml.builder
+++ b/app/views/epp/contacts/update.xml.builder
@@ -11,6 +11,6 @@ xml.epp_head do
       end
     end
 
-    xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
   end
 end
diff --git a/app/views/epp/domains/check.xml.builder b/app/views/epp/domains/check.xml.builder
index 2a6398b15..6bfc382a3 100644
--- a/app/views/epp/domains/check.xml.builder
+++ b/app/views/epp/domains/check.xml.builder
@@ -15,6 +15,6 @@ xml.epp_head do
       end
     end
 
-    xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
   end
 end
diff --git a/app/views/epp/domains/create.xml.builder b/app/views/epp/domains/create.xml.builder
index ada6b7362..6ccfda07b 100644
--- a/app/views/epp/domains/create.xml.builder
+++ b/app/views/epp/domains/create.xml.builder
@@ -11,7 +11,7 @@ xml.epp_head do
         xml.tag!('domain:exDate', @domain.valid_to)
       end
     end
-  end
 
-  xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
+  end
 end
diff --git a/app/views/epp/domains/info.xml.builder b/app/views/epp/domains/info.xml.builder
index 22b352dfb..57d4903f0 100644
--- a/app/views/epp/domains/info.xml.builder
+++ b/app/views/epp/domains/info.xml.builder
@@ -59,26 +59,26 @@ xml.epp_head do
         end
       end
     end
-  end
 
-  xml.extension do
-    xml.tag!('secDNS:infData', 'xmlns:secDNS' => 'urn:ietf:params:xml:ns:secDNS-1.1') do
-      @domain.dnskeys.sort.each do |key|
-        xml.tag!('secDNS:dsData') do
-          xml.tag!('secDNS:keyTag', key.ds_key_tag)
-          xml.tag!('secDNS:alg', key.ds_alg)
-          xml.tag!('secDNS:digestType', key.ds_digest_type)
-          xml.tag!('secDNS:digest', key.ds_digest)
-          xml.tag!('secDNS:keyData') do
-            xml.tag!('secDNS:flags', key.flags)
-            xml.tag!('secDNS:protocol', key.protocol)
-            xml.tag!('secDNS:alg', key.alg)
-            xml.tag!('secDNS:pubKey', key.public_key)
+    xml.extension do
+      xml.tag!('secDNS:infData', 'xmlns:secDNS' => 'urn:ietf:params:xml:ns:secDNS-1.1') do
+        @domain.dnskeys.sort.each do |key|
+          xml.tag!('secDNS:dsData') do
+            xml.tag!('secDNS:keyTag', key.ds_key_tag)
+            xml.tag!('secDNS:alg', key.ds_alg)
+            xml.tag!('secDNS:digestType', key.ds_digest_type)
+            xml.tag!('secDNS:digest', key.ds_digest)
+            xml.tag!('secDNS:keyData') do
+              xml.tag!('secDNS:flags', key.flags)
+              xml.tag!('secDNS:protocol', key.protocol)
+              xml.tag!('secDNS:alg', key.alg)
+              xml.tag!('secDNS:pubKey', key.public_key)
+            end
           end
         end
       end
-    end
-  end if @domain.dnskeys.any?
+    end if @domain.dnskeys.any?
 
-  xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
+  end
 end
diff --git a/app/views/epp/domains/renew.xml.builder b/app/views/epp/domains/renew.xml.builder
index 34484b096..f1d2a7742 100644
--- a/app/views/epp/domains/renew.xml.builder
+++ b/app/views/epp/domains/renew.xml.builder
@@ -11,6 +11,6 @@ xml.epp_head do
       end
     end
 
-    xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
   end
 end
diff --git a/app/views/epp/domains/success.xml.builder b/app/views/epp/domains/success.xml.builder
index a8bfe162f..a111f92d0 100644
--- a/app/views/epp/domains/success.xml.builder
+++ b/app/views/epp/domains/success.xml.builder
@@ -3,7 +3,7 @@ xml.epp_head do
     xml.result('code' => '1000') do
       xml.msg 'Command completed successfully'
     end
-  end
 
-  xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
+  end
 end
diff --git a/app/views/epp/domains/success_pending.xml.builder b/app/views/epp/domains/success_pending.xml.builder
index 3d1783009..e7c52f970 100644
--- a/app/views/epp/domains/success_pending.xml.builder
+++ b/app/views/epp/domains/success_pending.xml.builder
@@ -3,7 +3,6 @@ xml.epp_head do
     xml.result('code' => '1001') do
       xml.msg 'Command completed successfully; action pending'
     end
+    render('epp/shared/trID', builder: xml)
   end
-
-  xml << render('/epp/shared/trID')
 end
diff --git a/app/views/epp/domains/transfer.xml.builder b/app/views/epp/domains/transfer.xml.builder
index bea166939..59fffc852 100644
--- a/app/views/epp/domains/transfer.xml.builder
+++ b/app/views/epp/domains/transfer.xml.builder
@@ -7,7 +7,7 @@ xml.epp_head do
     xml.resData do
       xml << render('epp/domains/partials/transfer', builder: xml, dt: @domain_transfer)
     end
-  end
 
-  xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
+  end
 end
diff --git a/app/views/epp/error.xml.builder b/app/views/epp/error.xml.builder
index 718440bd7..796856f4c 100644
--- a/app/views/epp/error.xml.builder
+++ b/app/views/epp/error.xml.builder
@@ -20,7 +20,6 @@ xml.epp_head do
       end
     end
 
+    render('epp/shared/trID', builder: xml)
   end
-
-  xml << render('/epp/shared/trID')
 end
diff --git a/app/views/epp/poll/poll_ack.xml.builder b/app/views/epp/poll/poll_ack.xml.builder
index 3ba104dcd..05ea8b8d0 100644
--- a/app/views/epp/poll/poll_ack.xml.builder
+++ b/app/views/epp/poll/poll_ack.xml.builder
@@ -6,6 +6,6 @@ xml.epp_head do
 
     xml.tag!('msgQ', 'count' => current_user.queued_messages.count, 'id' => @message.id)
 
-    xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
   end
 end
diff --git a/app/views/epp/poll/poll_keyrelay.xml.builder b/app/views/epp/poll/poll_keyrelay.xml.builder
index 049b0bf39..4189c6e82 100644
--- a/app/views/epp/poll/poll_keyrelay.xml.builder
+++ b/app/views/epp/poll/poll_keyrelay.xml.builder
@@ -44,6 +44,6 @@ xml.epp(
       end
     end
 
-    xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
   end
 end
diff --git a/app/views/epp/poll/poll_no_messages.xml.builder b/app/views/epp/poll/poll_no_messages.xml.builder
index 1e57a1216..b48b8cef5 100644
--- a/app/views/epp/poll/poll_no_messages.xml.builder
+++ b/app/views/epp/poll/poll_no_messages.xml.builder
@@ -4,6 +4,6 @@ xml.epp_head do
       xml.msg 'Command completed successfully; no messages'
     end
 
-    xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
   end
 end
diff --git a/app/views/epp/poll/poll_req.xml.builder b/app/views/epp/poll/poll_req.xml.builder
index f839670a3..b79ba160b 100644
--- a/app/views/epp/poll/poll_req.xml.builder
+++ b/app/views/epp/poll/poll_req.xml.builder
@@ -15,6 +15,6 @@ xml.epp_head do
       end
     end if @object
 
-    xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
   end
 end
diff --git a/app/views/epp/sessions/login_fail.xml.builder b/app/views/epp/sessions/login_fail.xml.builder
index a76057270..5e2e99162 100644
--- a/app/views/epp/sessions/login_fail.xml.builder
+++ b/app/views/epp/sessions/login_fail.xml.builder
@@ -3,7 +3,7 @@ xml.epp_head do
     xml.result('code' => '2501') do
       xml.msg(@msg || 'Authentication error; server closing connection')
     end
-  end
 
-  xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
+  end
 end
diff --git a/app/views/epp/sessions/login_success.xml.builder b/app/views/epp/sessions/login_success.xml.builder
index 4490335a9..a111f92d0 100644
--- a/app/views/epp/sessions/login_success.xml.builder
+++ b/app/views/epp/sessions/login_success.xml.builder
@@ -4,6 +4,6 @@ xml.epp_head do
       xml.msg 'Command completed successfully'
     end
 
-    xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
   end
 end
diff --git a/app/views/epp/sessions/logout.xml.builder b/app/views/epp/sessions/logout.xml.builder
index 917481a7e..5bf1f8873 100644
--- a/app/views/epp/sessions/logout.xml.builder
+++ b/app/views/epp/sessions/logout.xml.builder
@@ -3,7 +3,7 @@ xml.epp_head do
     xml.result('code' => '1500') do
       xml.msg 'Command completed successfully; ending session'
     end
-  end
 
-  xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
+  end
 end
diff --git a/app/views/epp/shared/_trID.xml.builder b/app/views/epp/shared/_trID.xml.builder
index 995c27c05..ace7b1beb 100644
--- a/app/views/epp/shared/_trID.xml.builder
+++ b/app/views/epp/shared/_trID.xml.builder
@@ -1,4 +1,5 @@
-xml.trID do
-  xml.clTRID params[:clTRID] if params[:clTRID].present?
-  xml.svTRID @svTRID
+# builder ||= xml
+builder.trID do
+  builder.clTRID params[:clTRID] if params[:clTRID].present?
+  builder.svTRID @svTRID
 end
diff --git a/app/views/epp/shared/success.xml.builder b/app/views/epp/shared/success.xml.builder
index a8bfe162f..a111f92d0 100644
--- a/app/views/epp/shared/success.xml.builder
+++ b/app/views/epp/shared/success.xml.builder
@@ -3,7 +3,7 @@ xml.epp_head do
     xml.result('code' => '1000') do
       xml.msg 'Command completed successfully'
     end
-  end
 
-  xml << render('/epp/shared/trID')
+    render('epp/shared/trID', builder: xml)
+  end
 end