diff --git a/src/main/archetype/pom.xml b/src/main/archetype/pom.xml
index 0b8a77657..009f45985 100644
--- a/src/main/archetype/pom.xml
+++ b/src/main/archetype/pom.xml
@@ -83,8 +83,8 @@
 
 #if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
 #if ($aemVersion == "cloud")
-        <core.forms.components.version>3.0.18</core.forms.components.version>
-        <core.forms.components.af.version>3.0.18</core.forms.components.af.version>
+        <core.forms.components.version>3.0.20</core.forms.components.version>
+        <core.forms.components.af.version>3.0.20</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>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/hcaptcha/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/hcaptcha/.content.xml
new file mode 100644
index 000000000..864f38e50
--- /dev/null
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/hcaptcha/.content.xml
@@ -0,0 +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"
+    cq:icon="shield"
+    jcr:primaryType="cq:Component"
+    jcr:title="Adaptive Form hCaptcha® (v1)"
+    sling:resourceSuperType="core/fd/components/form/hcaptcha/v1/hcaptcha"
+    componentGroup="${appTitle} - Adaptive Form"/>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/hcaptcha/_cq_template.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/hcaptcha/_cq_template.xml
new file mode 100644
index 000000000..0f6f5042d
--- /dev/null
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/hcaptcha/_cq_template.xml
@@ -0,0 +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="HCAPTCHA"
+    fieldType="captcha"
+    required="{Boolean}true"/>