diff --git a/scripts/devtool b/scripts/devtool
index 557a83013a..5d37d3b4a4 100755
--- a/scripts/devtool
+++ b/scripts/devtool
@@ -244,8 +244,7 @@ def main():
                  tinfoil.config_data.getVar('BBPATH', True).split(':')):
         pluginpath = os.path.join(path, 'lib', 'devtool')
         scriptutils.load_plugins(logger, plugins, pluginpath)
-    tinfoil.cooker.shutdown(force=True)
-    tinfoil.cooker.unlockBitbake()
+    tinfoil.shutdown()
 
     subparsers = parser.add_subparsers(dest="subparser_name", title='subcommands', metavar='<subcommand>')