diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 9733dc2..00549e8 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -487,6 +487,38 @@
           power-switch: True
           pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
 
+     # Berlin pod with gpon olt/onu - voltha-2.4 1T8GEM tech profile and timer based job
+      - 'build_voltha_pod_release':
+          build-node: 'dt-berlin-community-pod'
+          config-pod: 'dt-berlin-pod-gpon'
+          release: '2.4'
+          branch: 'voltha-2.4'
+          num-of-openonu: '2'
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-build'
+          configurePod: true
+          profile: '1T8GEM'
+          with-kind: true
+          time: '1'
+
+
+      # Berlin POD test job - voltha-2.4 versions: uses 1T8GEM tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          build-node: 'dt-berlin-community-pod'
+          config-pod: 'dt-berlin-pod-gpon'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          release: '2.4'
+          branch: 'voltha-2.4'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          power-switch: True
+          pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
+
       # Berlin pod with olt/onu - manual test job, voltha master build job
       - 'build_pod_manual':
           build-node: 'dt-berlin-community-pod'
diff --git a/jjb/pipeline/omec-fossa-scan.groovy b/jjb/pipeline/omec-fossa-scan.groovy
index c7a3f3f..0c415ac 100644
--- a/jjb/pipeline/omec-fossa-scan.groovy
+++ b/jjb/pipeline/omec-fossa-scan.groovy
@@ -97,7 +97,7 @@
                         fossa analyze --no-ansi --verbose
 
                         echo "Get FOSSA test results with 'fossa test'"
-                        fossa test --no-ansi --verbose
+                        fossa test --no-ansi --verbose --timeout 1200
 
                         echo "Display list of licenses detected by FOSSA using 'fossa report licenses'"
                         fossa report licenses
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 8445f0d..23e3a7d 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -19,11 +19,11 @@
           time-trigger: "H H/12 * * *"
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-test-bbsim-2.3'
+          name: 'periodic-voltha-test-bbsim-2.4'
           pipeline-script: 'voltha-nightly-tests-bbsim.groovy'
           build-node: 'qct-pod4-node2'
           make-target: functional-single-kind
-          code-branch: 'voltha-2.3'
+          code-branch: 'voltha-2.4'
           onus: 2
           pons: 2
           time-trigger: "H H/12 * * *"
@@ -39,10 +39,10 @@
           time-trigger: "H H/12 * * *"
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-etcd-test-2.3'
+          name: 'periodic-voltha-etcd-test-2.4'
           pipeline-script: 'voltha-system-test-bbsim.groovy'
           build-node: 'ubuntu16.04-basebuild-4c-8g'
-          code-branch: 'voltha-2.3'
+          code-branch: 'voltha-2.4'
           make-target: sanity-multi-kind
           onus: 2
           pons: 2
@@ -61,10 +61,10 @@
           time-trigger: "H H/12 * * *"
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-sanity-test-multi-runs-2.3'
+          name: 'periodic-voltha-sanity-test-multi-runs-2.4'
           pipeline-script: 'voltha-go-multi-tests.groovy'
           build-node: 'qct-pod4-node2'
-          code-branch: 'voltha-2.3'
+          code-branch: 'voltha-2.4'
           make-target: sanity-kind
           onus: 1
           pons: 1