diff --git a/cloud-init/cloudinit/ssh_util.py b/cloud-init/cloudinit/ssh_util.py
index 70a577b..e2f72b9 100644
--- a/cloud-init/cloudinit/ssh_util.py
+++ b/cloud-init/cloudinit/ssh_util.py
@@ -28,7 +28,7 @@ from cloudinit import util
 LOG = logging.getLogger(__name__)
 
 # See: man sshd_config
-DEF_SSHD_CFG = "/etc/ssh/sshd_config"
+DEF_SSHD_CFG = "/etc/openssh/sshd_config"
 
 # taken from openssh source key.c/key_type_from_name
 VALID_KEY_TYPES = ("rsa", "dsa", "ssh-rsa", "ssh-dss", "ecdsa",
diff --git a/cloud-init/tools/uncloud-init b/cloud-init/tools/uncloud-init
index 2574d48..048a650 100755
--- a/cloud-init/tools/uncloud-init
+++ b/cloud-init/tools/uncloud-init
@@ -123,7 +123,7 @@ cp /etc/init/tty2.conf /etc/init/ttyS0.conf &&
 	log "enabled console on ttyS0"
 
 pa=PasswordAuthentication
-sed -i "s,${pa} no,${pa} yes," /etc/ssh/sshd_config 2>/dev/null &&
+sed -i "s,${pa} no,${pa} yes," /etc/openssh/sshd_config 2>/dev/null &&
 	log "enabled passwd auth in ssh" ||
 	log "failed to enable passwd ssh"