diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/policies/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/policies/.content.xml
index 8535de924..5adb26f79 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/policies/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/policies/.content.xml
@@ -8,7 +8,7 @@
         <container1
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"
-            cq:policy="fd/af/components/responsivegrid/page-header"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             layout="responsiveGrid"/>
         <guideContainer
             cq:policy="${appId}/components/adaptiveForm/formcontainer/default"
@@ -18,7 +18,7 @@
         <container2
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"
-            cq:policy="fd/af/components/responsivegrid/page-footer"
+            cq:policy="${appId}/components/container/cc-af-footer-policy"
             layout="responsiveGrid"/>
     </jcr:content>
 </jcr:root>
diff --git a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml
index b92f2c5f5..225bb8044 100644
--- a/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml
+++ b/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml
@@ -9,7 +9,7 @@
         sling:resourceType="${appId}/components/adaptiveForm/page">
         <container1
             jcr:primaryType="nt:unstructured"
-            sling:resourceType="core/wcm/components/container/v1/container"
+            sling:resourceType="${appId}/components/container"
             layout="responsiveGrid"
             editable="{Boolean}true" />
         <guideContainer
@@ -21,7 +21,7 @@
         </guideContainer>
         <container2
             jcr:primaryType="nt:unstructured"
-            sling:resourceType="core/wcm/components/container/v1/container"
+            sling:resourceType="${appId}/components/container"
             layout="responsiveGrid"
             editable="{Boolean}true" />
         <cq:responsive jcr:primaryType="nt:unstructured">