diff --git a/Documentation/configuration.md b/Documentation/configuration.md
index d636390b6..488d9755e 100644
--- a/Documentation/configuration.md
+++ b/Documentation/configuration.md
@@ -2,7 +2,7 @@
 
 ## Automatic
 
-You can format a USB stick with FAT32/EXT4 and name it with `config`. The layout could be look like:
+You can format a USB stick with FAT32/EXT4 and name it with `CONFIG`. The layout could be look like:
 ```
 network/
 modules/
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-config.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-config.mount
index 9140f9e2a..116ee32ae 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-config.mount
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-config.mount
@@ -2,7 +2,7 @@
 Description=HassOS config partition
 
 [Mount]
-What=LABEL=config
+What=LABEL=CONFIG
 Where=/mnt/config
 Type=auto
 Options=ro
diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-config b/buildroot-external/rootfs-overlay/usr/sbin/hassos-config
index 04f6177e1..22dbef28e 100755
--- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-config
+++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-config
@@ -37,7 +37,7 @@ fi
 if [ -f /mnt/config/authorized_keys ]; then
     echo "[Info] Update SSH authorized_keys!"
 
-    cp -f /mnt/config/known_hosts /root/.ssh/authorized_keys
+    cp -f /mnt/config/authorized_keys /root/.ssh/authorized_keys
     chmod 600 /root/.ssh/authorized_keys
 
     systemctl start dropbear
@@ -52,7 +52,7 @@ if ls /mnt/config/*.raucb > /dev/null; then
     echo "[Info] Performe a firmware update"
 
     rauc_filename=$(ls /mnt/config/*.raucb | head -n 1)
-    if rauc install /mnt/config/$rauc_filename; then
+    if rauc install ${rauc_filename}; then
         echo "[Info] Firmware update success"
         systemctl reboot
     else