diff --git a/assets/data/news.json b/assets/data/news.json
index 39d6566b1..30c232116 100644
--- a/assets/data/news.json
+++ b/assets/data/news.json
@@ -2,7 +2,7 @@
     "id": 36,
     "content": "Introducing the all-new Apollo Vite Template",
     "linkText": "View Demo",
-    "linkHref": "https://www.primefaces.org/apollo-vue",
+    "linkHref": "https://apollo.primevue.org",
     "backgroundStyle": "background-color:#4f8ff7",
     "textStyle": "color:#ffffff;font-weight:500",
     "linkStyle": "color:#ffffff;font-weight:700;text-decoration: underline;"
diff --git a/pages/landing/TemplateSection.vue b/pages/landing/TemplateSection.vue
index 0d8ebfce2..b5c1beed3 100644
--- a/pages/landing/TemplateSection.vue
+++ b/pages/landing/TemplateSection.vue
@@ -11,29 +11,29 @@
         <section :class="['templates flex justify-content-center align-items-center flex-column mt-7', { 'templates-animation': setAnimation }]">
             <div class="flex md:flex-row flex-column gap-4 lg:gap-0">
                 <div class="template-block block-1 mr-2 lg:mb-0 flex justify-content-center align-items-center" :style="{ backgroundImage: imageBg('diamond') }">
-                    <a class="templates-btn" target="_blank" href="https://www.primefaces.org/diamond-vue/">Diamond Preview</a>
+                    <a class="templates-btn" target="_blank" href="https://diamond.primevue.org">Diamond Preview</a>
                 </div>
                 <div class="template-block block-2 ml-2 flex justify-content-center align-items-center" :style="{ backgroundImage: imageBg('freya') }">
-                    <a class="templates-btn" target="_blank" href="https://www.primefaces.org/freya-vue/">Freya Preview</a>
+                    <a class="templates-btn" target="_blank" href="https://freya.primevue.org">Freya Preview</a>
                 </div>
             </div>
             <div class="flex my-4 md:flex-row flex-column gap-4 lg:gap-0">
                 <div class="template-block block-3 mr-2 lg:mb-0 flex justify-content-center align-items-center" :style="{ backgroundImage: imageBg('atlantis') }">
-                    <a class="templates-btn" target="_blank" href="https://www.primefaces.org/atlantis-vue/">Atlantis Preview</a>
+                    <a class="templates-btn" target="_blank" href="https://atlantis.primevue.org/">Atlantis Preview</a>
                 </div>
                 <div class="template-block block-middle border-none box-shadow-none mr-2 hidden lg:flex justify-content-center align-items-center flex-column">
                     <img class="img-1" :src="templateImg()" height="110" />
                 </div>
                 <div class="template-block block-4 ml-2 flex justify-content-center align-items-center" :style="{ backgroundImage: imageBg('apollo') }">
-                    <a class="templates-btn" target="_blank" href="https://www.primefaces.org/apollo-vue/">Apollo Preview</a>
+                    <a class="templates-btn" target="_blank" href="https://apollo.primevue.org">Apollo Preview</a>
                 </div>
             </div>
             <div class="flex md:flex-row flex-column gap-4 lg:gap-0">
                 <div class="template-block block-5 mr-2 lg:mb-0 flex justify-content-center align-items-center" :style="{ backgroundImage: imageBg('serenity') }">
-                    <a class="templates-btn" target="_blank" href="https://www.primefaces.org/serenity-vue/">Serenity Preview</a>
+                    <a class="templates-btn" target="_blank" href="https://serenity.primevue.org">Serenity Preview</a>
                 </div>
                 <div class="template-block block-6 ml-2 flex justify-content-center align-items-center" :style="{ backgroundImage: imageBg('ultima') }">
-                    <a class="templates-btn" target="_blank" href="https://www.primefaces.org/ultima-vue/">Ultima Preview</a>
+                    <a class="templates-btn" target="_blank" href="https://ultima.primevue.org">Ultima Preview</a>
                 </div>
             </div>
             <div class="lines">
diff --git a/pages/templates/index.vue b/pages/templates/index.vue
index 95565a1aa..a09256dd0 100644
--- a/pages/templates/index.vue
+++ b/pages/templates/index.vue
@@ -8,11 +8,11 @@
         <div class="grid">
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/apollo-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://apollo.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Apollo" src="https://primefaces.org/cdn/primevue/images/layouts/apollo-vue.jpg" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/apollo-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://apollo.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://www.primefaces.org/layouts/apollo-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">
@@ -23,11 +23,11 @@
             </div>
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/sakai-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://sakai.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Sakai" src="https://primefaces.org/cdn/primevue/images/layouts/sakai-vue.jpg" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/sakai-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://sakai.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://github.com/primefaces/sakai-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">
@@ -38,11 +38,11 @@
             </div>
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/atlantis-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://atlantis.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Atlantis" src="https://primefaces.org/cdn/primevue/images/layouts/atlantis-vue.jpg" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/atlantis-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://atlantis.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://www.primefaces.org/layouts/atlantis-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">
@@ -53,11 +53,11 @@
             </div>
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/ultima-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://ultima.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Ultima" src="https://primefaces.org/cdn/primevue/images/layouts/ultima-vue.jpg" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/ultima-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://ultima.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://www.primefaces.org/layouts/ultima-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">
@@ -68,11 +68,11 @@
             </div>
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/freya-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://freya.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Freya" src="https://primefaces.org/cdn/primevue/images/layouts/freya-vue.png" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/freya-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://freya.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://www.primefaces.org/layouts/freya-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">
@@ -83,11 +83,11 @@
             </div>
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/diamond-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://diamond.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Diamond" src="https://primefaces.org/cdn/primevue/images/layouts/diamond-vue.jpg" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/diamond-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://diamond.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://www.primefaces.org/layouts/diamond-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">
@@ -98,11 +98,11 @@
             </div>
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/verona-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://verona.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Verona" src="https://primefaces.org/cdn/primevue/images/layouts/verona-vue.jpg" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/verona-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://verona.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://www.primefaces.org/layouts/verona-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">
@@ -113,11 +113,11 @@
             </div>
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/poseidon-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://poseidon.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Poseidon" src="https://primefaces.org/cdn/primevue/images/layouts/poseidon-vue.jpg" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/poseidon-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://poseidon.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://www.primefaces.org/layouts/poseidon-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">
@@ -128,11 +128,11 @@
             </div>
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/sapphire-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://sapphire.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Sapphire" src="https://primefaces.org/cdn/primevue/images/layouts/sapphire-vue.jpg" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/sapphire-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://sapphire.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://www.primefaces.org/layouts/sapphire-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">
@@ -143,11 +143,11 @@
             </div>
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/serenity-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://serenity.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Serenity" src="https://primefaces.org/cdn/primevue/images/layouts/serenity-vue.jpg" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/serenity-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://serenity.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://www.primefaces.org/layouts/serenity-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">
@@ -158,11 +158,11 @@
             </div>
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/babylon-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://babylon.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Babylon" src="https://primefaces.org/cdn/primevue/images/layouts/babylon-vue.jpg" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/babylon-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://babylon.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://www.primefaces.org/layouts/babylon-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">
@@ -173,11 +173,11 @@
             </div>
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/avalon-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://avalon.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Avalon" src="https://primefaces.org/cdn/primevue/images/layouts/avalon-vue.jpg" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/avalon-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://avalon.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://www.primefaces.org/layouts/avalon-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">
@@ -188,11 +188,11 @@
             </div>
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/roma-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://roma.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Roma" src="https://primefaces.org/cdn/primevue/images/layouts/roma-vue.jpg" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/roma-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://roma.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://www.primefaces.org/layouts/roma-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">
@@ -203,11 +203,11 @@
             </div>
             <div class="col-12 lg:col-6 xl:col-4">
                 <div class="card mb-0">
-                    <a href="https://www.primefaces.org/prestige-vue" rel="noopener noreferrer" target="_blank">
+                    <a href="https://prestige.primevue.org" rel="noopener noreferrer" target="_blank">
                         <img alt="Prestige" src="https://primefaces.org/cdn/primevue/images/layouts/prestige-vue.jpg" class="w-full" />
                     </a>
                     <div class="flex gap-3 mt-3">
-                        <a href="https://www.primefaces.org/prestige-vue" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
+                        <a href="https://prestige.primevue.org" class="flex-1 p-button p-component" rel="noopener noreferrer" target="_blank">
                             <span class="p-button-label white-space-nowrap">Preview</span>
                         </a>
                         <a href="https://www.primefaces.org/layouts/prestige-vue" class="flex-1 p-button p-component p-button-outlined" rel="noopener noreferrer" target="_blank">