diff --git a/concourse/pipelines/gpdb_master-generated.yml b/concourse/pipelines/gpdb_master-generated.yml
index 927233496aa5186fe8ec35c15099be30a3c83950..2965ff9cdbca3c83ff9ffca6ce92ce554b1e5d3d 100644
--- a/concourse/pipelines/gpdb_master-generated.yml
+++ b/concourse/pipelines/gpdb_master-generated.yml
@@ -12,7 +12,7 @@
 ## file (example: templates/gpdb-tpl.yml) and regenerate the pipeline
 ## using appropriate tool (example: gen_pipeline.py -t prod).
 ## ----------------------------------------------------------------------
-## Generated by gen_pipeline.py at: 2018-03-20 15:41:35.204927
+## Generated by gen_pipeline.py at: 2018-03-21 13:16:56.391760
 ## Template file: gpdb-tpl.yml
 ## OS Types: ['centos6', 'centos7', 'sles', 'aix7', 'win', 'ubuntu16']
 ## Test Sections: ['ICW', 'CS', 'MPP', 'MM', 'DPM', 'UD']
@@ -48,13 +48,14 @@ groups:
   - icw_planner_centos6
   - icw_planner_ictcp_centos6
   - QP_memory-accounting
-  - icw_extensions_gpcloud
+  - icw_extensions_gpcloud_centos6
   - icw_gporca_centos7
   - icw_gporca_sles11
   - icw_gporca_sles12
   - icw_planner_sles12
   - icw_planner_ubuntu16
   - icw_gporca_conan_ubuntu16
+  - icw_extensions_gpcloud_ubuntu16
   - test_gpdb_debian_package
   - gate_icw_end
   ## --------------------------------------------------------------------
@@ -127,7 +128,7 @@ groups:
   - icw_planner_centos6
   - icw_planner_ictcp_centos6
   - QP_memory-accounting
-  - icw_extensions_gpcloud
+  - icw_extensions_gpcloud_centos6
   - icw_gporca_centos7
   - icw_planner_ubuntu16
   - icw_gporca_conan_ubuntu16
@@ -135,6 +136,7 @@ groups:
   - icw_gporca_sles12
   - icw_planner_sles12
   - test_gpdb_debian_package
+  - icw_extensions_gpcloud_ubuntu16
   - gate_icw_end
 
 ## ======================================================================
@@ -1254,18 +1256,15 @@ jobs:
     params:
       DEBIAN_PACKAGE: {{deb_package_ubuntu16_versioned_file}}
 
-- name: icw_extensions_gpcloud
+- name: icw_extensions_gpcloud_centos6
   plan:
   - aggregate:
     - get: gpdb_src
-      passed: [compile_gpdb_centos6, compile_gpdb_ubuntu16]
+      passed: [compile_gpdb_centos6]
       trigger: true
     - get: bin_gpdb_centos6
       passed: [compile_gpdb_centos6]
     - get: centos-gpdb-dev-6
-    - get: compiled_bits_ubuntu16
-      passed: [compile_gpdb_ubuntu16]
-    - get: ubuntu-gpdb-dev-16
   - aggregate:
     - task: unit_tests_gpcloud
       file: gpdb_src/concourse/tasks/unit_tests_gpcloud.yml
@@ -1290,6 +1289,17 @@ jobs:
         gpcloud_access_key_id: {{gpcloud-access-key-id}}
         gpcloud_secret_access_key: {{gpcloud-secret-access-key}}
         TARGET_OS: centos
+
+- name: icw_extensions_gpcloud_ubuntu16
+  plan:
+  - aggregate:
+    - get: gpdb_src
+      passed: [compile_gpdb_ubuntu16]
+      trigger: true
+    - get: compiled_bits_ubuntu16
+      passed: [compile_gpdb_ubuntu16]
+    - get: ubuntu-gpdb-dev-16
+  - aggregate:
     - task: regression_tests_gpcloud_ubuntu
       input_mapping:
         bin_gpdb: compiled_bits_ubuntu16
@@ -1310,7 +1320,7 @@ jobs:
       - icw_planner_centos6
       - icw_planner_ictcp_centos6
       - QP_memory-accounting
-      - icw_extensions_gpcloud
+      - icw_extensions_gpcloud_centos6
     - get: gpdb_src
       passed:
       - icw_gporca_centos6
@@ -1318,7 +1328,8 @@ jobs:
       - icw_planner_centos6
       - icw_planner_ictcp_centos6
       - QP_memory-accounting
-      - icw_extensions_gpcloud
+      - icw_extensions_gpcloud_centos6
+      - icw_extensions_gpcloud_ubuntu16
       - icw_gporca_centos7
       - icw_planner_ubuntu16
       - icw_gporca_conan_ubuntu16
@@ -2386,7 +2397,8 @@ jobs:
     - icw_gporca_conan_ubuntu16
     - test_gpdb_debian_package
     - icw_planner_ictcp_centos6
-    - icw_extensions_gpcloud
+    - icw_extensions_gpcloud_centos6
+    - icw_extensions_gpcloud_ubuntu16
     - client_loader_remote_test_aix
     - mpp_resource_group_centos6
     - mpp_resource_group_centos7
diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml
index f18866c6c3cbde242c4da4a229dc0b920fbdc779..2659661450bf6799dbf0214d29a5a4a7a7fe6902 100644
--- a/concourse/pipelines/templates/gpdb-tpl.yml
+++ b/concourse/pipelines/templates/gpdb-tpl.yml
@@ -56,9 +56,7 @@ groups:
   - icw_planner_centos6
   - icw_planner_ictcp_centos6
   - QP_memory-accounting
-{% endif %}
-{% if 'centos6' in os_types or 'ubuntu16' in os_types %}
-  - icw_extensions_gpcloud
+  - icw_extensions_gpcloud_centos6
 {% endif %}
 {% if "centos7" in os_types %}
   - icw_gporca_centos7
@@ -71,6 +69,7 @@ groups:
 {% if "ubuntu16" in os_types %}
   - icw_planner_ubuntu16
   - icw_gporca_conan_ubuntu16
+  - icw_extensions_gpcloud_ubuntu16
 {% endif %}
 {% if "ubuntu16" in os_types %}
   - test_gpdb_debian_package
@@ -175,9 +174,7 @@ groups:
   - icw_planner_centos6
   - icw_planner_ictcp_centos6
   - QP_memory-accounting
-{% endif %}
-{% if 'centos6' in os_types or 'ubuntu16' in os_types %}
-  - icw_extensions_gpcloud
+  - icw_extensions_gpcloud_centos6
 {% endif %}
 {% if "centos7" in os_types %}
   - icw_gporca_centos7
@@ -193,6 +190,7 @@ groups:
 {% endif %}
 {% if "ubuntu16" in os_types %}
   - test_gpdb_debian_package
+  - icw_extensions_gpcloud_ubuntu16
 {% endif %}
   - gate_icw_end
 
@@ -1424,27 +1422,17 @@ jobs:
       DEBIAN_PACKAGE: {{deb_package_ubuntu16_versioned_file}}
 
 {% endif %}
-{% if 'centos6' in os_types or 'ubuntu16' in os_types %}
-- name: icw_extensions_gpcloud
+{% if 'centos6' in os_types%}
+- name: icw_extensions_gpcloud_centos6
   plan:
   - aggregate:
     - get: gpdb_src
-      passed: [compile_gpdb_centos6, compile_gpdb_ubuntu16]
+      passed: [compile_gpdb_centos6]
       trigger: [[ test_trigger ]]
-{% if "centos6" in os_types %}
     - get: bin_gpdb_centos6
       passed: [compile_gpdb_centos6]
     - get: centos-gpdb-dev-6
-{% endif %}
-{% if "ubuntu16" in os_types %}
-    - get: compiled_bits_ubuntu16
-      passed: [compile_gpdb_ubuntu16]
-{% endif %}
-{% if "ubuntu16" in os_types %}
-    - get: ubuntu-gpdb-dev-16
-{% endif %}
   - aggregate:
-{% if "centos6" in os_types %}
     - task: unit_tests_gpcloud
       file: gpdb_src/concourse/tasks/unit_tests_gpcloud.yml
       image: centos-gpdb-dev-6
@@ -1469,7 +1457,18 @@ jobs:
         gpcloud_secret_access_key: {{gpcloud-secret-access-key}}
         TARGET_OS: centos
 {% endif %}
-{% if "ubuntu16" in os_types %}
+
+{% if 'ubuntu16' in os_types %}
+- name: icw_extensions_gpcloud_ubuntu16
+  plan:
+  - aggregate:
+    - get: gpdb_src
+      passed: [compile_gpdb_ubuntu16]
+      trigger: [[ test_trigger ]]
+    - get: compiled_bits_ubuntu16
+      passed: [compile_gpdb_ubuntu16]
+    - get: ubuntu-gpdb-dev-16
+  - aggregate:
     - task: regression_tests_gpcloud_ubuntu
       input_mapping:
         bin_gpdb: compiled_bits_ubuntu16
@@ -1481,7 +1480,6 @@ jobs:
         TARGET_OS: ubuntu
 {% endif %}
 
-{% endif %}
 - name: gate_icw_end
   plan:
   - aggregate:
@@ -1493,7 +1491,7 @@ jobs:
       - icw_planner_centos6
       - icw_planner_ictcp_centos6
       - QP_memory-accounting
-      - icw_extensions_gpcloud
+      - icw_extensions_gpcloud_centos6
 {% endif %}
     - get: gpdb_src
       passed:
@@ -1503,9 +1501,10 @@ jobs:
       - icw_planner_centos6
       - icw_planner_ictcp_centos6
       - QP_memory-accounting
+      - icw_extensions_gpcloud_centos6
 {% endif %}
-{% if 'centos6' in os_types or 'ubuntu16' in os_types %}
-      - icw_extensions_gpcloud
+{% if 'ubuntu16' in os_types %}
+      - icw_extensions_gpcloud_ubuntu16
 {% endif %}
 {% if "centos7" in os_types %}
       - icw_gporca_centos7
@@ -2484,7 +2483,8 @@ jobs:
     - icw_gporca_conan_ubuntu16
     - test_gpdb_debian_package
     - icw_planner_ictcp_centos6
-    - icw_extensions_gpcloud
+    - icw_extensions_gpcloud_centos6
+    - icw_extensions_gpcloud_ubuntu16
     - client_loader_remote_test_aix
     - mpp_resource_group_centos6
     - mpp_resource_group_centos7