diff --git a/app/[[...slug]]/page.tsx b/app/[[...slug]]/page.tsx
index 7505816..00450ec 100644
--- a/app/[[...slug]]/page.tsx
+++ b/app/[[...slug]]/page.tsx
@@ -10,6 +10,7 @@ import { SectionsAccordion } from '$widgets/SectionsAccordion';
 export async function generateStaticParams() {
   const { items: sections } = await getCollection<SectionRecord>('sections', {
     sort: 'order',
+    tags: ['sections'],
   });
   return [{}, ...sections.map((s) => ({ slug: [s.slug] }))];
 }
@@ -26,6 +27,7 @@ export default async function SectionPage({ params }: Props) {
 
   const { items: sections } = await getCollection<SectionRecord>('sections', {
     sort: 'order',
+    tags: ['sections'],
   });
 
   if (sections.length === 0) {
diff --git a/src/widgets/BioSection/ui/BioSection/BioSection.tsx b/src/widgets/BioSection/ui/BioSection/BioSection.tsx
index 455bf0a..1093cd2 100644
--- a/src/widgets/BioSection/ui/BioSection/BioSection.tsx
+++ b/src/widgets/BioSection/ui/BioSection/BioSection.tsx
@@ -8,7 +8,7 @@ import { RichText } from '$shared/ui';
  * Displays personal biography content from PocketBase.
  */
 export default async function BioSection() {
-  const data = await getFirstRecord<PageContentRecord>('bio');
+  const data = await getFirstRecord<PageContentRecord>('bio', { tags: ['bio'] });
 
   if (!data) {
     notFound();
diff --git a/src/widgets/ExperienceSection/ui/ExperienceSection/ExperienceSection.tsx b/src/widgets/ExperienceSection/ui/ExperienceSection/ExperienceSection.tsx
index 1293456..3becc5f 100644
--- a/src/widgets/ExperienceSection/ui/ExperienceSection/ExperienceSection.tsx
+++ b/src/widgets/ExperienceSection/ui/ExperienceSection/ExperienceSection.tsx
@@ -10,6 +10,7 @@ import { formatMonthYearRange } from '$shared/lib';
 export default async function ExperienceSection() {
   const { items } = await getCollection<ExperienceRecord>('experience', {
     sort: 'order',
+    tags: ['experience'],
   });
 
   return (
diff --git a/src/widgets/Footer/ui/Footer/Footer.tsx b/src/widgets/Footer/ui/Footer/Footer.tsx
index ff2b417..b89068f 100644
--- a/src/widgets/Footer/ui/Footer/Footer.tsx
+++ b/src/widgets/Footer/ui/Footer/Footer.tsx
@@ -10,6 +10,7 @@ import { Button, Link } from '$shared/ui';
 export async function Footer() {
   const settings = await getFirstRecord<SiteSettingsRecord>('site_settings', {
     expand: 'contacts,contacts.socials',
+    tags: ['site_settings'],
   });
 
   const cvUrl = settings?.cv ? buildFileUrl(settings.collectionId, settings.id, settings.cv) : null;
diff --git a/src/widgets/IntroSection/ui/IntroSection/IntroSection.tsx b/src/widgets/IntroSection/ui/IntroSection/IntroSection.tsx
index 2861198..c627bbb 100644
--- a/src/widgets/IntroSection/ui/IntroSection/IntroSection.tsx
+++ b/src/widgets/IntroSection/ui/IntroSection/IntroSection.tsx
@@ -8,7 +8,7 @@ import { RichText } from '$shared/ui';
  * Displays primary introduction content from PocketBase.
  */
 export default async function IntroSection() {
-  const data = await getFirstRecord<PageContentRecord>('intro');
+  const data = await getFirstRecord<PageContentRecord>('intro', { tags: ['intro'] });
 
   if (!data) {
     notFound();
diff --git a/src/widgets/ProjectsSection/ui/ProjectsSection/ProjectsSection.tsx b/src/widgets/ProjectsSection/ui/ProjectsSection/ProjectsSection.tsx
index d5baa3a..f71d3e0 100644
--- a/src/widgets/ProjectsSection/ui/ProjectsSection/ProjectsSection.tsx
+++ b/src/widgets/ProjectsSection/ui/ProjectsSection/ProjectsSection.tsx
@@ -10,6 +10,7 @@ import { buildFileUrl } from '$shared/lib';
 export default async function ProjectsSection() {
   const { items } = await getCollection<ProjectRecord>('projects', {
     sort: 'order',
+    tags: ['projects'],
   });
 
   return (
diff --git a/src/widgets/SkillsSection/ui/SkillsSection/SkillsSection.tsx b/src/widgets/SkillsSection/ui/SkillsSection/SkillsSection.tsx
index 2b0e7ff..9c729c5 100644
--- a/src/widgets/SkillsSection/ui/SkillsSection/SkillsSection.tsx
+++ b/src/widgets/SkillsSection/ui/SkillsSection/SkillsSection.tsx
@@ -11,6 +11,7 @@ import { Badge } from '$shared/ui';
 export default async function SkillsSection() {
   const data = await getCollection<SkillRecord>('skills', {
     sort: 'category,order',
+    tags: ['skills'],
   });
 
   if (!data.items.length) {