diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/docker.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/docker.conf
deleted file mode 100644
index 53a8d88b0..000000000
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/docker.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Unit]
-Requires=docker.service
-After=docker.service
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/noclear.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/noclear.conf
deleted file mode 100644
index 52671c758..000000000
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/getty@.service.d/noclear.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-TTYVTDisallocate=no
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/serial-getty@.service.d/docker.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/serial-getty@.service.d/docker.conf
deleted file mode 100644
index 53a8d88b0..000000000
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/serial-getty@.service.d/docker.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Unit]
-Requires=docker.service
-After=docker.service
diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli b/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli
index 9164eb404..d3b018b5b 100755
--- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli
+++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-cli
@@ -14,7 +14,7 @@ if [ "$(docker ps -q -f name=hassio_cli)" ]; then
         /bin/ash -l
     fi
 else
-    echo "[ERROR] Somethings going wrong! Jump into emergency console..."
+    echo "[WARN] Home Assistant CLI is not running! Jump into emergency console..."
     /bin/ash -l
 fi