diff --git a/modules/baremetal.nix b/modules/baremetal.nix
index 9730c0a6..9a481b2d 100644
--- a/modules/baremetal.nix
+++ b/modules/baremetal.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, utils, ... }:
 
 {
   options.c3d2.baremetal = lib.mkEnableOption "baremetal";
@@ -42,6 +42,14 @@
           contents."/etc/profile".text = ''
             systemd-tty-ask-password-agent
           '';
+          services = lib.mkIf config.boot.zfs.enabled {
+            zfs-import-rpool = let
+              devices = map (name: "dev-mapper-${utils.escapeSystemdPath name}.device") (lib.attrNames config.boot.initrd.luks.devices);
+            in {
+              wants = devices;
+              after = devices;
+            };
+          };
         };
       };
       kernelParams = [