diff --git a/lib/Serverless.js b/lib/Serverless.js
index 8c2a3620e..4930aa5cb 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -288,7 +288,9 @@ class Serverless {
         }
       );
       resolveCliInput.clear();
-      const { options, isHelpRequest } = resolveCliInput(commandsSchema);
+      const { commands, options, isHelpRequest } = resolveCliInput(commandsSchema);
+      this.processedInput.commands = this.pluginManager.cliCommands = commands;
+      this.processedInput.options = this.pluginManager.cliOptions = options;
       if (options.version) {
         require('./cli/render-version')();
         return;