diff --git a/.gitmodules b/.gitmodules
index 4f67a38..c815615 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "jjb/global-jjb"]
-	path = jjb/global-jjb
+	path = global-jjb
 	url = https://github.com/lfit/releng-global-jjb.git
 [submodule "lf-ansible"]
 	path = lf-ansible
diff --git a/Makefile b/Makefile
index c096b44..15a66ee 100644
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,12 @@
 .PHONY: test clean
 
 VENV_DIR      ?= venv-jjb
-JJB_VERSION   ?= 2.0.5
+JJB_VERSION   ?= 3.2.0
 JOBCONFIG_DIR ?= job-configs
 
 $(VENV_DIR):
 	@echo "Setting up virtualenv for JJB testing"
-	virtualenv $@
+	virtualenv -p python3 $@
 	$@/bin/pip install jenkins-job-builder==$(JJB_VERSION) pipdeptree
 
 $(JOBCONFIG_DIR):
diff --git a/global-jjb b/global-jjb
new file mode 160000
index 0000000..ff33e05
--- /dev/null
+++ b/global-jjb
@@ -0,0 +1 @@
+Subproject commit ff33e05030b95c28f28f1317f6ac713080e8a5fa
diff --git a/jjb/charts.yaml b/jjb/charts.yaml
index a33f2ac..1c46a78 100644
--- a/jjb/charts.yaml
+++ b/jjb/charts.yaml
@@ -39,7 +39,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: ''
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: 'gerrit'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -144,7 +146,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 60a2f3f..4a4ac4a 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -7,6 +7,10 @@
     # lftools
     lftools-version: '~=0.26.2'
 
+    # LF templates require these to be set in later versions of global-jjb
+    submodule-disable: 'false'
+    submodule-timeout: 10
+
     # name of the SSH key to use in most cases
     jenkins-ssh-credential: 'cord-jenkins-ssh'
     gerrit-ssh-credential: 'gerrit-jenkins-user'
diff --git a/jjb/global-jjb b/jjb/global-jjb
deleted file mode 160000
index d1b7f48..0000000
--- a/jjb/global-jjb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d1b7f48bb76729ddde974357b4de845db71bb5a8
diff --git a/jjb/global-jjb/jenkins-admin b/jjb/global-jjb/jenkins-admin
new file mode 120000
index 0000000..8e7fe05
--- /dev/null
+++ b/jjb/global-jjb/jenkins-admin
@@ -0,0 +1 @@
+../../global-jjb/jenkins-admin
\ No newline at end of file
diff --git a/jjb/global-jjb/jenkins-init-scripts b/jjb/global-jjb/jenkins-init-scripts
new file mode 120000
index 0000000..c7c6a95
--- /dev/null
+++ b/jjb/global-jjb/jenkins-init-scripts
@@ -0,0 +1 @@
+../../global-jjb/jenkins-init-scripts
\ No newline at end of file
diff --git a/jjb/global-jjb/jjb b/jjb/global-jjb/jjb
new file mode 120000
index 0000000..23c884f
--- /dev/null
+++ b/jjb/global-jjb/jjb
@@ -0,0 +1 @@
+../../global-jjb/jjb
\ No newline at end of file
diff --git a/jjb/global-jjb/shell b/jjb/global-jjb/shell
new file mode 120000
index 0000000..d37c43f
--- /dev/null
+++ b/jjb/global-jjb/shell
@@ -0,0 +1 @@
+../../global-jjb/shell
\ No newline at end of file
diff --git a/jjb/gui-unit.yaml b/jjb/gui-unit.yaml
index 97509fa..6cb5c2e 100644
--- a/jjb/gui-unit.yaml
+++ b/jjb/gui-unit.yaml
@@ -33,7 +33,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
diff --git a/jjb/lint.yaml b/jjb/lint.yaml
index 67059af..eb06a39 100644
--- a/jjb/lint.yaml
+++ b/jjb/lint.yaml
@@ -32,7 +32,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -74,7 +76,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -119,7 +123,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
diff --git a/jjb/maven.yaml b/jjb/maven.yaml
index e72b245..d7a0150 100644
--- a/jjb/maven.yaml
+++ b/jjb/maven.yaml
@@ -35,7 +35,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -106,7 +108,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
diff --git a/jjb/pypi-publish.yaml b/jjb/pypi-publish.yaml
index 614ed5e..a4d89fe 100644
--- a/jjb/pypi-publish.yaml
+++ b/jjb/pypi-publish.yaml
@@ -31,7 +31,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: ''
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: 'gerrit'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
diff --git a/jjb/python-unit.yaml b/jjb/python-unit.yaml
index b44f83e..fa0fd47 100644
--- a/jjb/python-unit.yaml
+++ b/jjb/python-unit.yaml
@@ -32,7 +32,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
diff --git a/jjb/release.yaml b/jjb/release.yaml
index d3bcff7..dce0ad4 100644
--- a/jjb/release.yaml
+++ b/jjb/release.yaml
@@ -31,7 +31,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
diff --git a/jjb/sonar.yaml b/jjb/sonar.yaml
index f546a79..7ec590c 100644
--- a/jjb/sonar.yaml
+++ b/jjb/sonar.yaml
@@ -66,7 +66,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: ''
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: 'gerrit'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
@@ -110,7 +112,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
diff --git a/jjb/templates/sync-dir.yaml b/jjb/templates/sync-dir.yaml
index ef4db6a..5f273fc 100644
--- a/jjb/templates/sync-dir.yaml
+++ b/jjb/templates/sync-dir.yaml
@@ -52,7 +52,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{gerrit-ssh-credential}'
 
diff --git a/jjb/versioning.yaml b/jjb/versioning.yaml
index ddefa17..9c25666 100644
--- a/jjb/versioning.yaml
+++ b/jjb/versioning.yaml
@@ -58,7 +58,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{gerrit-ssh-credential}'
 
@@ -104,7 +106,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{gerrit-ssh-credential}'
 
diff --git a/jjb/voltha-unit-test.yaml b/jjb/voltha-unit-test.yaml
index 22b4456..c2132fa 100644
--- a/jjb/voltha-unit-test.yaml
+++ b/jjb/voltha-unit-test.yaml
@@ -31,7 +31,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
diff --git a/jjb/xos-rest-gw-unit.yaml b/jjb/xos-rest-gw-unit.yaml
index 3c4ff46..7b12ffe 100644
--- a/jjb/xos-rest-gw-unit.yaml
+++ b/jjb/xos-rest-gw-unit.yaml
@@ -34,7 +34,9 @@
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: 'false'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'