diff --git a/elements/ubuntu/first-boot.d/01-ssh b/elements/ubuntu/first-boot.d/01-ssh
new file mode 100755
index 00000000..08f52c74
--- /dev/null
+++ b/elements/ubuntu/first-boot.d/01-ssh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# NOTE: this file should be removed once cloud-init is properly generating hostkeys
+# https://bugs.launchpad.net/diskimage-builder/+bug/1124593
+dpkg-reconfigure openssh-server