diff --git a/concourse/pipelines/5X_STABLE-generated.yml b/concourse/pipelines/5X_STABLE-generated.yml
index 2139704a67ab61c0fa83bbfe82d1b6dc33fb0782..5671ecca7a43217dd45dca1954298fa39e0bd169 100644
--- a/concourse/pipelines/5X_STABLE-generated.yml
+++ b/concourse/pipelines/5X_STABLE-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: 2019-01-09 16:42:19.516712
+## Generated by gen_pipeline.py at: 2019-03-08 14:53:03.819738
 ## Template file: gpdb-tpl.yml
 ## OS Types: ['centos6', 'centos7', 'sles', 'aix7', 'win', 'ubuntu16']
 ## Test Sections: ['ICW', 'CS', 'MPP', 'MM', 'DPM', 'UD', 'FileRep', 'AA']
@@ -120,6 +120,8 @@ groups:
   - gate_ud_end
   ## --------------------------------------------------------------------
   - gate_advanced_analytics_start
+  - postgis_build_centos6
+  - postgis_build_centos7
   - MADlib_Test_Planner_centos6
   - Postgis_Test_Planner_centos6
   - MADlib_Test_Orca_centos6
@@ -257,6 +259,8 @@ groups:
 - name: G:AdvancedAnalytics
   jobs:
   - gate_advanced_analytics_start
+  - postgis_build_centos6
+  - postgis_build_centos7
   - MADlib_Test_Planner_centos6
   - Postgis_Test_Planner_centos6
   - MADlib_Test_Orca_centos6
@@ -731,6 +735,7 @@ resources:
   type: git
   source:
     branch: master
+    tag_filter: rel/v2.1.5+pivotal.2
     uri: https://github.com/greenplum-db/geospatial.git
 
 - name: postgis_gppkg_centos6
@@ -3825,6 +3830,65 @@ jobs:
       passed:
       - gate_compile_end
 
+- name: postgis_build_centos6
+  plan:
+  - aggregate:
+    - get: postgis_src
+    - get: madlib_ci
+    - get: gpdb_src
+      passed:
+      - gate_advanced_analytics_start
+    - get: bin_gpdb
+      resource: bin_gpdb_centos6
+      trigger: true
+      passed:
+      - gate_advanced_analytics_start
+    - get: centos-gpdb-dev-6
+    - get: gcc_4.4.2_snowflake
+  - aggregate:
+    - task: postgis_gpdb_build
+      file: madlib_ci/concourse/tasks/build_postgis.yml
+      image: centos-gpdb-dev-6
+      params:
+        TEST_OS: centos6
+        IVYREPO_HOST: {{ivyrepo_host}}
+        IVYREPO_REALM: {{ivyrepo_realm}}
+        IVYREPO_USER: {{ivyrepo_user}}
+        IVYREPO_PASSWD: {{ivyrepo_passwd}}
+  - aggregate:
+    - put: postgis_gppkg_centos6
+      params:
+        file: postgis_gppkg/postgis-*.gppkg
+- name: postgis_build_centos7
+  plan:
+  - aggregate:
+    - get: postgis_src
+    - get: madlib_ci
+    - get: gpdb_src
+      passed:
+      - gate_advanced_analytics_start
+    - get: bin_gpdb
+      resource: bin_gpdb_centos7
+      trigger: true
+      passed:
+      - gate_advanced_analytics_start
+    - get: centos-gpdb-dev-7
+    - get: gcc_4.4.2_snowflake
+  - aggregate:
+    - task: postgis_gpdb_build
+      file: madlib_ci/concourse/tasks/build_postgis.yml
+      image: centos-gpdb-dev-7
+      params:
+        TEST_OS: centos7
+        IVYREPO_HOST: {{ivyrepo_host}}
+        IVYREPO_REALM: {{ivyrepo_realm}}
+        IVYREPO_USER: {{ivyrepo_user}}
+        IVYREPO_PASSWD: {{ivyrepo_passwd}}
+  - aggregate:
+    - put: postgis_gppkg_centos7
+      params:
+        file: postgis_gppkg/postgis-*.gppkg
+
 - name: MADlib_Test_Planner_centos6
   plan:
   - aggregate:
@@ -3851,18 +3915,22 @@ jobs:
   - aggregate:
     - get: madlib_ci
     - get: postgis_src
+      passed:
+      - postgis_build_centos6
     - get: postgis_gppkg
       resource: postgis_gppkg_centos6
       trigger: true
+      passed:
+      - postgis_build_centos6
     - get: bin_gpdb
       resource: bin_gpdb_centos6
       trigger: true
       passed:
-      - gate_advanced_analytics_start
+      - postgis_build_centos6
     - get: centos-gpdb-dev-6
     - get: gpdb_src
       passed:
-      - gate_advanced_analytics_start
+      - postgis_build_centos6
     - get: gcc_4.4.2_snowflake
   - task: test_postgis
     file: madlib_ci/concourse/tasks/test_postgis.yml
@@ -3901,18 +3969,22 @@ jobs:
   - aggregate:
     - get: madlib_ci
     - get: postgis_src
+      passed:
+      - postgis_build_centos6
     - get: postgis_gppkg
       resource: postgis_gppkg_centos6
       trigger: true
+      passed:
+      - postgis_build_centos6
     - get: bin_gpdb
       resource: bin_gpdb_centos6
       trigger: true
       passed:
-      - gate_advanced_analytics_start
+      - postgis_build_centos6
     - get: centos-gpdb-dev-6
     - get: gpdb_src
       passed:
-      - gate_advanced_analytics_start
+      - postgis_build_centos6
     - get: gcc_4.4.2_snowflake
   - task: test_postgis
     file: madlib_ci/concourse/tasks/test_postgis.yml
@@ -3951,18 +4023,22 @@ jobs:
   - aggregate:
     - get: madlib_ci
     - get: postgis_src
+      passed:
+      - postgis_build_centos7
     - get: postgis_gppkg
       resource: postgis_gppkg_centos7
       trigger: true
+      passed:
+      - postgis_build_centos7
     - get: bin_gpdb
       resource: bin_gpdb_centos7
       trigger: true
       passed:
-      - gate_advanced_analytics_start
+      - postgis_build_centos7
     - get: centos-gpdb-dev-7
     - get: gpdb_src
       passed:
-      - gate_advanced_analytics_start
+      - postgis_build_centos7
     - get: gcc_4.4.2_snowflake
   - task: test_postgis
     file: madlib_ci/concourse/tasks/test_postgis.yml
@@ -4001,18 +4077,22 @@ jobs:
   - aggregate:
     - get: madlib_ci
     - get: postgis_src
+      passed:
+      - postgis_build_centos7
     - get: postgis_gppkg
       resource: postgis_gppkg_centos7
       trigger: true
+      passed:
+      - postgis_build_centos7
     - get: bin_gpdb
       resource: bin_gpdb_centos7
       trigger: true
       passed:
-      - gate_advanced_analytics_start
+      - postgis_build_centos7
     - get: centos-gpdb-dev-7
     - get: gpdb_src
       passed:
-      - gate_advanced_analytics_start
+      - postgis_build_centos7
     - get: gcc_4.4.2_snowflake
   - task: test_postgis
     file: madlib_ci/concourse/tasks/test_postgis.yml
@@ -4327,6 +4407,8 @@ jobs:
       - gptransfer-5x-to-5x
       - mpp_interconnect
       - QP_optimizer-functional
+      - postgis_build_centos6
+      - postgis_build_centos7
       - MADlib_Test_Planner_centos6
       - Postgis_Test_Planner_centos6
       - MADlib_Test_Orca_centos6
diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml
index b2860d94aec672ce32b25fa86acaa1ced6cb5f39..55dfb1106139f3962b988ce5ea4976573fa09717 100644
--- a/concourse/pipelines/templates/gpdb-tpl.yml
+++ b/concourse/pipelines/templates/gpdb-tpl.yml
@@ -26,7 +26,10 @@
 {% set aa_Test_suites = ['Planner_centos6',
                          'Orca_centos6',
                          'Planner_centos7',
-                         'Orca_centos7',
+                         'Orca_centos7'
+                        ] %}
+{% set postgis_build_platforms = ['centos6',
+                         'centos7'
                         ] %}
 ## ======================================================================
 ##   __ _ _ __ ___  _   _ _ __  ___
@@ -132,6 +135,9 @@ groups:
 {% if "AA" in test_sections %}
   ## --------------------------------------------------------------------
   - gate_advanced_analytics_start
+{% for platform in postgis_build_platforms %}
+  - postgis_build_[[ platform ]]
+{% endfor %}
 {% for test_name in aa_Test_suites %}
 {% set platform_version = '7' if "centos7" in test_name else '6' %}
 {% set orca_state = 'off' if "Planner" in test_name else 'on' %}
@@ -271,6 +277,9 @@ groups:
 - name: G:AdvancedAnalytics
   jobs:
   - gate_advanced_analytics_start
+{% for platform in postgis_build_platforms %}
+  - postgis_build_[[ platform ]]
+{% endfor %}
 {% for test_name in aa_Test_suites %}
 {% set platform_version = '7' if "centos7" in test_name else '6' %}
 {% set orca_state = 'off' if "Planner" in test_name else 'on' %}
@@ -763,6 +772,7 @@ resources:
   type: git
   source:
     branch: master
+    tag_filter: rel/v2.1.5+pivotal.2
     uri: https://github.com/greenplum-db/geospatial.git
 
 - name: postgis_gppkg_centos6
@@ -3468,6 +3478,39 @@ jobs:
       passed:
       - gate_compile_end
 
+{% for platform in postgis_build_platforms %}
+{% set platform_version = '7' if "centos7" in platform else '6' %}
+- name: postgis_build_[[ platform ]]
+  plan:
+  - aggregate:
+    - get: postgis_src
+    - get: madlib_ci
+    - get: gpdb_src
+      passed:
+      - gate_advanced_analytics_start
+    - get: bin_gpdb
+      resource: bin_gpdb_[[ platform ]]
+      trigger: [[ test_trigger ]]
+      passed:
+      - gate_advanced_analytics_start
+    - get: centos-gpdb-dev-[[ platform_version ]]
+    - get: gcc_4.4.2_snowflake
+  - aggregate:
+    - task: postgis_gpdb_build
+      file: madlib_ci/concourse/tasks/build_postgis.yml
+      image: centos-gpdb-dev-[[ platform_version ]]
+      params:
+        TEST_OS: [[ platform ]]
+        IVYREPO_HOST: {{ivyrepo_host}}
+        IVYREPO_REALM: {{ivyrepo_realm}}
+        IVYREPO_USER: {{ivyrepo_user}}
+        IVYREPO_PASSWD: {{ivyrepo_passwd}}
+  - aggregate:
+    - put: postgis_gppkg_[[ platform ]]
+      params:
+        file: postgis_gppkg/postgis-*.gppkg
+{% endfor %}
+
 {% for test_name in aa_Test_suites %}
 {% set platform_version = '7' if "centos7" in test_name else '6' %}
 {% set orca_state = 'off' if "Planner" in test_name else 'on' %}
@@ -3497,18 +3540,22 @@ jobs:
   - aggregate:
     - get: madlib_ci
     - get: postgis_src
+      passed:
+      - postgis_build_centos[[ platform_version ]]
     - get: postgis_gppkg
       resource: postgis_gppkg_centos[[ platform_version ]]
       trigger: [[ test_trigger ]]
+      passed:
+      - postgis_build_centos[[ platform_version ]]
     - get: bin_gpdb
       resource: bin_gpdb_centos[[ platform_version ]]
       trigger: [[ test_trigger ]]
       passed:
-      - gate_advanced_analytics_start
+      - postgis_build_centos[[ platform_version ]]
     - get: centos-gpdb-dev-[[ platform_version ]]
     - get: gpdb_src
       passed:
-      - gate_advanced_analytics_start
+      - postgis_build_centos[[ platform_version ]]
     - get: gcc_4.4.2_snowflake
   - task: test_postgis
     file: madlib_ci/concourse/tasks/test_postgis.yml
@@ -3715,6 +3762,9 @@ jobs:
       - gptransfer-5x-to-5x
       - mpp_interconnect
       - QP_optimizer-functional
+{% for platform in postgis_build_platforms %}
+      - postgis_build_[[ platform ]]
+{% endfor %}
 {% for test_name in aa_Test_suites %}
 {% set platform_version = '7' if "centos7" in test_name else '6' %}
 {% set orca_state = 'off' if "Planner" in test_name else 'on' %}