diff --git a/xml/source/snippets/company_info.xml b/xml/source/snippets/company_info.xml
index 42916ea..0e7f2b7 100644
--- a/xml/source/snippets/company_info.xml
+++ b/xml/source/snippets/company_info.xml
@@ -5,9 +5,9 @@
   <legal_rep>Melanie Rieback
   </legal_rep><!-- ROS legal representative (to sign offerte) -->
   <poc1>Melanie Rieback</poc1><!-- first point of contact for ROS -->
-  <address>Zieseniskade 21</address>
-  <postal_code>1017 RT</postal_code>
-  <city>Amsterdam</city>
+  <address>Overdiemerweg 28</address>
+  <postal_code>1111 PP</postal_code>
+  <city>Diemen</city>
   <country>The Netherlands</country>
   <phone>+31 6 10 21 32 40</phone>
   <email>info@radicallyopensecurity.com</email>
diff --git a/xml/source/snippets/offerte/en/conditions.xml b/xml/source/snippets/offerte/en/conditions.xml
index f09b2dd..ac345c6 100644
--- a/xml/source/snippets/offerte/en/conditions.xml
+++ b/xml/source/snippets/offerte/en/conditions.xml
@@ -14,8 +14,8 @@
         and return it to:</p>
         <contact>
     <name><company_legal_rep/></name>
-    <address><company_long/><br/>Overdiemerweg 28<br/>1111 PP Diemen</address>
-    <email>melanie@radicallyopensecurity.com</email>
+    <address><company_long/><br/><company_address/><br/><company_postalcode/> <company_city/></address>
+    <email><company_email/></email>
 </contact>
     <generate_offer_signature_box/>
     </section>
\ No newline at end of file
diff --git a/xml/source/snippets/offerte/en/conditions_code-audit.xml b/xml/source/snippets/offerte/en/conditions_code-audit.xml
index 63a5860..2ca51f2 100644
--- a/xml/source/snippets/offerte/en/conditions_code-audit.xml
+++ b/xml/source/snippets/offerte/en/conditions_code-audit.xml
@@ -20,8 +20,8 @@
   </p>
   <contact>
     <name><company_legal_rep/></name>
-    <address><company_long/><br/>Overdiemerweg 28<br/>1111 PP Diemen</address>
-    <email>melanie@radicallyopensecurity.com</email>
+    <address><company_long/><br/><company_address/><br/><company_postalcode/> <company_city/></address>
+    <email><company_email/></email>
   </contact>
   <generate_offer_signature_box/>
 </section>
diff --git a/xml/source/snippets/offerte/nl/conditions.xml b/xml/source/snippets/offerte/nl/conditions.xml
index 31ac007..e8797ca 100644
--- a/xml/source/snippets/offerte/nl/conditions.xml
+++ b/xml/source/snippets/offerte/nl/conditions.xml
@@ -14,8 +14,8 @@
         retourneren naar:</p>
         <contact>
     <name><company_legal_rep/></name>
-    <address><company_long/><br/>Overdiemerweg 28<br/>1111 PP Diemen</address>
-    <email>melanie@radicallyopensecurity.com</email>
+    <address><company_long/><br/><company_address/><br/><company_postalcode/> <company_city/></address>
+    <email><company_email/></email>
 </contact>
     <generate_offer_signature_box/>
     </section>
\ No newline at end of file
diff --git a/xml/source/snippets/report/contact.xml b/xml/source/snippets/report/contact.xml
index 80df359..8b8c5d5 100644
--- a/xml/source/snippets/report/contact.xml
+++ b/xml/source/snippets/report/contact.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <contact xml:base="contact.xml">
     <name>Melanie Rieback</name>
-    <address>Radically Open Security BV<br/>Overdiemerweg 28, 1111 PP Diemen</address>
+    <address>Radically Open Security BV<br/><company_address/>, <company_postalcode/> <company_city/></address>
     <phone>+31 6 10 21 32 40</phone>
-    <email>melanie@radicallyopensecurity.com</email>
+    <email><company_email/></email>
 </contact>