diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 907de39..7d336ba 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -260,23 +260,6 @@
           pipeline-file: 'omec-reuse-scan.groovy'
           build-node: 'ubuntu18.04-basebuild-1c-2g'
 
-# for upf
-- project:
-    name: upf
-    project: '{name}'
-
-    github-organization: 'omec-project'
-    github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
-    github_pr_org_list:
-      - 'omec-project'
-    registry: 'registry.aetherproject.org/omecproject'
-    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
-
-    jobs:
-      - 'omec-fossa':
-          pipeline-file: 'omec-fossa-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-
 # Combined pipeline
 - job-template:
     id: 'omec-combined'
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index bb7e979..c5fe36b 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -12,6 +12,11 @@
       - 'verify-voltha-system-tests-jobs-master':
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           branch-regexp: '^master$'
+      - 'verify-voltha-system-tests-jobs-py312':
+          build-node: 'ubuntu24.04-basebuild-4c-8g'
+          name-extension: '-py312'
+          override-branch: 'python312-update'
+          branch-regexp: '^python312-update$'
       - 'verify-voltha-system-tests-jobs-voltha-2.12':
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           name-extension: '-voltha-2.12'
@@ -33,6 +38,13 @@
           junit-allow-empty-results: true
 
 - job-group:
+    name: 'verify-voltha-system-tests-jobs-py312'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/bbsim-tests.groovy'
+          pipeline-branch: 'python312-update'
+
+- job-group:
     name: 'verify-voltha-system-tests-jobs-voltha-2.12'
     jobs:
       - 'voltha-patch-test':