diff --git a/recipes-google/bare-metal-setup/files/bare-metal-setup.sh.in b/recipes-google/bare-metal-setup/files/bare-metal-setup.sh.in
index 8c31d24..f29e5fb 100644
--- a/recipes-google/bare-metal-setup/files/bare-metal-setup.sh.in
+++ b/recipes-google/bare-metal-setup/files/bare-metal-setup.sh.in
@@ -48,6 +48,49 @@
 
 }
 
+function override_hostlogger_in_bm_mode() {
+    systemd_runtime_dir='/run/systemd/system'
+    hostlogger_service="hostlogger@.service"
+    hostlogger_override_dir="${systemd_runtime_dir}/${hostlogger_service}.d"
+
+    mkdir -p ${hostlogger_override_dir}
+    echo "[Unit]
+BindsTo=gbmc-bare-metal-active.target
+Before=gbmc-bare-metal-active.target
+[Install]
+WantedBy=
+WantedBy=gbmc-bare-metal-active.target
+" > "${hostlogger_override_dir}/50-bm-override.conf"
+
+    # Overriding Install section does not work for already installed service
+    # Moving the service directly and recover it when turning off BM mode.
+    # mv seems not happy with jffs + symlink.
+
+    systemd_etc_dir='/etc/systemd/system'
+
+    mkdir -p ${systemd_etc_dir}/gbmc-bare-metal-active.target.wants
+
+    cp -P ${systemd_etc_dir}/multi-user.target.wants/hostlogger@*.service \
+      ${systemd_etc_dir}/gbmc-bare-metal-active.target.wants/
+
+    rm ${systemd_etc_dir}/multi-user.target.wants/hostlogger@*.service
+
+    # looks like we need to stop from any existing transaction to really prevent
+    # it from starting
+    systemctl stop hostlogger@*.service
+}
+
+function recover_hostlogger_in_bm_mode() {
+    systemd_etc_dir='/etc/systemd/system'
+
+    mkdir -p ${systemd_etc_dir}/multi-user.target.wants
+
+    cp -P  ${systemd_etc_dir}/gbmc-bare-metal-active.target.wants/hostlogger@*.service \
+      ${systemd_etc_dir}/multi-user.target.wants/ 2> /dev/null
+
+    rm ${systemd_etc_dir}/gbmc-bare-metal-active.target.wants/hostlogger@*.service 2> /dev/null
+}
+
 function hide_boot_drive_in_bm_mode() {
     # In Bare Metal mode, power off the boot drive
     if [[ "$BM_MODE" -eq "1" || -f "$ENABLE_BM_FILE" ]]; then
@@ -63,6 +106,7 @@
         # Change the host console to read only, unless we require to keep the
         # console
         if [[ ! -f "$ENABLE_CONSOLE_FILE" ]]; then
+            override_hostlogger_in_bm_mode
             override_obmc_console_in_bm_mode
         fi
 
@@ -71,6 +115,7 @@
     else
         # Mask services that could disable ipmi
         ln -s /dev/null /run/systemd/system/host-gpio-monitor.service 2> /dev/null
+        recover_hostlogger_in_bm_mode
         systemctl daemon-reload
 
         # Turn on the power to the boot drive