diff --git a/morph/lib/issuer-aws.nix b/morph/lib/issuer-aws.nix
index 16db454ee82cd86eebc2c7b53e8744107bd776d6..a66ab72addd43da1feb96bdd86d46312ec327fd3 100644
--- a/morph/lib/issuer-aws.nix
+++ b/morph/lib/issuer-aws.nix
@@ -1,5 +1,10 @@
 { name, lib, ... }: {
   imports = [ <nixpkgs/nixos/modules/virtualisation/amazon-image.nix> ];
+
+  # amazon-image.nix isn't quite aware of nvme-attached storage so give it a
+  # little help configuring grub.
+  boot.loader.grub.device = lib.mkForce "/dev/nvme0n1";
+
   ec2.hvm = true;
   boot.kernel.sysctl = { "vm.swappiness" = 0; };
   swapDevices = [ {
@@ -12,9 +17,4 @@
   # morph-supplied name.  See also
   # <https://github.com/DBCDK/morph/issues/146>.
   networking.hostName = name;
-
-  # amazon-image.nix isn't quite aware of nvme-attached storage so give it a
-  # little help configuring grub.
-  boot.loader.grub.device = lib.mkForce "/dev/nvme0n1";
-
 }