diff --git a/src/main/archetype/all/pom.xml b/src/main/archetype/all/pom.xml
index 5552a2700..8db74e10f 100644
--- a/src/main/archetype/all/pom.xml
+++ b/src/main/archetype/all/pom.xml
@@ -194,7 +194,7 @@
                             <target>/apps/${appId}-vendor-packages/application/install</target>
                         </embedded>
 #end
-#if ( $includeExamples == "y" and ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") )
+#if ( $includeExamples == "y" and ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud" ) )
                         <embedded>
                             <groupId>com.adobe.aem</groupId>
                             <artifactId>core-forms-components-examples-apps</artifactId>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml
index 3c2673b69..fc7af05cc 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml
@@ -3,6 +3,7 @@
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:deviceGroups="[/etc/mobile/groups/responsive]"
+        guideComponentType="fd/af/templates"
         jcr:primaryType="cq:PageContent"
         sling:resourceType="${appId}/components/page">
         <parsys1
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/structure/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/structure/.content.xml
index d119b3991..c925f9131 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/structure/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/structure/.content.xml
@@ -5,7 +5,8 @@
         cq:deviceGroups="[/etc/mobile/groups/responsive]"
         cq:template="/conf/${appId}/settings/wcm/templates/blank-af-v2"
         jcr:primaryType="cq:PageContent"
-        sling:resourceType="${appId}/components/page">
+        sling:resourceType="${appId}/components/page"
+        guideComponentType="fd/af/templates">
         <parsys1
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/foundation/components/responsivegrid"/>
diff --git a/src/main/archetype/ui.frontend.react.forms.af/src/Form.tsx b/src/main/archetype/ui.frontend.react.forms.af/src/Form.tsx
index 7b32126d4..537a61618 100644
--- a/src/main/archetype/ui.frontend.react.forms.af/src/Form.tsx
+++ b/src/main/archetype/ui.frontend.react.forms.af/src/Form.tsx
@@ -17,7 +17,9 @@ export const getId = () => {
     let id =  ""
     if (!process.env.FORMPATH) {
         const parent = document.querySelector(".cmp-formcontainer")
-        id = parent.getAttribute("data-form-id")
+        if (parent) {
+            id = parent.getAttribute("data-form-id")
+        }
     } else {
         id = base64url(process.env.FORMPATH)
     }