diff --git a/templates/contact-us.html b/templates/contact-us.html
index d99ffc26..8daac0f5 100644
--- a/templates/contact-us.html
+++ b/templates/contact-us.html
@@ -27,42 +27,42 @@ <h3 class="p-card__title">Looking for a little professional support?</h3>
       <script src="https://assets.ubuntu.com/v1/37b1db88-jquery.min.js"></script>
       <script src="https://assets.ubuntu.com/v1/d55f58bb-jquery.validate.js"></script>
 
-      <form action="https://pages.ubuntu.com/index.php/leadCapture/save" method="post" id="mktoForm_1337">
+      <form action="https://ubuntu.com/marketo/submit" method="post" id="mktoForm_1337">
           <ul class="p-list">
-            <li class="mktFormReq mktField">
-              <label for="FirstName" class="mktoLabel">First name (required):
+            <li>
+              <label for="firstName">First name (required):
               </label>
-              <input required id="FirstName" name="FirstName" maxlength="255" type="text" class="mktoField mktoRequired mktoInvalid">
+              <input required id="firstName" name="firstName" maxlength="255" type="text">
             </li>
 
-            <li class="mktFormReq mktField">
-              <label for="LastName" class="mktoLabel">Last name (required):
+            <li>
+              <label for="lastName">Last name (required):
               </label>
-              <input required id="LastName" name="LastName" maxlength="255" type="text" class="mktoField mktoRequired">
+              <input required id="lastName" name="lastName" maxlength="255" type="text">
             </li>
 
-            <li class="mktFormReq mktField">
-              <label for="Company" class="mktoLabel">Company (required):
+            <li>
+              <label for="company">Company (required):
               </label>
-              <input required id="Company" name="Company" maxlength="255" type="text" class="mktoField mktoRequired">
+              <input required id="company" name="company" maxlength="255" type="text">
             </li>
 
-            <li class="mktFormReq mktField">
-              <label for="Email" class="mktoLabel">Work email (required):
+            <li>
+              <label for="email">Work email (required):
               </label>
-              <input required id="Email" name="Email" maxlength="255" type="email" class="mktoField mktoEmailField mktoRequired">
+              <input required id="email" name="email" maxlength="255" type="email">
             </li>
 
-            <li class="mktFormReq mktField">
-              <label for="Phone" class="mktoLabel">Phone number (required):
+            <li>
+              <label for="phone">Phone number (required):
               </label>
-              <input required id="Phone" name="Phone" maxlength="255" type="tel" class="mktoField mktoTelField mktoRequired">
+              <input required id="phone" name="phone" maxlength="255" type="tel">
             </li>
 
-            <li class="mktFormReq mktField">
-              <label for="Country" class="mktoLabel">Country (required):
+            <li>
+              <label for="country">Country (required):
               </label>
-              <select required id="Country" name="Country" class="mktoField mktoRequired mktoValid">
+              <select required id="country" name="country">
                 <option value="">Select...</option>
                 <option value="FR">France</option>
                 <option value="DE">Germany</option>
@@ -321,9 +321,9 @@ <h3 class="p-card__title">Looking for a little professional support?</h3>
                 <option value="ZW">Zimbabwe</option>
               </select>
             </li>
-            <li class="mktoPlaceholder mktoPlaceholderState">
-              <label for="State" class="mktoLabel mktoHasWidth">State (required):</label>
-              <select id="State" name="State" class="mktoField mktoRequired mktFReq">
+            <li>
+              <label for="state">State (required):</label>
+              <select id="state" name="state">
                 <optgroup label="Select Province" value="SelectProvince">
                   <option value="AB">Alberta</option>
                   <option value="BC">British Columbia</option>
@@ -395,41 +395,24 @@ <h3 class="p-card__title">Looking for a little professional support?</h3>
                 </optgroup>
               </select>
             </li>
-            <li class="mktFormReq mktField">
-              <label for="Comments_from_lead__c" class="mktoLabel">What would you like to talk to us about? (required)
+            <li>
+              <label for="Comments_from_lead__c">What would you like to talk to us about? (required)
               </label>
-              <textarea required id="Comments_from_lead__c" name="Comments_from_lead__c" rows="5" class="mktoField mktoRequired" maxlength="2000"></textarea>
+              <textarea required id="Comments_from_lead__c" name="Comments_from_lead__c" rows="5" maxlength="2000"></textarea>
             </li>
-            <li class="mktField">
-                <input class="mktoField" value="yes" id="canonicalUpdatesOptIn" name="canonicalUpdatesOptIn" type="checkbox" />
-                <label class="mktoLabel mktoHasWidth" for="canonicalUpdatesOptIn">I agree to receive information about Canonical&rsquo;s products and services.</label>
+            <li>
+                <input value="yes" id="canonicalUpdatesOptIn" name="canonicalUpdatesOptIn" type="checkbox" />
+                <label for="canonicalUpdatesOptIn">I agree to receive information about Canonical&rsquo;s products and services.</label>
             </li>
             <li class="u-sv3">In submitting this form, I confirm that I have read and agree to <a href="https://www.ubuntu.com/legal/dataprivacy/contact" target="_blank">Canonical&rsquo;s Privacy Notice</a> and <a aria-label="Read the Canonical privacy policy" target="_blank" href="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy">Privacy Policy</a>.</li>
-            <li class="mktField">
-              <button type="submit" class="mktoButton p-button--positive" onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Internal link', 'eventAction' : 'Click', 'eventLabel' : 'Submit contact us' });">Submit</button>
+            <li>
+              <button type="submit" class="p-button--positive" onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Internal link', 'eventAction' : 'Click', 'eventLabel' : 'Submit contact us' });">Submit</button>
               </span>
-              <input type="hidden" name="formid" class="mktoField" value="1337">
-              <input type="hidden" name="lpId" class="mktoField" value="2313">
-              <input type="hidden" name="subId" class="mktoField" value="30">
-              <input type="hidden" name="munchkinId" class="mktoField" value="066-EOV-335">
-              <input type="hidden" name="lpurl" class="mktoField" value="//pages.ubuntu.com/Form-MAAS.iocontactus_desktopcontactuslandingpage.html?cr={creative}&amp;kw={keyword}">
-              <input type="hidden" name="cr" class="mktoField" value="">
-              <input type="hidden" name="kw" class="mktoField" value="">
-              <input type="hidden" name="q" class="mktoField" value="">
+              <input type="hidden" name="formid" value="1337">
+              <input type="hidden" name="returnURL" value="http://maas.io/thank-you" />
             </li>
           </ul>
-        <input type="hidden" name="returnURL" value="http://maas.io/thank-you" />
-        <input type="hidden" name="retURL" value="http://maas.io/thank-you" />
       </form>
-      <script>
-        $("#mktoForm_1337").validate({
-          errorElement: "span",
-          errorClass: "mktFormMsg mktError",
-          onkeyup: false,
-          onclick: false,
-          onblur: false
-        });
-      </script>
       <script src="https://assets.ubuntu.com/v1/f97fa297-stateCountry.js"></script>
       <!-- /MARKETO FORM -->
     </div>
diff --git a/templates/includes/contact-us.html b/templates/includes/contact-us.html
index ba0685d4..02bf6a7f 100644
--- a/templates/includes/contact-us.html
+++ b/templates/includes/contact-us.html
@@ -155,23 +155,23 @@ <h3 class="p-heading--five">What are your platform preferences?</h3>
       <h3 class="p-heading--five">How should we get in touch?</h3>
       <div class="row u-no-padding">
         <div class="col-6">
-          <form class="modal-form marketo-form" action="https://pages.ubuntu.com/index.php/leadCapture/save" method="post" id="mktoForm_1337">
+          <form class="modal-form" action="https://ubuntu.com/marketo/submit" method="post" id="mktoForm_1337">
             <ul class="p-list">
-              <li class="mktFormReq mktField p-list__item">
-                <label for="FirstName" class="mktoLabel">First name:</label>
-                <input required id="FirstName" name="FirstName" maxlength="255" type="text" class="mktoField mktoRequired" required="required" />
+              <li class="p-list__item">
+                <label for="firstName">First name:</label>
+                <input required id="firstName" name="firstName" maxlength="255" type="text" required="required" />
               </li>
-              <li class="mktFormReq mktField p-list__item">
-                <label for="LastName" class="mktoLabel">Last name:</label>
-                <input required id="LastName" name="LastName" maxlength="255" type="text" class="mktoField mktoRequired" required="required" />
+              <li class="p-list__item">
+                <label for="lastName">Last name:</label>
+                <input required id="lastName" name="lastName" maxlength="255" type="text" required="required" />
               </li>
-              <li class="mktFormReq mktField p-list__item">
-                <label for="Email" class="mktoLabel">Email address:</label>
-                <input required id="Email" name="Email" maxlength="255" type="email" class="mktoField mktoEmailField mktoRequired" required="required" />
+              <li class="p-list__item">
+                <label for="email">Email address:</label>
+                <input required id="email" name="email" maxlength="255" type="email" required="required" />
               </li>
-              <li class="mktField p-list__item">
-                <input class="mktoField" value="yes" id="canonicalUpdatesOptIn" name="canonicalUpdatesOptIn" type="checkbox" />
-                <label class="mktoLabel mktoHasWidth" for="canonicalUpdatesOptIn">Please send me information about Canonical’s products and services.</label>
+              <li class="p-list__item">
+                <input value="yes" id="canonicalUpdatesOptIn" name="canonicalUpdatesOptIn" type="checkbox" />
+                <label for="canonicalUpdatesOptIn">Please send me information about Canonical’s products and services.</label>
               </li>
               <li class="p-list__item"><p>Submitting this form confirms that I have read and agree to <a href="/legal/data-privacy/contact">Canonical&rsquo;s Privacy Notice</a> and <a href="/legal/data-privacy">Privacy Policy</a>.</p></li>
               <li class="p-list__item">
@@ -182,29 +182,19 @@ <h3 class="p-heading--five">How should we get in touch?</h3>
             <div class="u-hide">
               <h3>Your comments</h3>
               <ul class="p-list">
-                <li class="mktFormReq mktField p-list__item">
-                  <label for="Comments_from_lead__c" class="mktoLabel">What would you like to talk to us about?</label>
-                  <textarea id="Comments_from_lead__c" name="Comments_from_lead__c" rows="5" class="mktoField" maxlength="2000"></textarea>
+                <li class="p-list__item">
+                  <label for="Comments_from_lead__c">What would you like to talk to us about?</label>
+                  <textarea id="Comments_from_lead__c" name="Comments_from_lead__c" rows="5" maxlength="2000"></textarea>
                 </li>
               </ul>
-              <input type="hidden" aria-hidden="true" aria-label="hidden field" name="formValidation" value="" />
-              <input type="hidden" aria-hidden="true" aria-label="hidden field" name="formid" class="mktoField" value="1337" />
-              <input type="hidden" aria-hidden="true" aria-label="hidden field" name="formVid" class="mktoField" value="1337" />
-              <input type="hidden" aria-hidden="true" aria-label="hidden field" name="lpId" class="mktoField" value="2313" />
-              <input type="hidden" aria-hidden="true" aria-label="hidden field" name="subId" class="mktoField" value="30" />
-              <input type="hidden" aria-hidden="true" aria-label="hidden field" name="munchkinId" class="mktoField" value="066-EOV-335" />
-              <input type="hidden" aria-hidden="true" aria-label="hidden field" name="lpurl" class="mktoField" value="//pages.ubuntu.com/Form-MAAS.iocontactus_desktopcontactuslandingpage.html?cr={creative}&amp;kw={keyword}" />
-              <input type="hidden" aria-hidden="true" aria-label="hidden field" name="cr" class="mktoField" value="" />
-              <input type="hidden" aria-hidden="true" aria-label="hidden field" name="kw" class="mktoField" value="" />
-              <input type="hidden" aria-hidden="true" aria-label="hidden field" name="q" class="mktoField" value="" />
+              <input type="hidden" aria-hidden="true" aria-label="hidden field" name="formid" value="1337" />
               <input type="hidden" aria-hidden="true" aria-label="hidden field" name="returnURL" value="http://maas.io/thank-you" />
-              <input type="hidden" aria-hidden="true" aria-label="hidden field" name="retURL" value="http://maas.io/thank-you" />
               <input type="hidden" aria-hidden="true" aria-label="hidden field" name="Consent_to_Processing__c" value="yes" />
             </div>
 
             <div class="pagination">
               <a class="pagination__link--previous p-button--neutral" href="">Previous</a>
-              <button type="submit" class="pagination__link--next p-button--positive mktoButton" aria-label="Submit">Let's discuss</button>
+              <button type="submit" class="pagination__link--next p-button--positive" aria-label="Submit">Let's discuss</button>
             </div>
           </form>
         </div>
diff --git a/templates/vmware-images.html b/templates/vmware-images.html
index e1db9e36..c62b3a34 100644
--- a/templates/vmware-images.html
+++ b/templates/vmware-images.html
@@ -20,45 +20,42 @@ <h2>Register to download the ESXi packer-template</h2>
     <div class="modal__overlay">
       <div class="row model-form">
         <div class="col-6">
-          <form action="https://pages.ubuntu.com/index.php/leadCapture/save" method="post" class="mktoForm_3392 p-form">
-            <div class="p-form__group mktFormReq mktField">
-              <label for="FirstName" class="mktoLabel p-form__label" >First Name:</label>
+          <form action="https://ubuntu.com/marketo/submit" method="post" class="mktoForm_3392 p-form">
+            <div class="p-form__group">
+              <label for="firstName" class="p-form__label" >First Name:</label>
               <div class="p-form__control">
-                <input required id="FirstName" name="FirstName" maxlength="255" type="text" class="mktoField mktoRequired">
+                <input required id="firstName" name="firstName" maxlength="255" type="text">
               </div>
             </div>
-            <div class="p-form__group mktFormReq mktField">
-              <label for="LastName" class="mktoLabel p-form__label">Last Name:</label>
+            <div class="p-form__group">
+              <label for="lastName" class="p-form__label">Last Name:</label>
               <div class="p-form__control">
-                <input required id="LastName" name="LastName" maxlength="255" type="text" class="mktoField mktoRequired">
+                <input required id="lastName" name="lastName" maxlength="255" type="text">
               </div>
             </div>
-            <div class="p-form__group mktFormReq mktField">
-              <label for="Email" class="mktoLabel p-form__label" >Email Address:</label>
+            <div class="p-form__group">
+              <label for="email" class="p-form__label" >Email Address:</label>
               <div class="p-form__control">
-                <input required id="Email" name="Email" maxlength="255" type="email" class="mktoField mktoEmailField  mktoRequired" >
+                <input required id="email" name="email" maxlength="255" type="email" >
               </div>
             </div>
-            <div class="p-form__group mktField">
-              <input name="Marketing_opt_in__c" id="Marketing_opt_in__c" type="checkbox" value="yes" class="mktoField">
-              <label for="Marketing_opt_in__c" class="mktoLabel p-form__label" >I agree to receive information about Canonical's products and services. (Optional)</label>
+            <div class="p-form__group">
+              <input name="Marketing_opt_in__c" id="Marketing_opt_in__c" type="checkbox" value="yes">
+              <label for="Marketing_opt_in__c" class="p-form__label" >I agree to receive information about Canonical's products and services. (Optional)</label>
               <label for="Marketing_opt_in__c"></label>
             </div>
-            <div class="p-form__group mktFormReq mktField">
-              <input required  name="Consent_to_Processing__c" id="Consent_to_Processing__c" type="checkbox" value="yes" class="mktoField">
-              <label for="Consent_to_Processing__c" class="mktoLabel p-form__label" >I agree to be contacted by Canonical about my experience with ESXi images in MAAS.</label>
+            <div class="p-form__group">
+              <input required  name="Consent_to_Processing__c" id="Consent_to_Processing__c" type="checkbox" value="yes">
+              <label for="Consent_to_Processing__c" class="p-form__label" >I agree to be contacted by Canonical about my experience with ESXi images in MAAS.</label>
               <label for="Consent_to_Processing__c"></label>
             </div>
             <p>In submitting this form, I confirm that I have read and agree to <a href="https://www.ubuntu.com/legal/data-privacy">Canonical&rsquo;s Privacy Notice</a> and <a href="https://www.ubuntu.com/legal/data-privacy/esxi">Privacy Policy</a>.
-            <div class="p-form__group mktField">
-              <button type="submit" class="mktoButton p-button--positive">Download template</button>
+            <div class="p-form__group">
+              <button type="submit" class="p-button--positive">Download template</button>
             </div>
-            <input type="hidden" name="formid" class="mktoField" value="3392">
-            <input type="hidden" name="formVid" class="mktoField" value="3392">
-            <input type="hidden" name="munchkinId" class="mktoField" value="066-EOV-335">
-            <input type="hidden" name="download_asset_url" class="mktoField" value="https://github.com/canonical/packer-maas/archive/1.0.3.tar.gz">
+            <input type="hidden" name="formid" value="3392">
+            <input type="hidden" name="download_asset_url" value="https://github.com/canonical/packer-maas/archive/1.0.3.tar.gz">
             <input type="hidden" name="returnURL" value="">
-            <input type="hidden" name="retURL" value="">
           </form>
         </div>
       </div>
@@ -83,7 +80,7 @@ <h2>Thank you for registering</h2>
     var backgroundSubmitHandlerClosure2 = function(event) {
       event.preventDefault();
       var marketoForm = form;
-      form.action = "https://app-sjg.marketo.com/index.php/leadCapture/save2";
+      form.action = "https://ubuntu.com/marketo/submit";
       backgroundSubmit2(marketoForm);
     }