diff --git a/jjb/charts.yaml b/jjb/charts.yaml
index b8c74a9..b250975 100644
--- a/jjb/charts.yaml
+++ b/jjb/charts.yaml
@@ -41,7 +41,7 @@
           refspec: ''
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
-          choosing-strategy: default
+          choosing-strategy: 'gerrit'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     node: '{build-node}'
diff --git a/jjb/siab-e2e.yaml b/jjb/siab-e2e.yaml
index ee8e720..6a902ec 100644
--- a/jjb/siab-e2e.yaml
+++ b/jjb/siab-e2e.yaml
@@ -36,7 +36,7 @@
           refspec: '{refspec}'
           branch: '{branch}'
           submodule-recursive: 'false'
-          choosing-strategy: default
+          choosing-strategy: 'gerrit'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           basedir: 'cord/automation-tools'
 
diff --git a/jjb/sonar.yaml b/jjb/sonar.yaml
index 205079e..6e66097 100644
--- a/jjb/sonar.yaml
+++ b/jjb/sonar.yaml
@@ -67,7 +67,7 @@
           refspec: ''
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
-          choosing-strategy: default
+          choosing-strategy: 'gerrit'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     node: 'ubuntu16.04-basebuild-1c-2g'
diff --git a/jjb/verify/abstract-olt.yaml b/jjb/verify/abstract-olt.yaml
index 880d49b..838322b 100644
--- a/jjb/verify/abstract-olt.yaml
+++ b/jjb/verify/abstract-olt.yaml
@@ -49,7 +49,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
-          choosing-strategy: default
+          choosing-strategy: 'gerrit'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           basedir: '{project}'
 
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index ff68b67..cc7a872 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -50,7 +50,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
-          choosing-strategy: default
+          choosing-strategy: 'gerrit'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           basedir: '{project}'