diff --git a/bors.toml b/bors.toml
index bca5cfa..6c367e5 100644
--- a/bors.toml
+++ b/bors.toml
@@ -13,14 +13,14 @@ status = [
   "check pruning-22_11 [x86_64-linux]",
   "check restart-and-reload [x86_64-linux]",
   "check restart-and-reload-22_11 [x86_64-linux]",
-  "check sops-import-keys-hook-22_11 [x86_64-linux]",
   "check sops-init-gpg-key-22_11 [x86_64-linux]",
+  "check sops-install-secrets-22_11 [x86_64-linux]",
   "check sops-pgp-hook-test-22_11 [x86_64-linux]",
-  "check ssh-keys-22_11 [x86_64-linux]",
+  "check ssh-keys [x86_64-linux]",
   "check ssh-to-pgp-22_11 [x86_64-linux]",
   "check unit-tests-22_11 [x86_64-linux]",
-  "default devShell [x86_64-linux]",
-  "default package [x86_64-linux]",
+  "check user-passwords [x86_64-linux]",
+  "check user-passwords-22_11 [x86_64-linux]",
   "package cross-build [x86_64-linux]",
   "package lint [x86_64-linux]",
   "package sops-import-keys-hook [x86_64-linux]",
diff --git a/flake.nix b/flake.nix
index 7d9c3d1..bcc42e8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@
     suffix-version = version: attrs: nixpkgs.lib.mapAttrs' (name: value: nixpkgs.lib.nameValuePair (name + version) value) attrs;
     suffix-stable = suffix-version "-22_11";
   in {
-    overlay = final: prev: let
+    overlays.default = final: prev: let
       localPkgs = import ./default.nix {pkgs = final;};
     in {
       inherit (localPkgs) sops-install-secrets sops-init-gpg-key sops-pgp-hook sops-import-keys-hook sops-ssh-to-age;
@@ -46,12 +46,11 @@
          (suffix-stable packages-stable));
 
     defaultPackage = forAllSystems (system: self.packages.${system}.sops-init-gpg-key);
-    devShell = forAllSystems (
-      system:
-        nixpkgs.legacyPackages.${system}.callPackage ./shell.nix {}
-    );
-    devShells = forAllSystems (system: {
-      unit-tests = nixpkgs.legacyPackages.${system}.callPackage ./pkgs/unit-tests.nix {};
+    devShells = forAllSystems (system: let
+      pkgs = nixpkgs.legacyPackages.${system};
+    in {
+      unit-tests = pkgs.callPackage ./pkgs/unit-tests.nix {};
+      default = pkgs.callPackage ./shell.nix {};
     });
   };
 }