diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index f17d6a2..c28da3e 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -22,8 +22,8 @@
       - 'master':
           branch: 'master'
           mvn-params: '-P spring-boot-2-1'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
           mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 158df9b..1b27130 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -25,8 +25,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/babel'
     stream:
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-babel-settings'
diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index 039317c..76a2471 100644
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -19,8 +19,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/event-client'
     stream:
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-event-client-settings'
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 7a7b9cf..55df1c5 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -26,8 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
     files: '**'
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index a4fbaea..b5cf02f 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -19,8 +19,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/logging-service'
     stream:
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-logging-service-settings'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 0bb473b..4bf4846 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -25,8 +25,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/model-loader'
     stream:
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml
index e60cd01..97f0874 100644
--- a/jjb/aai/aai-oom.yaml
+++ b/jjb/aai/aai-oom.yaml
@@ -17,8 +17,8 @@
           post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: '**'
     stream:
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
 
     mvn-settings: 'aai-oom-settings'
     files: '**'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 77d07a3..0844a12 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -29,8 +29,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     files: '**'
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 76be4bf..d305f2f 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -19,8 +19,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/rest-client'
     stream:
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-rest-client-settings'
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index fddff15..d0b3cac 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -19,8 +19,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/router-core'
     stream:
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-router-core-settings'
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index bce2867..53db281 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -26,8 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'aai-schema-service-settings'
     mvn-version: 'mvn36'
     files: '**'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index f1f7772..ad5f1f5 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -25,8 +25,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/sparky-be'
     stream:
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 03fd1fa..036cb99 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -13,8 +13,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/sparky-fe'
     stream:
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-fe-settings'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 249c46b..3dc62c2 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -29,8 +29,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
     files: '**'
diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index 3f40d31..85b8afe 100644
--- a/jjb/aai/aai-validation.yaml
+++ b/jjb/aai/aai-validation.yaml
@@ -24,8 +24,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/validation'
     stream:
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-validation-settings'