diff --git a/90-default-user.preset b/90-default-user.preset
index c19d1b2..715bff2 100644
--- a/90-default-user.preset
+++ b/90-default-user.preset
@@ -28,3 +28,8 @@ enable snapd.session-agent.socket
 enable obex.service
 enable grub-boot-success.timer
 enable pulseaudio.socket
+
+# Ensure xdg-user-dirs are created properly
+# https://issues.redhat.com/browse/RHEL-79119
+# https://issues.redhat.com/browse/RHEL-80010
+enable xdg-user-dirs.service
diff --git a/almalinux-kitten-release.spec b/almalinux-kitten-release.spec
index fd8b453..96d2282 100644
--- a/almalinux-kitten-release.spec
+++ b/almalinux-kitten-release.spec
@@ -8,7 +8,7 @@
 
 Name:           almalinux-kitten-release
 Version:        %{major}.%{minor}
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        %{distro} release files
 License:        GPL-2.0-or-later
 URL:            https://almalinux.org
@@ -375,6 +375,9 @@ echo '%%x86_64_v2 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.x86_64_v2
 %{_sysconfdir}/pki/rpm-gpg
 
 %changelog
+* Thu Mar 13 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-8
+- Enable xdg-user-dirs service to fix creation races
+
 * Fri Feb 21 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-7
 - Enable nvmefc-boot-connections.service
 - Tweak /etc/issue to avoid incorrect English