diff --git a/packages/base/all/vendor-config-onl/src/python/onl/install/ShellApp.py b/packages/base/all/vendor-config-onl/src/python/onl/install/ShellApp.py
index 934d40a3..e3a5e505 100644
--- a/packages/base/all/vendor-config-onl/src/python/onl/install/ShellApp.py
+++ b/packages/base/all/vendor-config-onl/src/python/onl/install/ShellApp.py
@@ -189,11 +189,20 @@ class OnieBootContext:
 
     def shutdown(self):
         ctx, self.fctx = self.fctx, None
-        if ctx is not None: ctx.shutdown()
+        if ctx is not None:
+            ctx.shutdown()
+            ctx.attach()
+            ctx.shutdown()
         ctx, self.ictx = self.ictx, None
-        if ctx is not None: ctx.shutdown()
+        if ctx is not None:
+            ctx.shutdown()
+            ctx.attach()
+            ctx.shutdown()
         ctx, self.dctx = self.dctx, None
-        if ctx is not None: ctx.shutdown()
+        if ctx is not None:
+            ctx.shutdown()
+            ctx.attach()
+            ctx.shutdown()
 
     def __exit__(self, eType, eValue, eTrace):
         self.shutdown()