diff --git a/stage2/04-cloud-init/files/99_raspberry-pi.cfg b/stage2/04-cloud-init/files/99_raspberry-pi.cfg
index ffc0994..f699abf 100644
--- a/stage2/04-cloud-init/files/99_raspberry-pi.cfg
+++ b/stage2/04-cloud-init/files/99_raspberry-pi.cfg
@@ -5,6 +5,11 @@ datasource:
   NoCloud:
     seedfrom: file:///boot/firmware
 
+# Leave SSH key emission to console disabled so that
+# users can decide whether to enable it manually.
+ssh:
+  emit_keys_to_console: false
+
 # Disable SSH host key generation
 # regenerate_ssh_host_keys.service will take care 
 # of it on first boot