diff --git a/lib/cli/commands/command_exe.dart b/lib/cli/commands/command_exe.dart
index 2c3544f..69462db 100644
--- a/lib/cli/commands/command_exe.dart
+++ b/lib/cli/commands/command_exe.dart
@@ -19,10 +19,13 @@ class CommandExe extends CommandBase {
   @override
   Future execute(List<String> parameters) {
     for (var item in parameters) {
-      if (item == '-j') {
-        startJenkinsBuild(parameters.contains('-t'));
+      if (item.startsWith('-j')) {
+        Application.instance.build(BuildType.jenkins);
         break;
       }
+      if (item.startsWith('-t')) {
+        Application.instance.build(BuildType.test);
+      }
       if (item.startsWith('-f')) {
         startYaml(item.replaceFirst('-f', '').trimLeft());
         break;
@@ -31,10 +34,6 @@ class CommandExe extends CommandBase {
     return simpleFuture;
   }
 
-  void startJenkinsBuild(bool isTest) {
-    Application.instance.build(isTest ? BuildType.test : BuildType.jenkins);
-  }
-
   void startYaml(String target) {
     var file = File(target);
     if (file.existsSync()) {
diff --git a/lib/oto/application.dart b/lib/oto/application.dart
index 335756e..67036f3 100644
--- a/lib/oto/application.dart
+++ b/lib/oto/application.dart
@@ -65,8 +65,8 @@ class Application {
           printBuildStep('Jenkins Variables');
           print(jsonStr);
         }
-        buildMap = getMapFromYaml(await getBuildData());
         _jenkinsData = DataJenkins.fromJson(jenkinsMap!);
+        buildMap = getMapFromYaml(await getBuildData());
         break;
 
       case BuildType.file: