diff --git a/src/main/archetype/pom.xml b/src/main/archetype/pom.xml
index f2f0726b5..31220ed60 100644
--- a/src/main/archetype/pom.xml
+++ b/src/main/archetype/pom.xml
@@ -83,11 +83,11 @@
 
 #if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
 #if ($aemVersion == "cloud")
-        <core.forms.components.version>3.0.50</core.forms.components.version>
-        <core.forms.components.af.version>3.0.50</core.forms.components.af.version>
+        <core.forms.components.version>3.0.66</core.forms.components.version>
+        <core.forms.components.af.version>3.0.66</core.forms.components.af.version>
 #else
-        <core.forms.components.version>1.1.40</core.forms.components.version>
-        <core.forms.components.af.version>1.1.40</core.forms.components.af.version>
+        <core.forms.components.version>1.1.52</core.forms.components.version>
+        <core.forms.components.af.version>1.1.52</core.forms.components.af.version>
 #end
         <aem.forms.sdk.api>SDK_FORMS_VERSION</aem.forms.sdk.api>
 #end
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/actions/reset/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/actions/reset/.content.xml
index 872d22619..86fab090b 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/actions/reset/.content.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/actions/reset/.content.xml
@@ -4,5 +4,5 @@
   jcr:primaryType="cq:Component"
   jcr:title="Reset Button"
   jcr:description="Add an interactive button for invoking a Reset action."
-  sling:resourceSuperType="core/fd/components/form/button/v1/button"
+  sling:resourceSuperType="core/fd/components/form/actions/reset/v2/reset"
   componentGroup="${appTitle} - Adaptive Form"/>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/actions/reset/_cq_template.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/actions/reset/_cq_template.xml
index 5c9d73d33..6d656251b 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/actions/reset/_cq_template.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/actions/reset/_cq_template.xml
@@ -2,7 +2,6 @@
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
   jcr:primaryType="nt:unstructured"
   jcr:title="Reset"
-  type="button"
   fieldType="button"
   buttonType="reset"
   dorExclusion="true">
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/actions/submit/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/actions/submit/.content.xml
index bd2d5b239..00461d8a5 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/actions/submit/.content.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/actions/submit/.content.xml
@@ -4,5 +4,5 @@
   jcr:primaryType="cq:Component"
   jcr:title="Submit Button"
   jcr:description="Add an interactive button for invoking a Submit action."
-  sling:resourceSuperType="core/fd/components/form/button/v1/button"
+  sling:resourceSuperType="core/fd/components/form/actions/submit/v2/submit"
   componentGroup="${appTitle} - Adaptive Form"/>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/button/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/button/.content.xml
index 43151ded7..46ab2fb49 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/button/.content.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/button/.content.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:description="Adaptive Form Button (v1) component"
+    jcr:description="Adaptive Form Button (v2) component"
     jcr:primaryType="cq:Component"
     jcr:title="Button"
-    sling:resourceSuperType="core/fd/components/form/button/v1/button"
+    sling:resourceSuperType="core/fd/components/form/button/v2/button"
     componentGroup="${appTitle} - Adaptive Form"/>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/button/_cq_template.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/button/_cq_template.xml
index d42d39259..dbb811024 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/button/_cq_template.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/button/_cq_template.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
-    jcr:primaryType="nt:unstructured"
-    jcr:title="Button"
-    fieldType="button"/>
+          jcr:primaryType="nt:unstructured"
+          jcr:title="Button"
+          fieldType="button"
+          dorExclusion="true"/>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/fileinput/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/fileinput/.content.xml
index b0ea035ee..ef07e4d64 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/fileinput/.content.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/fileinput/.content.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:description="Adaptive Form File Attachment (v1) component"
+    jcr:description="Adaptive Form File Attachment (v3) component"
     jcr:primaryType="cq:Component"
     jcr:title="File Attachment"
-    sling:resourceSuperType="core/fd/components/form/fileinput/v1/fileinput"
+    sling:resourceSuperType="core/fd/components/form/fileinput/v3/fileinput"
     componentGroup="${appTitle} - Adaptive Form"/>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/title/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/title/.content.xml
index 8dafcd570..7da5b2dc4 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/title/.content.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/title/.content.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:description="Adaptive Form Title (v1) component"
+    jcr:description="Adaptive Form Title (v2) component"
     jcr:primaryType="cq:Component"
     jcr:title="Form Title"
-    sling:resourceSuperType="core/fd/components/form/title/v1/title"
+    sling:resourceSuperType="core/fd/components/form/title/v2/title"
     componentGroup="${appTitle} - Adaptive Form"/>