diff --git a/modules/virtualisation/ec2-data.nix b/modules/virtualisation/ec2-data.nix
index f55e6b69650..b0072f4f890 100644
--- a/modules/virtualisation/ec2-data.nix
+++ b/modules/virtualisation/ec2-data.nix
@@ -39,7 +39,15 @@ with pkgs.lib;
                   rm -f /root/key.pub
               fi
           fi
+        '';
+    };
 
+  jobs.printHostKey =
+    { name = "print-host-key";
+      task = true;
+      startOn = "started sshd";
+      script =
+        ''
           # Print the host public key on the console so that the user
           # can obtain it securely by parsing the output of
           # ec2-get-console-output.
@@ -49,5 +57,4 @@ with pkgs.lib;
         '';
     };
 
-
 }