diff --git a/stage2/01-sys-tweaks/00-debconf b/stage2/01-sys-tweaks/00-debconf
index 5e3340b..724f839 100644
--- a/stage2/01-sys-tweaks/00-debconf
+++ b/stage2/01-sys-tweaks/00-debconf
@@ -1,3 +1,6 @@
+# Encoding to use on the console:
+# Choices: ARMSCII-8, CP1251, CP1255, CP1256, GEORGIAN-ACADEMY, GEORGIAN-PS, IBM1133, ISIRI-3342, ISO-8859-1, ISO-8859-10, ISO-8859-11, ISO-8859-13, ISO-8859-14, ISO-8859-15, ISO-8859-16, ISO-8859-2, ISO-8859-3, ISO-8859-4, ISO-8859-5, ISO-8859-6, ISO-8859-7, ISO-8859-8, ISO-8859-9, KOI8-R, KOI8-U, TIS-620, UTF-8, VISCII
+console-setup   console-setup/charmap47 select  UTF-8
 # Character set to support:
 # Choices: . Arabic, # Armenian, # Cyrillic - KOI8-R and KOI8-U, # Cyrillic - non-Slavic languages, # Cyrillic - Slavic languages (also Bosnian and Serbian Latin), . Ethiopic, # Georgian, # Greek, # Hebrew, # Lao, # Latin1 and Latin5 - western Europe and Turkic languages, # Latin2 - central Europe and Romanian, # Latin3 and Latin8 - Chichewa; Esperanto; Irish; Maltese and Welsh, # Latin7 - Lithuanian; Latvian; Maori and Marshallese, . Latin - Vietnamese, # Thai, . Combined - Latin; Slavic Cyrillic; Hebrew; basic Arabic, . Combined - Latin; Slavic Cyrillic; Greek, . Combined - Latin; Slavic and non-Slavic Cyrillic, Guess optimal character set
 console-setup   console-setup/codeset47 select  Guess optimal character set
diff --git a/stage2/04-cloud-init/files/99_raspberry-pi.cfg b/stage2/04-cloud-init/files/99_raspberry-pi.cfg
index 0b85080..7134d90 100644
--- a/stage2/04-cloud-init/files/99_raspberry-pi.cfg
+++ b/stage2/04-cloud-init/files/99_raspberry-pi.cfg
@@ -5,11 +5,11 @@ datasource:
   NoCloud:
     seedfrom: file:///boot/firmware
 
-power_state:
-  delay: now
-  mode: reboot
-  message: Rebooting machine to enable usb gadget mode
-  condition: test -f /etc/modules-load.d/usb-gadget.conf
+# Leave SSH key emission to console disabled so that
+# users can decide whether to enable it manually.
+ssh:
+  emit_keys_to_console: false
+no_ssh_fingerprints: true
 
 # Disable SSH host key generation
 # regenerate_ssh_host_keys.service will take care