diff --git a/modules/planning/common/planning_gflags.cc b/modules/planning/common/planning_gflags.cc
index d01b9eb8d84d10f3b340d9029a79f713dfaca3d3..e2272f2a58cbd8f61dd9871a25b46c3f77dfd531 100644
--- a/modules/planning/common/planning_gflags.cc
+++ b/modules/planning/common/planning_gflags.cc
@@ -39,6 +39,10 @@ DEFINE_string(scenario_narrow_street_u_turn_config_file,
               "/apollo/modules/planning/conf/"
               "scenario/narrow_street_u_turn_config.pb.txt",
               "narrow_street_u_turn scenario config file");
+DEFINE_string(scenario_park_and_go_config_file,
+              "/apollo/modules/planning/conf/"
+              "scenario/park_and_go_config.pb.txt",
+              "park_and_go scenario config file");
 DEFINE_string(scenario_pull_over_config_file,
               "/apollo/modules/planning/conf/"
               "scenario/pull_over_config.pb.txt",
@@ -63,14 +67,13 @@ DEFINE_string(scenario_valet_parking_config_file,
               "/apollo/modules/planning/conf/"
               "scenario/valet_parking_config.pb.txt",
               "valet_parking scenario config file");
-DEFINE_string(scenario_park_and_go_config_file,
-              "/apollo/modules/planning/conf/"
-              "scenario/park_and_go_config.pb.txt",
-              "park_and_go scenario config file");
 
 DEFINE_bool(enable_scenario_bare_intersection, false,
             "enable bare_intersection scenarios in planning");
 
+DEFINE_bool(enable_scenario_park_and_go, false,
+            "enable park-and-go scenario in planning");
+
 DEFINE_bool(enable_scenario_pull_over, false,
             "enable pull-over scenario in planning");
 
@@ -90,8 +93,6 @@ DEFINE_bool(enable_scenario_traffic_light, true,
 DEFINE_bool(enable_force_pull_over_open_space_parking_test, false,
             "enable force_pull_over_open_space_parking_test");
 
-DEFINE_bool(enable_scenario_park_and_go, false,
-            "enable park-and-go scenario in planning");
 
 DEFINE_string(traffic_rule_config_filename,
               "/apollo/modules/planning/conf/traffic_rule_config.pb.txt",
diff --git a/modules/planning/common/planning_gflags.h b/modules/planning/common/planning_gflags.h
index 788f38b1649b8f2f2f2db63ddf572387492ef062..41cc3c5f646fa8c7687eeed921130cccaca03441 100644
--- a/modules/planning/common/planning_gflags.h
+++ b/modules/planning/common/planning_gflags.h
@@ -27,9 +27,9 @@ DECLARE_string(planning_config_file);
 DECLARE_string(scenario_bare_intersection_unprotected_config_file);
 DECLARE_string(scenario_lane_follow_config_file);
 DECLARE_string(scenario_narrow_street_u_turn_config_file);
+DECLARE_string(scenario_park_and_go_config_file);
 DECLARE_string(scenario_pull_over_config_file);
 DECLARE_string(scenario_stop_sign_unprotected_config_file);
-DECLARE_string(scenario_park_and_go_config_file);
 DECLARE_string(scenario_traffic_light_protected_config_file);
 DECLARE_string(scenario_traffic_light_unprotected_left_turn_config_file);
 DECLARE_string(scenario_traffic_light_unprotected_right_turn_config_file);
diff --git a/modules/planning/scenarios/BUILD b/modules/planning/scenarios/BUILD
index b3d85d3ae8d8f8a45fadba7ebcaa1a4590d9a3ab..337280e871a5b7a0ddfbb03141f8d34c8a897304 100644
--- a/modules/planning/scenarios/BUILD
+++ b/modules/planning/scenarios/BUILD
@@ -71,6 +71,7 @@ cc_library(
         "//modules/planning/common/util:util_lib",
         "//modules/planning/scenarios/bare_intersection/unprotected:bare_intersection_unprotected_scenario",
         "//modules/planning/scenarios/lane_follow",
+        "//modules/planning/scenarios/park_and_go:park_and_go_scenario",        
         "//modules/planning/scenarios/park/pull_over:pull_over_scenario",
         "//modules/planning/scenarios/park/valet_parking",
         "//modules/planning/scenarios/stop_sign/unprotected:stop_sign_unprotected_scenario",
diff --git a/modules/planning/scenarios/park_and_go/BUILD b/modules/planning/scenarios/park_and_go/BUILD
index 55226a1f3eb79a9c0d7f4674baa2b21adc09374f..ca6069976fe9355a144115788da5a3aed8429f84 100644
--- a/modules/planning/scenarios/park_and_go/BUILD
+++ b/modules/planning/scenarios/park_and_go/BUILD
@@ -2,14 +2,6 @@ load("//tools:cpplint.bzl", "cpplint")
 
 package(default_visibility = ["//visibility:public"])
 
-cc_library(
-    name = "park_and_go",
-    copts = ["-DMODULE_NAME=\\\"planning\\\""],
-    deps = [
-        ":park_and_go_scenario",
-    ],
-)
-
 cc_library(
     name = "park_and_go_scenario",
     srcs = [
@@ -46,7 +38,7 @@ cc_test(
         "//modules/planning:planning_conf",
     ],
     deps = [
-        ":park_and_go",
+        ":park_and_go_scenario",
         "@gtest//:main",
     ],
 )
@@ -61,7 +53,7 @@ cc_test(
         "//modules/planning:planning_conf",
     ],
     deps = [
-        ":park_and_go",
+        ":park_and_go_scenario",
         "@gtest//:main",
     ],
 )
diff --git a/modules/planning/scenarios/scenario_manager.cc b/modules/planning/scenarios/scenario_manager.cc
index 62245ba4a139f9bb0377e89ceadb2657e2cf3272..2b88f2c7cbb70209691928fb2a3a36285e5957bc 100644
--- a/modules/planning/scenarios/scenario_manager.cc
+++ b/modules/planning/scenarios/scenario_manager.cc
@@ -29,6 +29,7 @@
 #include "modules/planning/common/util/util.h"
 #include "modules/planning/scenarios/bare_intersection/unprotected/bare_intersection_unprotected_scenario.h"
 #include "modules/planning/scenarios/lane_follow/lane_follow_scenario.h"
+#include "modules/planning/scenarios/park_and_go/park_and_go_scenario.h"
 #include "modules/planning/scenarios/park/pull_over/pull_over_scenario.h"
 #include "modules/planning/scenarios/park/valet_parking/valet_parking_scenario.h"
 #include "modules/planning/scenarios/stop_sign/unprotected/stop_sign_unprotected_scenario.h"
@@ -58,15 +59,23 @@ std::unique_ptr<Scenario> ScenarioManager::CreateScenario(
   std::unique_ptr<Scenario> ptr;
 
   switch (scenario_type) {
-    case ScenarioConfig::LANE_FOLLOW:
-      ptr.reset(new lane_follow::LaneFollowScenario(config_map_[scenario_type],
-                                                    &scenario_context_));
-      break;
     case ScenarioConfig::BARE_INTERSECTION_UNPROTECTED:
       ptr.reset(
           new scenario::bare_intersection::BareIntersectionUnprotectedScenario(
               config_map_[scenario_type], &scenario_context_));
       break;
+    case ScenarioConfig::LANE_FOLLOW:
+      ptr.reset(new lane_follow::LaneFollowScenario(config_map_[scenario_type],
+                                                    &scenario_context_));
+      break;
+    case ScenarioConfig::PARK_AND_GO:
+      ptr.reset(new scenario::park_and_go::ParkAndGoScenario(
+          config_map_[scenario_type], &scenario_context_));
+      break;
+    case ScenarioConfig::PULL_OVER:
+      ptr.reset(new scenario::pull_over::PullOverScenario(
+          config_map_[scenario_type], &scenario_context_));
+      break;
     case ScenarioConfig::STOP_SIGN_UNPROTECTED:
       ptr.reset(new scenario::stop_sign::StopSignUnprotectedScenario(
           config_map_[scenario_type], &scenario_context_));
@@ -85,10 +94,6 @@ std::unique_ptr<Scenario> ScenarioManager::CreateScenario(
           new scenario::traffic_light::TrafficLightUnprotectedRightTurnScenario(
               config_map_[scenario_type], &scenario_context_));
       break;
-    case ScenarioConfig::PULL_OVER:
-      ptr.reset(new scenario::pull_over::PullOverScenario(
-          config_map_[scenario_type], &scenario_context_));
-      break;
     case ScenarioConfig::VALET_PARKING:
       ptr.reset(new scenario::valet_parking::ValetParkingScenario(
           config_map_[scenario_type], &scenario_context_));
@@ -113,6 +118,14 @@ void ScenarioManager::RegisterScenarios() {
       FLAGS_scenario_bare_intersection_unprotected_config_file,
       &config_map_[ScenarioConfig::BARE_INTERSECTION_UNPROTECTED]));
 
+  // park_and_go
+  CHECK(Scenario::LoadConfig(FLAGS_scenario_park_and_go_config_file,
+                             &config_map_[ScenarioConfig::PARK_AND_GO]));
+
+  // pull_over
+  CHECK(Scenario::LoadConfig(FLAGS_scenario_pull_over_config_file,
+                             &config_map_[ScenarioConfig::PULL_OVER]));
+
   // stop_sign
   CHECK(Scenario::LoadConfig(
       FLAGS_scenario_stop_sign_unprotected_config_file,
@@ -129,10 +142,6 @@ void ScenarioManager::RegisterScenarios() {
       FLAGS_scenario_traffic_light_unprotected_right_turn_config_file,
       &config_map_[ScenarioConfig::TRAFFIC_LIGHT_UNPROTECTED_RIGHT_TURN]));
 
-  // pull_over
-  CHECK(Scenario::LoadConfig(FLAGS_scenario_pull_over_config_file,
-                             &config_map_[ScenarioConfig::PULL_OVER]));
-
   // valet parking
   CHECK(Scenario::LoadConfig(FLAGS_scenario_valet_parking_config_file,
                              &config_map_[ScenarioConfig::VALET_PARKING]));