diff --git a/unstack.sh b/unstack.sh
index 2a0a40a..fd70916 100755
--- a/unstack.sh
+++ b/unstack.sh
@@ -25,6 +25,7 @@
 DATA_DIR=${DATA_DIR:-${DEST}/data}
 
 # Get project function libraries
+source $TOP_DIR/lib/baremetal
 source $TOP_DIR/lib/cinder
 source $TOP_DIR/lib/horizon
 source $TOP_DIR/lib/swift
@@ -67,6 +68,11 @@
     killall stud
 fi
 
+# baremetal might have created a fake environment
+if is_service_enabled baremetal && [[ "$BM_USE_FAKE_ENV" = "True" ]]; then
+    cleanup_fake_baremetal_env
+fi
+
 SCSI_PERSIST_DIR=$CINDER_STATE_PATH/volumes/*
 
 # Get the iSCSI volumes