diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/.content.xml
index de2627a96..85a82055d 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/.content.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/easel/.content.xml
@@ -1,10 +1,12 @@
 <?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:sling="http://sling.apache.org/jcr/sling/1.0"
-    jcr:primaryType="sling:Folder">
+    jcr:primaryType="sling:Folder"
+    jcr:createdBy="adobe">
     <jcr:content jcr:primaryType="nt:unstructured">
         <metadata
             jcr:primaryType="nt:unstructured"
             author="adobe"
+            jcr:createdBy="adobe"
             description="Reference Easel Theme"
             title="Reference Easel"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/.content.xml b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/.content.xml
index 182fdb21f..5026c8116 100644
--- a/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/.content.xml
+++ b/src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/.content.xml
@@ -1,10 +1,12 @@
 <?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:sling="http://sling.apache.org/jcr/sling/1.0"
-    jcr:primaryType="sling:Folder">
+    jcr:primaryType="sling:Folder"
+    jcr:createdBy="adobe">
     <jcr:content jcr:primaryType="nt:unstructured">
         <metadata
             jcr:primaryType="nt:unstructured"
             author="adobe"
+            jcr:createdBy="adobe"
             description="Reference WKND Theme"
             title="Reference WKND"/>
     </jcr:content>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/.content.xml
index 6f64ce1ba..f5a0e1999 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/.content.xml
@@ -3,6 +3,7 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
+        jcr:createdBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page"
         jcr:primaryType="cq:PageContent"
         jcr:lastModified="{Date}2021-03-24T18:22:20.809+05:30"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/.content.xml
index 28fdf3652..8ecf6e57a 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/.content.xml
@@ -3,15 +3,9 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
-        cq:isDelivered="{Boolean}true"
+        jcr:createdBy="adobe"
         cq:lastModified="{Date}2023-07-03T10:40:00.760Z"
-        cq:lastModifiedBy="admin"
-        cq:lastReplicated="{Date}2023-05-25T15:46:21.326Z"
-        cq:lastReplicated_publish="{Date}2023-05-25T15:46:21.326Z"
-        cq:lastReplicatedBy="admin"
-        cq:lastReplicatedBy_publish="admin"
-        cq:lastReplicationAction="Activate"
-        cq:lastReplicationAction_publish="Activate"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="The Employee Benefits Summary form is used to gather essential details about an individual's benefits. It helps in evaluating coverage quickly and accurately, providing a comprehensive overview for efficient assistance and support."
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/.content.xml
index 7bb0cfbc9..603a80878 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/benefits-enrollment/.content.xml
@@ -3,8 +3,9 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
+        jcr:createdBy="adobe"
         cq:lastModified="{Date}2023-05-18T06:55:29.793Z"
-        cq:lastModifiedBy="admin"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="Complete our enrollment form to apply for various benefits. "
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/.content.xml
index b80b1670f..736b2c066 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/.content.xml
@@ -3,8 +3,9 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
+        jcr:createdBy="adobe"
         cq:lastModified="{Date}2022-05-27T13:57:01.856+05:30"
-        cq:lastModifiedBy="admin"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:primaryType="cq:PageContent"
         jcr:title="Blank With Core Components"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/.content.xml
index dee1f16d5..c9d692f90 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/.content.xml
@@ -3,9 +3,11 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
+        jcr:createdBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page"
         jcr:primaryType="cq:PageContent"
         jcr:lastModified="{Date}2021-03-24T18:22:20.809+05:30"
+        cq:lastModifiedBy="adobe"
         jcr:title="Blank"
         status="enabled"/>
 </jcr:root>
\ No newline at end of file
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/.content.xml
index a94eb85ed..ea6e9b11d 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/consent-form/.content.xml
@@ -3,8 +3,9 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
+        jcr:createdBy="adobe"
         cq:lastModified="{Date}2023-05-18T06:55:29.793Z"
-        cq:lastModifiedBy="admin"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="Simply fill out our convenient consent form and let our team take care of your stay and travel.  | WKND Travels"
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/.content.xml
index 823c85e2e..4e068e227 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-details-update/.content.xml
@@ -3,15 +3,9 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
-        cq:isDelivered="{Boolean}true"
+        jcr:createdBy="adobe"
         cq:lastModified="{Date}2023-07-03T10:40:32.282Z"
-        cq:lastModifiedBy="admin"
-        cq:lastReplicated="{Date}2023-06-13T09:26:45.829Z"
-        cq:lastReplicated_publish="{Date}2023-06-13T09:26:45.829Z"
-        cq:lastReplicatedBy="admin"
-        cq:lastReplicatedBy_publish="admin"
-        cq:lastReplicationAction="Activate"
-        cq:lastReplicationAction_publish="Activate"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="The Contact Details Update Form for address and contact details update is designed to assist you in updating your personal information related to your subscription or benefits to ensure seamless communication and uninterrupted access to the services or benefits you receive."
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/.content.xml
index e0b242e62..76f3e4df4 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/contact-us-form/.content.xml
@@ -3,8 +3,9 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
+        jcr:createdBy="adobe"
         cq:lastModified="{Date}2023-05-18T06:56:04.251Z"
-        cq:lastModifiedBy="admin"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="Contact us today using our easy-to-use contact form. Whether you have questions about our products or services or want to provide feedback, our team is here to help. Fill out the form and we'll get back to you as soon as possible. Contacting us has never been easier than it is now!"
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/.content.xml
index 42e753789..242045b7e 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/give-feedback/.content.xml
@@ -3,8 +3,9 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
+        jcr:createdBy="adobe"
         cq:lastModified="{Date}2023-05-18T06:56:04.251Z"
-        cq:lastModifiedBy="admin"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="A give feedback form template to help users input their service or product experience."
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/.content.xml
index 2eaf84159..29dae93be 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/log-service-request/.content.xml
@@ -3,8 +3,9 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
+        jcr:createdBy="adobe"
         cq:lastModified="{Date}2023-05-18T06:56:04.251Z"
-        cq:lastModifiedBy="admin"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="Customer satisfaction is our priority, use the complaint to raise your queries for timely assistance | WKND Travels&#xd;&#xa;"
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/.content.xml
index 9896da4d1..491b99362 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/purchase-request/.content.xml
@@ -3,15 +3,9 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
-        cq:isDelivered="{Boolean}true"
+        jcr:createdBy="adobe"
         cq:lastModified="{Date}2023-07-03T10:41:48.601Z"
-        cq:lastModifiedBy="admin"
-        cq:lastReplicated="{Date}2023-05-30T08:17:31.625Z"
-        cq:lastReplicated_publish="{Date}2023-05-30T08:17:31.625Z"
-        cq:lastReplicatedBy="admin"
-        cq:lastReplicatedBy_publish="admin"
-        cq:lastReplicationAction="Activate"
-        cq:lastReplicationAction_publish="Activate"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="A Purchase Request Form to initiate the procurement process and allow employees to formally request the purchase of goods or services necessary for their work. The form captures essential details such as item description, quantity, preferred supplier (if applicable), budget allocation, justification for purchase, delivery information, and required approvals. The purpose of the form is to streamline and document the purchasing process, ensuring proper authorization and tracking of requested purchases."
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/.content.xml
index 81795fa3a..8633d4a9b 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/quality-control-inspection/.content.xml
@@ -3,15 +3,9 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
-        cq:isDelivered="{Boolean}true"
+        jcr:createdBy="adobe"
         cq:lastModified="{Date}2023-07-03T10:41:17.673Z"
-        cq:lastModifiedBy="admin"
-        cq:lastReplicated="{Date}2023-05-31T09:42:40.501Z"
-        cq:lastReplicated_publish="{Date}2023-05-31T09:42:40.501Z"
-        cq:lastReplicatedBy="admin"
-        cq:lastReplicatedBy_publish="admin"
-        cq:lastReplicationAction="Activate"
-        cq:lastReplicationAction_publish="Activate"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="A quality control inspection form to assess and document the visual appearance, dimensions, functionality, documentation, testing results, and overall quality of a product or item. It helps identify defects, non-conformances, and corrective actions necessary to ensure adherence to quality standards."
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/.content.xml
index 340e174c5..f8f5619c0 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/request-for-statement/.content.xml
@@ -3,15 +3,9 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
-        cq:isDelivered="{Boolean}true"
+        jcr:createdBy="adobe"
         cq:lastModified="{Date}2023-07-03T10:40:14.970Z"
-        cq:lastModifiedBy="admin"
-        cq:lastReplicated="{Date}2023-05-25T15:46:21.326Z"
-        cq:lastReplicated_publish="{Date}2023-05-25T15:46:21.326Z"
-        cq:lastReplicatedBy="admin"
-        cq:lastReplicatedBy_publish="admin"
-        cq:lastReplicationAction="Activate"
-        cq:lastReplicationAction_publish="Activate"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="A request for an account statement form to request a statement of transactions. This statement provides a detailed record of financial transactions, activities, or other relevant information about an individual. By completing this form, you can initiate the process of obtaining an accurate and up-to-date statement for your records."
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/.content.xml
index dce70c038..f940a4a1b 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/safety-inspection/.content.xml
@@ -3,15 +3,9 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         author="adobe"
-        cq:isDelivered="{Boolean}true"
+        jcr:createdBy="adobe"
         cq:lastModified="{Date}2023-07-03T10:41:32.790Z"
-        cq:lastModifiedBy="admin"
-        cq:lastReplicated="{Date}2023-05-27T04:40:20.107Z"
-        cq:lastReplicated_publish="{Date}2023-05-27T04:40:20.107Z"
-        cq:lastReplicatedBy="admin"
-        cq:lastReplicatedBy_publish="admin"
-        cq:lastReplicationAction="Activate"
-        cq:lastReplicationAction_publish="Activate"
+        cq:lastModifiedBy="adobe"
         cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
         jcr:description="The Safety Inspection Form is for maintaining a safe work environment. By conducting regular inspections using this form, potential hazards can be identified. It covers various aspects such as emergency exits, fire safety, electrical safety, hazardous materials, personal protective equipment, workstation ergonomics, etc. for the safety and well-being of employees, visitors, and customers and creates a secure environment for all."
         jcr:primaryType="cq:PageContent"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-fdm/__appId__/microsoft-dynamics-365-data-model/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-fdm/__appId__/microsoft-dynamics-365-data-model/.content.xml
index 8640fc0a0..50546d342 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-fdm/__appId__/microsoft-dynamics-365-data-model/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-fdm/__appId__/microsoft-dynamics-365-data-model/.content.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+    jcr:primaryType="dam:Asset"
+    jcr:createdBy="adobe">
     <jcr:content
         cq:conf="/conf/${appId}"
         jcr:lastModified="{Date}2021-03-30T10:34:28.653+05:30"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-fdm/__appId__/salesforce-data-model/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-fdm/__appId__/salesforce-data-model/.content.xml
index fa20f6805..e11b1842f 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-fdm/__appId__/salesforce-data-model/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-fdm/__appId__/salesforce-data-model/.content.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+    jcr:primaryType="dam:Asset"
+    jcr:createdBy="adobe">
     <jcr:content
         cq:conf="/conf/${appId}"
         jcr:lastModified="{Date}2022-07-11T11:12:11.289+05:30"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/beryl/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/beryl/.content.xml
index 7f70c0dbe..989e07e7d 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/beryl/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/beryl/.content.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+    jcr:primaryType="dam:Asset"
+    jcr:createdBy="adobe">
     <jcr:content
         jcr:primaryType="dam:AssetContent"
         jcr:lastModified="{Date}2021-08-08T18:22:20.809+05:30"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/canvas-3-0/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/canvas-3-0/.content.xml
index 43a79e134..ae0095f24 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/canvas-3-0/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/canvas-3-0/.content.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+    jcr:primaryType="dam:Asset"
+    jcr:createdBy="adobe">
     <jcr:content
         jcr:primaryType="dam:AssetContent"
         jcr:lastModified="{Date}2021-03-24T18:22:20.809+05:30"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/fsi/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/fsi/.content.xml
index 16b1c2795..431dabd60 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/fsi/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/fsi/.content.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+    jcr:primaryType="dam:Asset"
+    jcr:createdBy="adobe">
     <jcr:content
         cq:conf=""
         jcr:lastModified="{Date}2022-09-01T18:48:10.103-07:00"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/healthcare/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/healthcare/.content.xml
index d9dad71b2..e9cc67a4d 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/healthcare/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/healthcare/.content.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+    jcr:primaryType="dam:Asset"
+    jcr:createdBy="adobe">
     <jcr:content
         cq:conf=""
         jcr:lastModified="{Date}2022-11-09T10:14:25.876-08:00"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/tranquil/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/tranquil/.content.xml
index 1b5eb4fc1..37d9f2323 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/tranquil/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/tranquil/.content.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+    jcr:primaryType="dam:Asset"
+    jcr:createdBy="adobe">
     <jcr:content
         jcr:primaryType="dam:AssetContent"
         jcr:lastModified="{Date}2021-08-08T18:22:20.809+05:30"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/ultramarine/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/ultramarine/.content.xml
index ea8892821..4d3935d6c 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/ultramarine/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/ultramarine/.content.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+    jcr:primaryType="dam:Asset"
+    jcr:createdBy="adobe">
     <jcr:content
         jcr:primaryType="dam:AssetContent"
         jcr:lastModified="{Date}2021-08-08T18:22:20.809+05:30"
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/urbane/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/urbane/.content.xml
index 8caccbcdf..0de3431ed 100755
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/urbane/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/content/dam/formsanddocuments-themes/__appId__/urbane/.content.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:primaryType="dam:Asset">
+    jcr:primaryType="dam:Asset"
+    jcr:createdBy="adobe">
     <jcr:content
         jcr:primaryType="dam:AssetContent"
         jcr:lastModified="{Date}2021-08-08T18:22:20.809+05:30"