diff --git a/jjb/helm.yaml b/jjb/helm.yaml
index a72eb11..dbb08e3 100644
--- a/jjb/helm.yaml
+++ b/jjb/helm.yaml
@@ -38,10 +38,10 @@
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
-          refspec: 'refs/heads/$GERRIT_BRANCH'
+          refspec: ''
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
-          choosing-strategy: gerrit
+          choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     node: '{build-node}'
@@ -51,6 +51,7 @@
     builders:
       - shell: |
           helm init --client-only
+          helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/
           ./scripts/helmrepo.sh
 
 # publish over ssh: https://docs.openstack.org/infra/jenkins-job-builder/publishers.html#publishers.ssh
@@ -59,5 +60,5 @@
           site: 'CORD Wiki'
           source: 'chart_repo/**'
           remove-prefix: 'chart_repo'
-          target: '//var/www/guide/charts/$GERRIT_BRANCH/'
+          target: '//var/www/guide/charts/$GERRIT_BRANCH'
 
diff --git a/jjb/sonar.yaml b/jjb/sonar.yaml
index 97d241c..344a1c2 100644
--- a/jjb/sonar.yaml
+++ b/jjb/sonar.yaml
@@ -57,10 +57,10 @@
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
+          refspec: ''
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
-          choosing-strategy: gerrit
+          choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     node: 'ubuntu16.04-basebuild-1c-2g'
@@ -101,7 +101,7 @@
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
-          refspec: 'refs/heads/$GERRIT_BRANCH'
+          refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
           choosing-strategy: gerrit