diff --git a/src/main/archetype/core/pom.xml b/src/main/archetype/core/pom.xml
index 8e8be531b..b9defb9b1 100644
--- a/src/main/archetype/core/pom.xml
+++ b/src/main/archetype/core/pom.xml
@@ -14,7 +14,7 @@
  |  See the License for the specific language governing permissions and
  |  limitations under the License.
 -->
-#set( $includeClassifierOnUberJar = $aemVersion.matches("6\.5\.[0-5]") )
+#set( $includeClassifierOnUberJar = $aemVersion.matches("6\.5\.[0-5]") || $aemVersion.matches("6\.6\.\d+"))
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
diff --git a/src/main/archetype/pom.xml b/src/main/archetype/pom.xml
index 2355d1093..447bb4039 100644
--- a/src/main/archetype/pom.xml
+++ b/src/main/archetype/pom.xml
@@ -25,7 +25,7 @@
 #set( $startbrace = "{" )
 #set( $endbrace = "}" )
 #set( $isSpaProject = $frontendModule == "angular" || $frontendModule == "react" || $frontendModule == "decoupled" )
-#set( $includeClassifierOnUberJar = $aemVersion.matches("6\.5\.[0-5]") )
+#set( $includeClassifierOnUberJar = $aemVersion.matches("6\.5\.[0-5]") || $aemVersion.matches("6\.6\.\d+"))
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>${groupId}</groupId>
diff --git a/src/main/archetype/ui.apps/pom.xml b/src/main/archetype/ui.apps/pom.xml
index 329c5fbab..5106e0ecc 100644
--- a/src/main/archetype/ui.apps/pom.xml
+++ b/src/main/archetype/ui.apps/pom.xml
@@ -14,7 +14,7 @@
  |  See the License for the specific language governing permissions and
  |  limitations under the License.
 -->
-#set( $includeClassifierOnUberJar = $aemVersion.matches("6\.5\.[0-5]") )
+#set( $includeClassifierOnUberJar = $aemVersion.matches("6\.5\.[0-5]") || $aemVersion.matches("6\.6\.\d+"))
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/src/main/archetype/ui.content/pom.xml b/src/main/archetype/ui.content/pom.xml
index 6bc3a4005..a41746dc4 100644
--- a/src/main/archetype/ui.content/pom.xml
+++ b/src/main/archetype/ui.content/pom.xml
@@ -14,7 +14,7 @@
  |  See the License for the specific language governing permissions and
  |  limitations under the License.
 -->
-#set( $includeClassifierOnUberJar = $aemVersion.matches("6\.5\.[0-5]") )
+#set( $includeClassifierOnUberJar = $aemVersion.matches("6\.5\.[0-5]") || $aemVersion.matches("6\.6\.\d+"))
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/src/test/resources/projects/basic-6.6.0/archetype.properties b/src/test/resources/projects/basic-6.6.0/archetype.properties
new file mode 100644
index 000000000..d243bb955
--- /dev/null
+++ b/src/test/resources/projects/basic-6.6.0/archetype.properties
@@ -0,0 +1,27 @@
+groupId=archetype.it
+artifactId=testing-basic
+appId=testing-basic
+package=it.pkg
+version=0.1-SNAPSHOT
+appTitle=Test Basic Project
+aemVersion=6.6.0
+sdkVersion=latest
+language=en
+country=us
+singleCountry=n
+frontendModule=none
+includeExamples=y
+includeErrorHandler=y
+includeDispatcherConfig=y
+includeCif=n
+commerceEndpoint=https://hostname.com/grapql
+includeForms=n
+includeFormsenrollment=n
+includeFormscommunications=n
+sdkFormsVersion=latest
+datalayer=y
+amp=y
+enableDynamicMedia=y
+enableSSR=n
+precompiledScripts=n
+includeFormsheadless=n
diff --git a/src/test/resources/projects/basic-6.6.0/goal.txt b/src/test/resources/projects/basic-6.6.0/goal.txt
new file mode 100644
index 000000000..7c32f5598
--- /dev/null
+++ b/src/test/resources/projects/basic-6.6.0/goal.txt
@@ -0,0 +1 @@
+install