diff --git a/nixosModules/clanCore/vars/secret/password-store.nix b/nixosModules/clanCore/vars/secret/password-store.nix
index ceab97029..afd191778 100644
--- a/nixosModules/clanCore/vars/secret/password-store.nix
+++ b/nixosModules/clanCore/vars/secret/password-store.nix
@@ -4,7 +4,7 @@
     lib.mkIf (config.clan.core.vars.settings.secretStore == "password-store")
       {
         fileModule = file: {
-          path = lib.mkIf file.config.secret "${config.clan.core.password-store.targetDirectory}/${config.clan.core.machineName}-${file.config.generatorName}-${file.config.name}";
+          path = lib.mkIf file.config.secret "${config.clan.core.vars.settings.secretUploadDirectory}/vars/${file.config.generatorName}/${file.config.name}";
         };
         secretUploadDirectory = lib.mkDefault "/etc/secrets";
         secretModule = "clan_cli.vars.secret_modules.password_store";
diff --git a/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py b/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py
index 73d9b1622..f60120550 100644
--- a/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py
+++ b/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py
@@ -142,13 +142,7 @@ class SecretStore(SecretStoreBase):
         for secret_var in self.get_all():
             if not secret_var.deployed:
                 continue
-            if secret_var.shared:
-                output_file = (
-                    output_dir / "shared" / secret_var.generator / secret_var.name
-                )
-            else:
-                output_file = output_dir / secret_var.generator / secret_var.name
-
+            output_file = output_dir / "vars" / secret_var.generator / secret_var.name
             output_file.parent.mkdir(parents=True, exist_ok=True)
             with (output_file).open("wb") as f:
                 f.write(