diff --git a/src/main/archetype/all/pom.xml b/src/main/archetype/all/pom.xml
index 7701f6081..20a357cad 100644
--- a/src/main/archetype/all/pom.xml
+++ b/src/main/archetype/all/pom.xml
@@ -174,7 +174,7 @@
                             <target>/apps/${appId}-vendor-packages/application/install</target>
                         </embedded>
 #end
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud")
+#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
                         <embedded>
                             <groupId>com.adobe.aem</groupId>
                             <artifactId>core-forms-components-af-apps</artifactId>
@@ -186,6 +186,19 @@
                             <artifactId>core-forms-components-af-core</artifactId>
                             <target>/apps/${appId}-vendor-packages/application/install</target>
                         </embedded>
+                      #if ( $aemVersion != "cloud" )
+                      <embedded>
+                        <groupId>com.adobe.aem</groupId>
+                        <artifactId>core-forms-components-apps</artifactId>
+                        <type>zip</type>
+                        <target>/apps/${appId}-vendor-packages/application/install</target>
+                      </embedded>
+                      <embedded>
+                        <groupId>com.adobe.aem</groupId>
+                        <artifactId>core-forms-components-core</artifactId>
+                        <target>/apps/${appId}-vendor-packages/application/install</target>
+                      </embedded>
+                      #end
                       #if ($includeExamples == "y")
                       <embedded>
                         <groupId>com.adobe.aem</groupId>
@@ -396,12 +409,12 @@
             <type>zip</type>
         </dependency>
 #end
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud" )
+#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
         <!-- AEM Forms Dependencies -->
         <dependency>
-            <groupId>com.adobe.aem</groupId>
-            <artifactId>core-forms-components-apps</artifactId>
-            <type>zip</type>
+          <groupId>com.adobe.aem</groupId>
+          <artifactId>core-forms-components-apps</artifactId>
+          <type>zip</type>
         </dependency>
         <dependency>
           <groupId>com.adobe.aem</groupId>
diff --git a/src/main/archetype/core/pom.xml b/src/main/archetype/core/pom.xml
index 77d1eae8c..e48407e43 100644
--- a/src/main/archetype/core/pom.xml
+++ b/src/main/archetype/core/pom.xml
@@ -198,15 +198,22 @@ Import-Package: javax.annotation;version=0.0.0,*
         </dependency>
 #end
 
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud")
+#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
         <!-- AEM Forms Dependencies -->
+      #if ($aemVersion == "cloud")
+       <dependency>
+         <groupId>com.adobe.aem</groupId>
+         <artifactId>aem-forms-sdk-api</artifactId>
+       </dependency>
+      #else
+       <dependency>
+         <groupId>com.adobe.aemfd</groupId>
+         <artifactId>aemfd-client-sdk</artifactId>
+       </dependency>
+      #end
         <dependency>
-            <groupId>com.adobe.aem</groupId>
-            <artifactId>aem-forms-sdk-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.adobe.aem</groupId>
-            <artifactId>core-forms-components-core</artifactId>
+          <groupId>com.adobe.aem</groupId>
+          <artifactId>core-forms-components-core</artifactId>
         </dependency>
         <dependency>
           <groupId>com.adobe.aem</groupId>
diff --git a/src/main/archetype/pom.xml b/src/main/archetype/pom.xml
index 838f3358a..e10675f1d 100644
--- a/src/main/archetype/pom.xml
+++ b/src/main/archetype/pom.xml
@@ -81,9 +81,14 @@
         <aem.cif.sdk.api>2022.08.02.00</aem.cif.sdk.api>
 #end
 
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud" )
-        <core.forms.components.version>2.0.4</core.forms.components.version>
-        <core.forms.components.af.version>2.0.4</core.forms.components.af.version>
+#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
+#if ($aemVersion == "cloud")
+        <core.forms.components.version>2.0.6</core.forms.components.version>
+        <core.forms.components.af.version>2.0.6</core.forms.components.af.version>
+#else
+        <core.forms.components.version>1.1.12</core.forms.components.version>
+        <core.forms.components.af.version>1.1.12</core.forms.components.af.version>
+#end
         <aem.forms.sdk.api>SDK_FORMS_VERSION</aem.forms.sdk.api>
 #end
         <bnd.version>5.1.2</bnd.version>
@@ -863,13 +868,21 @@ Bundle-DocURL:
                 <scope>provided</scope>
             </dependency>
 #end
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud")
+#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
             <!-- AEM Forms Dependencies -->
+            #if ($aemVersion == "cloud")
             <dependency>
                 <groupId>com.adobe.aem</groupId>
                 <artifactId>aem-forms-sdk-api</artifactId>
                 <version>${aem.forms.sdk.api}</version>
             </dependency>
+            #else
+            <dependency>
+                <groupId>com.adobe.aemfd</groupId>
+                <artifactId>aemfd-client-sdk</artifactId>
+                <version>${aem.forms.sdk.api}</version>
+            </dependency>
+            #end
             <dependency>
                 <groupId>com.adobe.aem</groupId>
                 <artifactId>core-forms-components-apps</artifactId>
diff --git a/src/main/archetype/ui.apps/pom.xml b/src/main/archetype/ui.apps/pom.xml
index be4dac462..b145094e3 100644
--- a/src/main/archetype/ui.apps/pom.xml
+++ b/src/main/archetype/ui.apps/pom.xml
@@ -320,20 +320,27 @@ Require-Capability: osgi.extender;filter:="(&(osgi.extender=sling.scripting)(ver
             <scope>provided</scope>
         </dependency>
 #end
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud")
+#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
         <!-- AEM Forms Dependencies -->
+      #if ($aemVersion == "cloud")
+      <dependency>
+        <groupId>com.adobe.aem</groupId>
+        <artifactId>aem-forms-sdk-api</artifactId>
+      </dependency>
+      #else
+      <dependency>
+        <groupId>com.adobe.aemfd</groupId>
+        <artifactId>aemfd-client-sdk</artifactId>
+      </dependency>
+      #end
         <dependency>
-            <groupId>com.adobe.aem</groupId>
-            <artifactId>aem-forms-sdk-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.adobe.aem</groupId>
-            <artifactId>core-forms-components-apps</artifactId>
-            <type>zip</type>
+          <groupId>com.adobe.aem</groupId>
+          <artifactId>core-forms-components-apps</artifactId>
+          <type>zip</type>
         </dependency>
         <dependency>
-            <groupId>com.adobe.aem</groupId>
-            <artifactId>core-forms-components-core</artifactId>
+          <groupId>com.adobe.aem</groupId>
+          <artifactId>core-forms-components-core</artifactId>
         </dependency>
         <dependency>
           <groupId>com.adobe.aem</groupId>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/formcontainer/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/formcontainer/.content.xml
index e066c12e3..f0fa734cd 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/formcontainer/.content.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/formcontainer/.content.xml
@@ -1,7 +1,8 @@
 <?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:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/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 Container component"
     jcr:primaryType="cq:Component"
     jcr:title="Adaptive Form Container"
+    fd:version="2.1"
     sling:resourceSuperType="core/fd/components/form/container/v2/container"
     componentGroup=".${appTitle} - Adaptive Form"/>
diff --git a/src/main/archetype/ui.content/src/main/content/META-INF/vault/filter.xml b/src/main/archetype/ui.content/src/main/content/META-INF/vault/filter.xml
index da9a3c623..8fe602957 100644
--- a/src/main/archetype/ui.content/src/main/content/META-INF/vault/filter.xml
+++ b/src/main/archetype/ui.content/src/main/content/META-INF/vault/filter.xml
@@ -11,13 +11,13 @@
 #if ( $includeCommerce == "y" and $aemVersion != "cloud")
     <filter root="/var/commerce/products/${appId}-default" mode="merge"/>
 #end
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y" ) and $aemVersion == "cloud")
+#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
     <filter root="/content/dam/formsanddocuments-themes/${appId}" mode="merge"/>
     <filter root="/content/dam/formsanddocuments-fdm/${appId}" mode="merge"/>
     <filter root="/content/dam/${appId}/sample_logo.png" mode="merge"/>
     <filter root="/content/dam/${appId}/sample_terms.png" mode="merge"/>
 #end
-#if ( ($includeFormsheadless == "y" ) and $aemVersion == "cloud")
+#if ($includeFormsheadless == "y" )
     <filter root="/content/dam/${appId}/af_model_sample.json" mode="merge"/>
 #end
 </workspaceFilter>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/policies/.content.xml
index 0e575cdc2..b4baa0831 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/policies/.content.xml
@@ -3,7 +3,7 @@
     jcr:mixinTypes="[rep:AccessControllable]"
     jcr:primaryType="cq:Page">
     <rep:policy/>
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud")
+#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
     <fd jcr:primaryType="nt:unstructured">
         <af jcr:primaryType="nt:unstructured">
             <components jcr:primaryType="nt:unstructured">
@@ -561,7 +561,7 @@
                 </teaser>
             </commerce>
 #end
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud")
+#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
             <adaptiveForm jcr:primaryType="nt:unstructured">
               <formcontainer jcr:primaryType="nt:unstructured">
                 <jcr:content
diff --git a/src/main/archetype/ui.frontend.react.forms.af/pom.xml b/src/main/archetype/ui.frontend.react.forms.af/pom.xml
index beafa02bf..04bdbab2a 100644
--- a/src/main/archetype/ui.frontend.react.forms.af/pom.xml
+++ b/src/main/archetype/ui.frontend.react.forms.af/pom.xml
@@ -70,8 +70,8 @@
                     <groupId>com.github.eirslett</groupId>
                     <artifactId>frontend-maven-plugin</artifactId>
                     <configuration>
-                        <nodeVersion>v18.9.0</nodeVersion>
-                        <npmVersion>8.19.1</npmVersion>
+                        <nodeVersion>v16.17.0</nodeVersion>
+                        <npmVersion>8.15.0</npmVersion>
                     </configuration>
                     <executions>
                         <execution>
diff --git a/src/main/resources/META-INF/archetype-post-generate.groovy b/src/main/resources/META-INF/archetype-post-generate.groovy
index 9c95b9d29..2b2ccc24d 100644
--- a/src/main/resources/META-INF/archetype-post-generate.groovy
+++ b/src/main/resources/META-INF/archetype-post-generate.groovy
@@ -205,6 +205,10 @@ if (includeForms == "n" && includeFormsenrollment == "n" && includeFormscommunic
     assert new File("$confFolder/settings/wcm/templates/blank-af-v2").deleteDir()
     assert new File("$confFolder/forms").deleteDir()
 }
+if ((includeForms == "y" || includeFormsenrollment == "y" || includeFormscommunications == "y" || includeFormsheadless == "y") && aemVersion != "cloud") {
+    assert new File("$appsFolder/components/formsandcommunicationportal").deleteDir();
+}
+
 
 // For Headless Only
 if (includeFormsheadless == "n") {
@@ -216,10 +220,15 @@ if (includeFormsheadless == "n") {
 }
 
 // if forms is included and aem version is set to cloud, set the forms sdk version
-if ((includeForms == "y" || includeFormsenrollment == "y" || includeFormscommunications == "y" || includeFormsheadless == "y") && aemVersion == "cloud") {
+if (includeForms == "y" || includeFormsenrollment == "y" || includeFormscommunications == "y" || includeFormsheadless == "y") {
     if (sdkFormsVersion == "latest") {
         println "No Forms SDK version specified, trying to fetch latest"
-        sdkFormsVersion = getLatestFormsSDK(request.getArchetypeVersion())
+        if (aemVersion == "cloud") {
+            sdkFormsVersion = getLatestFormsSDK(request.getArchetypeVersion())
+        } else {
+            sdkFormsVersion = getLatestNonCloudFormsSDK(request.getArchetypeVersion());
+        }
+
     }
     println "Using AEM Forms as a Cloud Service SDK version: " + sdkFormsVersion
     rootPom.text = rootPom.text.replaceAll('SDK_FORMS_VERSION', sdkFormsVersion.toString())
@@ -392,3 +401,12 @@ def getLatestFormsSDK(archetypeVersion) {
     }
     return sdkVersion
 }
+
+def getLatestNonCloudFormsSDK(archetypeVersion) {
+    def metadata = new XmlSlurper().parse("https://repo1.maven.org/maven2/com/adobe/aemfd/aemfd-client-sdk/maven-metadata.xml")
+    def sdkVersion = metadata.versioning.latest
+    if (sdkVersion == null || sdkVersion == "") {
+        sdkVersion = System.console().readLine("Cannot get latest SDK version, please provide it manually: ")
+    }
+    return sdkVersion
+}