diff --git a/magpie/configuration.nix b/magpie/configuration.nix
index 3a467ae..6ee89f5 100644
--- a/magpie/configuration.nix
+++ b/magpie/configuration.nix
@@ -286,52 +286,27 @@
     defaults.email = "asmir.abdulahovic@gmail.com";
   };
 
-  sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
-
-  sops.secrets."miniflux_env" = {
-    sopsFile = ./secrets/miniflux.yaml;
-  };
-
-  sops.secrets."gitea_mail_pw_hash" = {
-    sopsFile = ./secrets/gitea_mail_pw_hash.yaml;
-  };
-
-  sops.secrets."asmir_mail_pw_hash" = {
-    sopsFile = ./secrets/asmir_mail_pw_hash.yaml;
-  };
-
-  sops.secrets."gitea_db" = {
-    sopsFile = ./secrets/gitea_db.yaml;
-    owner = config.users.users.gitea.name;
-  };
-
-  sops.secrets."nextcloud_admin" = {
-    sopsFile = ./secrets/nextcloud_admin.yaml;
-    owner = config.users.users.nextcloud.name;
-  };
-
-  sops.secrets."wg_privkey" = {
-    sopsFile = ./secrets/wg_privkey.yaml;
-  };
-
-  sops.secrets."wg_preshared/nixy" = {
-    sopsFile = ../common/secrets/wg_preshared.yaml;
-  };
-
-  sops.secrets."wg_preshared/mediabox" = {
-    sopsFile = ../common/secrets/wg_preshared.yaml;
-  };
-
-  sops.secrets."wg_preshared/workstation" = {
-    sopsFile = ../common/secrets/wg_preshared.yaml;
-  };
-
-  sops.secrets."borgbase_enc_key" = {
-    sopsFile = ./secrets/borgbase_enc_key.yaml;
-  };
-
-  sops.secrets."borgbase_ssh_key" = {
-    sopsFile = ./secrets/borgbase_ssh_key.yaml;
+  sops = {
+    age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
+    secrets = {
+      "asmir_mail_pw_hash".sopsFile = ./secrets/asmir_mail_pw_hash.yaml;
+      "borgbase_enc_key".sopsFile = ./secrets/borgbase_enc_key.yaml;
+      "borgbase_ssh_key".sopsFile = ./secrets/borgbase_ssh_key.yaml;
+      "gitea_mail_pw_hash".sopsFile = ./secrets/gitea_mail_pw_hash.yaml;
+      "miniflux_env".sopsFile = ./secrets/miniflux.yaml;
+      "wg_preshared/mediabox".sopsFile = ../common/secrets/wg_preshared.yaml;
+      "wg_preshared/nixy".sopsFile = ../common/secrets/wg_preshared.yaml;
+      "wg_preshared/workstation".sopsFile = ../common/secrets/wg_preshared.yaml;
+      "wg_privkey".sopsFile = ./secrets/wg_privkey.yaml;
+      "gitea_db" = {
+        sopsFile = ./secrets/gitea_db.yaml;
+        owner = config.users.users.gitea.name;
+      };
+      "nextcloud_admin" = {
+        sopsFile = ./secrets/nextcloud_admin.yaml;
+        owner = config.users.users.nextcloud.name;
+      };
+    };
   };
 
   networking.hostName = "magpie";