diff --git a/patcher/META-INF/com/google/android/update-binary b/patcher/META-INF/com/google/android/update-binary
index f02cae9..9b110ee 100644
--- a/patcher/META-INF/com/google/android/update-binary
+++ b/patcher/META-INF/com/google/android/update-binary
@@ -54,6 +54,8 @@ if ! ${BOOTMODE} ; then
 	umount -l /system 2>/dev/null
 	umount -l /vendor 2>/dev/null
 	umount -l /dev/random 2>/dev/null
+	umount -l /apex/com.android.runtime 2>/dev/null
+	losetup -d ${APEX_LOOP} 2>/dev/null
 fi
 
 ui_print " "
diff --git a/systest/META-INF/com/google/android/update-binary b/systest/META-INF/com/google/android/update-binary
index a138c59..20b4bd4 100644
--- a/systest/META-INF/com/google/android/update-binary
+++ b/systest/META-INF/com/google/android/update-binary
@@ -34,6 +34,8 @@ if ! ${BOOTMODE} ; then
 	umount -l /system 2>/dev/null
 	umount -l /vendor 2>/dev/null
 	umount -l /dev/random 2>/dev/null
+	umount -l /apex/com.android.runtime 2>/dev/null
+	losetup -d ${APEX_LOOP} 2>/dev/null
 fi
 
 ui_print " > Done!"
diff --git a/uninstaller/META-INF/com/google/android/update-binary b/uninstaller/META-INF/com/google/android/update-binary
index f490065..102c570 100644
--- a/uninstaller/META-INF/com/google/android/update-binary
+++ b/uninstaller/META-INF/com/google/android/update-binary
@@ -350,7 +350,10 @@ done
 
 ui_print " >> clean up"
 
-umount /system
+umount -l /system_root 2>/dev/null
+umount -l /system 2>/dev/null
+umount -l /apex/com.android.runtime 2>/dev/null
+losetup -d ${APEX_LOOP} 2>/dev/null
 
 ui_print " "
 ui_print " > Done!"