diff --git a/morph/grid/local/private-keys/borgbackup/storage1.repopath b/morph/grid/local/private-keys/borgbackup/storage1.repopath
deleted file mode 100644
index 9118f1f4b6979b9c237623769099be7a30851ee4..0000000000000000000000000000000000000000
--- a/morph/grid/local/private-keys/borgbackup/storage1.repopath
+++ /dev/null
@@ -1 +0,0 @@
-ratatat@ratatat.repo.borgbase.com:repo
diff --git a/morph/grid/local/public-keys/borgbackup/storage1.repopath b/morph/grid/local/public-keys/borgbackup/storage1.repopath
new file mode 100644
index 0000000000000000000000000000000000000000..7e24d080bc7e8f29c0f28404e149e2fdb65dca45
--- /dev/null
+++ b/morph/grid/local/public-keys/borgbackup/storage1.repopath
@@ -0,0 +1 @@
+vjs989hy@vjs989hy.repo.borgbase.com:repo
diff --git a/morph/grid/local/private-keys/borgbackup/storage2.repopath b/morph/grid/local/public-keys/borgbackup/storage2.repopath
similarity index 100%
rename from morph/grid/local/private-keys/borgbackup/storage2.repopath
rename to morph/grid/local/public-keys/borgbackup/storage2.repopath
diff --git a/morph/grid/production/public-keys/borgbackup/storage001.repopath b/morph/grid/production/public-keys/borgbackup/storage001.repopath
new file mode 100644
index 0000000000000000000000000000000000000000..8ab7655f7f49a3aaa87e37a341597aefb14372cd
--- /dev/null
+++ b/morph/grid/production/public-keys/borgbackup/storage001.repopath
@@ -0,0 +1 @@
+tqxc4i79@tqxc4i79.repo.borgbase.com:repo
diff --git a/morph/grid/production/public-keys/borgbackup/storage002.repopath b/morph/grid/production/public-keys/borgbackup/storage002.repopath
new file mode 120000
index 0000000000000000000000000000000000000000..307413014b63c9b02305e5c01409d2397d819b8f
--- /dev/null
+++ b/morph/grid/production/public-keys/borgbackup/storage002.repopath
@@ -0,0 +1 @@
+storage001.repopath
\ No newline at end of file
diff --git a/morph/grid/production/public-keys/borgbackup/storage003.repopath b/morph/grid/production/public-keys/borgbackup/storage003.repopath
new file mode 120000
index 0000000000000000000000000000000000000000..307413014b63c9b02305e5c01409d2397d819b8f
--- /dev/null
+++ b/morph/grid/production/public-keys/borgbackup/storage003.repopath
@@ -0,0 +1 @@
+storage001.repopath
\ No newline at end of file
diff --git a/morph/grid/production/public-keys/borgbackup/storage004.repopath b/morph/grid/production/public-keys/borgbackup/storage004.repopath
new file mode 120000
index 0000000000000000000000000000000000000000..307413014b63c9b02305e5c01409d2397d819b8f
--- /dev/null
+++ b/morph/grid/production/public-keys/borgbackup/storage004.repopath
@@ -0,0 +1 @@
+storage001.repopath
\ No newline at end of file
diff --git a/morph/grid/production/public-keys/borgbackup/storage005.repopath b/morph/grid/production/public-keys/borgbackup/storage005.repopath
new file mode 120000
index 0000000000000000000000000000000000000000..307413014b63c9b02305e5c01409d2397d819b8f
--- /dev/null
+++ b/morph/grid/production/public-keys/borgbackup/storage005.repopath
@@ -0,0 +1 @@
+storage001.repopath
\ No newline at end of file
diff --git a/morph/grid/testing/public-keys/borgbackup/storage001.repopath b/morph/grid/testing/public-keys/borgbackup/storage001.repopath
new file mode 100644
index 0000000000000000000000000000000000000000..8ab7655f7f49a3aaa87e37a341597aefb14372cd
--- /dev/null
+++ b/morph/grid/testing/public-keys/borgbackup/storage001.repopath
@@ -0,0 +1 @@
+tqxc4i79@tqxc4i79.repo.borgbase.com:repo
diff --git a/morph/lib/borgbackup.nix b/morph/lib/borgbackup.nix
index 1dc48dd17478a57e5b24964652774da3b4161103..1cae71e905e04b4c5c0f4dfa9bed8bc7ec0e1286 100644
--- a/morph/lib/borgbackup.nix
+++ b/morph/lib/borgbackup.nix
@@ -23,13 +23,6 @@ in {
   config = lib.mkIf cfg.enable {
     deployment = {
       secrets = {
-        "borgbackup-repopath" = {
-          # This is the repo we are backing up to
-          # Not very secret, but not public either, and I'd rather keep it with
-          # the rest of the backup destination config
-          destination = "/run/keys/borgbackup/repopath";
-          source = "${privateKeyPath}/borgbackup/${config.networking.hostName}.repopath";
-        };
         "borgbackup-passphrase" = {
           # The passphrase is used to encrypt the repo key
           # https://borgbackup.readthedocs.io/en/stable/usage/init.html
@@ -47,7 +40,7 @@ in {
     services.borgbackup.jobs = {
       daily = {
         paths = cfg.paths;
-        repo = lib.fileContents config.deployment.secrets.borgbackup-repopath.source;
+        repo = lib.fileContents "${publicKeyPath}/borgbackup/${config.networking.hostName}.repopath";
         encryption = {
           mode = "repokey-blake2";
           passCommand = "cat /run/keys/borgbackup/passphrase";