diff --git a/config/omen.nix b/config/omen.nix
index 1d35f80..6d859cf 100644
--- a/config/omen.nix
+++ b/config/omen.nix
@@ -71,13 +71,6 @@
   # For RTL-SDR
   hardware.rtl-sdr.enable = true;
 
-  # Setup Pinentry
-  programs.gnupg.agent = {
-    enable = true;
-    pinentryPackage = pkgs.pinentry-gtk2;
-    enableSSHSupport = true;
-  };
-
   # Setup protonmail bridge
   systemd.user.services.protonmail-bridge = {
     description = "Protonmail Bridge";
diff --git a/config/shared.nix b/config/shared.nix
index 97b9734..5fdba74 100644
--- a/config/shared.nix
+++ b/config/shared.nix
@@ -53,6 +53,17 @@
     }))
   ];
 
+  # Setup Pinentry
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryPackage = pkgs.pinentry-gtk2;
+    enableSSHSupport = true;
+  };
+
+  # Keyring Setup
+  services.gnome.gnome-keyring.enable = true;
+  security.pam.services.login.enableGnomeKeyring = true;
+
   # Enable services.
   services.openssh.enable = true;
   services.tailscale.enable = true;
@@ -62,10 +73,6 @@
   services.gvfs.enable = true;
   services.tumbler.enable = true;
 
-  # Keyring Setup
-  services.gnome.gnome-keyring.enable = true;
-  security.pam.services.login.enableGnomeKeyring = true;
-
   # Enable docker service.
   virtualisation.docker.enable = true;
 
diff --git a/hardware/mnemosyne.nix b/hardware/mnemosyne.nix
index 1d69f67..38c1b14 100644
--- a/hardware/mnemosyne.nix
+++ b/hardware/mnemosyne.nix
@@ -18,8 +18,9 @@
     fsType = "ext4";
   };
 
+  # The label "storage" can be set using e2label.
   fileSystems."/mnt/archive" = {
-    device = "/dev/disk/by-uuid/66103455-9fcd-4b5b-9735-37b85a51019d";
+    device = "/dev/disk/by-label/storage";
     fsType = "ext4";
   };