diff --git a/jcr_root/content/adaptto/.content.xml b/jcr_root/content/adaptto/.content.xml
index 2bd13cd..4f3ee33 100644
--- a/jcr_root/content/adaptto/.content.xml
+++ b/jcr_root/content/adaptto/.content.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    cq:allowedTemplates="[/libs/core/franklin/templates/.*]"
     jcr:primaryType="sling:Folder"
     jcr:title="adaptto"/>
diff --git a/jcr_root/content/adaptto/xwalk/.content.xml b/jcr_root/content/adaptto/xwalk/.content.xml
index 83fad0f..f8a443c 100644
--- a/jcr_root/content/adaptto/xwalk/.content.xml
+++ b/jcr_root/content/adaptto/xwalk/.content.xml
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-    cq:allowedTemplates="[/libs/core/franklin/templates/.*]"
-    cq:conf="/conf/adaptto/xwalk"
-    jcr:primaryType="sling:Folder"
-    jcr:title="xwalk"/>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:allowedTemplates="[/libs/core/franklin/templates/.*]"
+        cq:conf="/conf/adaptto/xwalk"
+        cq:template="/libs/core/franklin/templates/page"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="xwalk"
+        sling:resourceType="core/franklin/components/page/v1/page"
+        jcr:mixinTypes="[cq:ReplicationStatus]"
+        cq:lastReplicated="{Date}2024-04-30T00:00:00.000+02:00"
+        cq:lastReplicationAction="Activate">
+        <root
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/franklin/components/root/v1/root">
+            <section
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="core/franklin/components/section/v1/section"/>
+        </root>
+    </jcr:content>
+    <_x0032_023/>
+    <_x0032_024/>
+    <_helix/>
+    <speakers/>
+    <metadata/>
+    <redirects/>
+</jcr:root>
diff --git a/jcr_root/content/adaptto/xwalk/2023/.content.xml b/jcr_root/content/adaptto/xwalk/2023/.content.xml
index fbcb58b..45e1537 100644
--- a/jcr_root/content/adaptto/xwalk/2023/.content.xml
+++ b/jcr_root/content/adaptto/xwalk/2023/.content.xml
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-    jcr:primaryType="sling:Folder"
-    jcr:title="2023"/>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:template="/libs/core/franklin/templates/page"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="2023"
+        sling:resourceType="core/franklin/components/page/v1/page"
+        jcr:mixinTypes="[cq:ReplicationStatus]"
+        cq:lastReplicated="{Date}2024-04-30T00:00:00.000+02:00"
+        cq:lastReplicationAction="Activate">
+        <root
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/franklin/components/root/v1/root">
+            <section
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="core/franklin/components/section/v1/section"/>
+        </root>
+    </jcr:content>
+    <fragments/>
+    <conference/>
+    <footer/>
+    <index/>
+    <nav/>
+    <schedule/>
+    <schedule-data/>
+</jcr:root>
diff --git a/jcr_root/content/adaptto/xwalk/2023/fragments/.content.xml b/jcr_root/content/adaptto/xwalk/2023/fragments/.content.xml
index fab3f81..2cf6939 100644
--- a/jcr_root/content/adaptto/xwalk/2023/fragments/.content.xml
+++ b/jcr_root/content/adaptto/xwalk/2023/fragments/.content.xml
@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-    jcr:primaryType="sling:OrderedFolder"
-    jcr:title="fragments">
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:template="/libs/core/franklin/templates/page"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="fragments"
+        sling:resourceType="core/franklin/components/page/v1/page"
+        jcr:mixinTypes="[cq:ReplicationStatus]"
+        cq:lastReplicated="{Date}2024-04-30T00:00:00.000+02:00"
+        cq:lastReplicationAction="Activate">
+        <root
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/franklin/components/root/v1/root">
+            <section
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="core/franklin/components/section/v1/section"/>
+        </root>
+    </jcr:content>
     <aside-bar/>
     <teaser-bar/>
 </jcr:root>
diff --git a/jcr_root/content/adaptto/xwalk/2024/.content.xml b/jcr_root/content/adaptto/xwalk/2024/.content.xml
index 82451ca..ab2eaf2 100644
--- a/jcr_root/content/adaptto/xwalk/2024/.content.xml
+++ b/jcr_root/content/adaptto/xwalk/2024/.content.xml
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-    jcr:primaryType="sling:Folder"
-    jcr:title="2024"/>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:template="/libs/core/franklin/templates/page"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="2024"
+        sling:resourceType="core/franklin/components/page/v1/page"
+        jcr:mixinTypes="[cq:ReplicationStatus]"
+        cq:lastReplicated="{Date}2024-04-30T00:00:00.000+02:00"
+        cq:lastReplicationAction="Activate">
+        <root
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/franklin/components/root/v1/root">
+            <section
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="core/franklin/components/section/v1/section"/>
+        </root>
+    </jcr:content>
+    <fragments/>
+    <conference/>
+    <footer/>
+    <index/>
+    <nav/>
+</jcr:root>
diff --git a/jcr_root/content/adaptto/xwalk/2024/fragments/.content.xml b/jcr_root/content/adaptto/xwalk/2024/fragments/.content.xml
index fab3f81..2cf6939 100644
--- a/jcr_root/content/adaptto/xwalk/2024/fragments/.content.xml
+++ b/jcr_root/content/adaptto/xwalk/2024/fragments/.content.xml
@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-    jcr:primaryType="sling:OrderedFolder"
-    jcr:title="fragments">
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:template="/libs/core/franklin/templates/page"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="fragments"
+        sling:resourceType="core/franklin/components/page/v1/page"
+        jcr:mixinTypes="[cq:ReplicationStatus]"
+        cq:lastReplicated="{Date}2024-04-30T00:00:00.000+02:00"
+        cq:lastReplicationAction="Activate">
+        <root
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/franklin/components/root/v1/root">
+            <section
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="core/franklin/components/section/v1/section"/>
+        </root>
+    </jcr:content>
     <aside-bar/>
     <teaser-bar/>
 </jcr:root>
diff --git a/jcr_root/content/adaptto/xwalk/_helix/.content.xml b/jcr_root/content/adaptto/xwalk/_helix/.content.xml
index 0550941..2cff16e 100644
--- a/jcr_root/content/adaptto/xwalk/_helix/.content.xml
+++ b/jcr_root/content/adaptto/xwalk/_helix/.content.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-    jcr:primaryType="sling:Folder"
-    jcr:title="_helix"/>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:template="/libs/core/franklin/templates/page"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="_helix"
+        sling:resourceType="core/franklin/components/page/v1/page"
+        jcr:mixinTypes="[cq:ReplicationStatus]"
+        cq:lastReplicated="{Date}2024-04-30T00:00:00.000+02:00"
+        cq:lastReplicationAction="Activate">
+        <root
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/franklin/components/root/v1/root">
+            <section
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="core/franklin/components/section/v1/section"/>
+        </root>
+    </jcr:content>
+    <config/>
+    <headers/>
+</jcr:root>
diff --git a/jcr_root/content/adaptto/xwalk/speakers/.content.xml b/jcr_root/content/adaptto/xwalk/speakers/.content.xml
index 82513e7..25d28da 100644
--- a/jcr_root/content/adaptto/xwalk/speakers/.content.xml
+++ b/jcr_root/content/adaptto/xwalk/speakers/.content.xml
@@ -1,4 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-    jcr:primaryType="sling:Folder"
-    jcr:title="speakers"/>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:template="/libs/core/franklin/templates/page"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="speakers"
+        sling:resourceType="core/franklin/components/page/v1/page"
+        jcr:mixinTypes="[cq:ReplicationStatus]"
+        cq:lastReplicated="{Date}2024-04-30T00:00:00.000+02:00"
+        cq:lastReplicationAction="Activate">
+        <root
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/franklin/components/root/v1/root">
+            <section
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="core/franklin/components/section/v1/section"/>
+        </root>
+    </jcr:content>
+    <artur-kudlacz/>
+    <carsten-ziegeler/>
+    <duy-nguyen/>
+    <lucian-ghita/>
+    <robert-munteanu/>
+    <sharanya-vinod/>
+    <stefan-seifert/>
+    <vlad-bailescu/>
+</jcr:root>