diff --git a/docs/free-offer.md b/docs/free-offer.md
index 619c623..3fd3568 100644
--- a/docs/free-offer.md
+++ b/docs/free-offer.md
@@ -10,49 +10,6 @@ nype_config:
 
 Get our product for free by allowing us to feature your company name as a Fiori Tracker customer. 
 
-Contact us on <span class="nype-code-button nype-show-email">`Show e-mail`</span> or fill out the form below.
+Contact us on {% include 'hidden_email.md' %} or fill out the form below.
 
-<div class="nype-form-wrapper">
-    <form class="nype-form" method="POST">
-        <label for="fullname">Full Name:</label>
-        <input 
-            class="md-input" 
-            id="fullname"
-            name="fullname"
-            placeholder="Input your name"
-            required
-            type="text"
-        >
-        <label for="companyname">Company Name:</label>
-        <input 
-            class="md-input" 
-            id="companyname"
-            name="companyname"
-            placeholder="Input your company name"
-            required
-            type="text"
-        >
-        <label for="email">E-mail:</label>
-        <input
-            autocomplete="email"
-            class="md-input"
-            id="email"
-            name="email"
-            placeholder="Input your e-mail"
-            required
-            type="email"
-        >
-        <label for="message">What can we do for you?:</label>
-        <textarea
-            class="md-input"
-            id="message"
-            name="message"
-            placeholder="Input your message"
-            required
-        ></textarea>
-        <button 
-            class="md-button md-button--primary"
-            type="submit"
-        >Submit</button>
-    </form>
-</div>
\ No newline at end of file
+{% include 'contact_form.md' %}
\ No newline at end of file
diff --git a/docs/offer.md b/docs/offer.md
index 033040c..90de225 100644
--- a/docs/offer.md
+++ b/docs/offer.md
@@ -6,49 +6,6 @@ nype_config:
 ---
 # Offer Form
 
-Contact us on <span class="nype-code-button nype-show-email">`Show e-mail`</span> or fill out the form below.
+Contact us on {% include 'hidden_email.md' %} or fill out the form below.
 
-<div class="nype-form-wrapper">
-    <form class="nype-form" method="POST">
-        <label for="fullname">Full Name:</label>
-        <input 
-            class="md-input" 
-            id="fullname"
-            name="fullname"
-            placeholder="Input your name"
-            required
-            type="text"
-        >
-        <label for="companyname">Company Name:</label>
-        <input 
-            class="md-input" 
-            id="companyname"
-            name="companyname"
-            placeholder="Input your company name"
-            required
-            type="text"
-        >
-        <label for="email">E-mail:</label>
-        <input
-            autocomplete="email"
-            class="md-input"
-            id="email"
-            name="email"
-            placeholder="Input your e-mail"
-            required
-            type="email"
-        >
-        <label for="message">What can we do for you?:</label>
-        <textarea
-            class="md-input"
-            id="message"
-            name="message"
-            placeholder="Input your message"
-            required
-        ></textarea>
-        <button 
-            class="md-button md-button--primary"
-            type="submit"
-        >Submit</button>
-    </form>
-</div>
\ No newline at end of file
+{% include 'contact_form.md' %}
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 69bdd53..72479a1 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -88,4 +88,6 @@ plugins:
           remove_comments: true
       cache_safe: true
   - sap_icons
+  - macros:
+      on_error_fail: !ENV [CI, false]