diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix
index a87a690..4487167 100644
--- a/odin/common_configuration.nix
+++ b/odin/common_configuration.nix
@@ -89,6 +89,8 @@ with lib; {
 
   services.fwupd.enable = true;
 
+  services.keybase.enable = true;
+
   # Enable sound.
   # PULSE
   # sound.enable = true;
diff --git a/thor/configuration.nix b/thor/configuration.nix
index 5ee67dc..eff9c4d 100644
--- a/thor/configuration.nix
+++ b/thor/configuration.nix
@@ -114,12 +114,13 @@ with lib; {
       updater.enable = true;
     };
     dbus.packages = with pkgs; [ dconf ];
+    fwupd.enable = true;
     gnome.gnome-keyring.enable = true;
     gvfs = {
       enable = true;
       package = pkgs.gnome3.gvfs;
     };
-    fwupd.enable = true;
+    keybase.enable = true;
     onedrive.enable = true;
     openssh = {
       enable = true;