diff --git a/.github/workflows/maven-deploy-cm.yml b/.github/workflows/maven-deploy-cm.yml
index b5fcf72b9..2072d155b 100644
--- a/.github/workflows/maven-deploy-cm.yml
+++ b/.github/workflows/maven-deploy-cm.yml
@@ -65,7 +65,7 @@ jobs:
       # Create new project
       - name: Create new project with the archetype
         run: |
-          mvn -B archetype:generate \
+          mvn -B org.apache.maven.plugins:maven-archetype-plugin:3.2.1:generate \
            -D archetypeGroupId=com.adobe.aem \
            -D archetypeArtifactId=aem-project-archetype \
            -D archetypeVersion=${ARCHETYPE_VERSION} \
diff --git a/.github/workflows/maven-sdk-update.yml b/.github/workflows/maven-sdk-update.yml
index 3ff9f1b9e..58e3ea245 100644
--- a/.github/workflows/maven-sdk-update.yml
+++ b/.github/workflows/maven-sdk-update.yml
@@ -67,7 +67,7 @@ jobs:
       # Create new project
       - name: Create new project with the archetype
         run: |
-          mvn -B archetype:generate \
+          mvn -B org.apache.maven.plugins:maven-archetype-plugin:3.2.1:generate \
            -D archetypeGroupId=com.adobe.aem \
            -D archetypeArtifactId=aem-project-archetype \
            -D archetypeVersion=${ARCHETYPE_VERSION} \
diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
index 2869208d5..065cdefd6 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -485,6 +485,7 @@
                         <exclude>**/*.png</exclude>
                         <exclude>**/*.jpeg</exclude>
                         <exclude>**/*.jpg</exclude>
+                        <exclude>**/*.gif</exclude>
                         <exclude>**/image</exclude>
                         <exclude>**/original</exclude>
                         <exclude>**/*.eot</exclude>
@@ -503,6 +504,7 @@
                         <include>**/*.png</include>
                         <include>**/*.jpeg</include>
                         <include>**/*.jpg</include>
+                        <include>**/*.gif</include>
                         <include>**/image</include>
                         <include>**/original</include>
                         <include>**/*.eot</include>
@@ -541,6 +543,9 @@
                         <exclude>**/*.png</exclude>
                         <exclude>**/*.jpeg</exclude>
                         <exclude>**/image</exclude>
+                        <exclude>**/folderThumbnail</exclude>
+                        <exclude>**/*.jpg</exclude>
+                        <exclude>**/*.svg</exclude>
                         <exclude>**/original</exclude>
                     </excludes>
                 </fileSet>
@@ -551,7 +556,10 @@
                         <include>**/*.png</include>
                         <include>**/image</include>
                         <include>**/file</include>
+                        <include>**/folderThumbnail</include>
                         <include>**/*.png</include>
+                        <include>**/*.jpg</include>
+                        <include>**/*.svg</include>
                         <include>**/*.jpeg</include>
                         <include>**/image</include>
                         <include>**/original</include>