diff --git a/home/jonas@comfy-station/borg.nix b/home/jonas@comfy-station/borg.nix
index fb1fcfa..0a2d33b 100644
--- a/home/jonas@comfy-station/borg.nix
+++ b/home/jonas@comfy-station/borg.nix
@@ -36,7 +36,7 @@ in {
   programs.borgmatic.backups = {
     workspaces = {
       location = {
-        sourceDirectories = ["${config.xdg.userDirs.extraConfig.XDG_WORKSPACES_DIR}"];
+        sourceDirectories = ["${config.xdg.userDirs.extraConfig.WORKSPACES}"];
         repositories = [repo];
         excludeHomeManagerSymlinks = true;
         extraConfig = {
diff --git a/home/jonas@comfy-station/configuration.nix b/home/jonas@comfy-station/configuration.nix
index 8ddd34b..ff12762 100644
--- a/home/jonas@comfy-station/configuration.nix
+++ b/home/jonas@comfy-station/configuration.nix
@@ -48,9 +48,9 @@
   xdg.userDirs.enable = true;
   xdg.userDirs.createDirectories = true;
   xdg.userDirs.extraConfig = {
-    XDG_WORKSPACES_DIR = "${config.home.homeDirectory}/Workspaces";
-    XDG_NEXTCLOUD_DIR = "${config.home.homeDirectory}/Nextcloud";
-    XDG_NOTES_DIR = "${config.home.homeDirectory}/Notes";
+    WORKSPACES = "${config.home.homeDirectory}/Workspaces";
+    NEXTCLOUD = "${config.home.homeDirectory}/Nextcloud";
+    NOTES = "${config.home.homeDirectory}/Notes";
   };
 
   # This value determines the Home Manager release that your configuration is
diff --git a/home/jonas@monolith/configuration.nix b/home/jonas@monolith/configuration.nix
index 3bcba0e..3505b22 100644
--- a/home/jonas@monolith/configuration.nix
+++ b/home/jonas@monolith/configuration.nix
@@ -54,9 +54,9 @@
   xdg.userDirs.enable = true;
   xdg.userDirs.createDirectories = true;
   xdg.userDirs.extraConfig = {
-    XDG_WORKSPACES_DIR = "${config.home.homeDirectory}/Workspaces";
-    XDG_NEXTCLOUD_DIR = "${config.home.homeDirectory}/Nextcloud";
-    XDG_NOTES_DIR = "${config.home.homeDirectory}/Notes";
+    WORKSPACES = "${config.home.homeDirectory}/Workspaces";
+    NEXTCLOUD = "${config.home.homeDirectory}/Nextcloud";
+    NOTES = "${config.home.homeDirectory}/Notes";
   };
 
   # This value determines the Home Manager release that your configuration is