diff --git a/jjb/ccsdk/ccsdk-cds-push-upstream-jobs.yaml b/jjb/onap/ccsdk-cds/ccsdk-cds-push-upstream-jobs.yaml
similarity index 95%
rename from jjb/ccsdk/ccsdk-cds-push-upstream-jobs.yaml
rename to jjb/onap/ccsdk-cds/ccsdk-cds-push-upstream-jobs.yaml
index b7357ff..2a08c8e 100644
--- a/jjb/ccsdk/ccsdk-cds-push-upstream-jobs.yaml
+++ b/jjb/onap/ccsdk-cds/ccsdk-cds-push-upstream-jobs.yaml
@@ -30,4 +30,4 @@
           branch: '{stream}'
 
     jobs:
-      - '{project-name}-{stream}-push-upstream'
+      - 'onap-{project-name}-{stream}-push-upstream'
diff --git a/jjb/ccsdk/ccsdk-cds-rebase-jobs.yaml b/jjb/onap/ccsdk-cds/ccsdk-cds-rebase-jobs.yaml
similarity index 95%
rename from jjb/ccsdk/ccsdk-cds-rebase-jobs.yaml
rename to jjb/onap/ccsdk-cds/ccsdk-cds-rebase-jobs.yaml
index 1c7cb37..35125f5 100644
--- a/jjb/ccsdk/ccsdk-cds-rebase-jobs.yaml
+++ b/jjb/onap/ccsdk-cds/ccsdk-cds-rebase-jobs.yaml
@@ -32,4 +32,4 @@
           branch: '{stream}'
 
     jobs:
-      - '{project-name}-{stream}-rebase'
+      - 'onap-{project-name}-{stream}-rebase'
diff --git a/jjb/ccsdk/ccsdk-cds-verify-jobs.yaml b/jjb/onap/ccsdk-cds/ccsdk-cds-verify-jobs.yaml
similarity index 95%
rename from jjb/ccsdk/ccsdk-cds-verify-jobs.yaml
rename to jjb/onap/ccsdk-cds/ccsdk-cds-verify-jobs.yaml
index 3deeb7f..de4b038 100644
--- a/jjb/ccsdk/ccsdk-cds-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-cds/ccsdk-cds-verify-jobs.yaml
@@ -34,4 +34,4 @@
           branch: '{stream}'
 
     jobs:
-      - '{project-name}-{stream}-verify-java'
+      - 'onap-{project-name}-{stream}-verify-java'
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints-push-upstream-jobs.yaml b/jjb/onap/dcaegen2-platform-blueprints/dcaegen2-platform-blueprints-push-upstream-jobs.yaml
similarity index 95%
rename from jjb/dcaegen2/dcaegen2-platform-blueprints-push-upstream-jobs.yaml
rename to jjb/onap/dcaegen2-platform-blueprints/dcaegen2-platform-blueprints-push-upstream-jobs.yaml
index 65d4a6b..fe9aa54 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints-push-upstream-jobs.yaml
+++ b/jjb/onap/dcaegen2-platform-blueprints/dcaegen2-platform-blueprints-push-upstream-jobs.yaml
@@ -27,4 +27,4 @@
           branch: '{stream}'
 
     jobs:
-      - '{project-name}-{stream}-push-upstream'
+      - 'onap-{project-name}-{stream}-push-upstream'
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints-rebase-jobs.yaml b/jjb/onap/dcaegen2-platform-blueprints/dcaegen2-platform-blueprints-rebase-jobs.yaml
similarity index 96%
rename from jjb/dcaegen2/dcaegen2-platform-blueprints-rebase-jobs.yaml
rename to jjb/onap/dcaegen2-platform-blueprints/dcaegen2-platform-blueprints-rebase-jobs.yaml
index d054ebb..80095e8 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints-rebase-jobs.yaml
+++ b/jjb/onap/dcaegen2-platform-blueprints/dcaegen2-platform-blueprints-rebase-jobs.yaml
@@ -22,9 +22,7 @@
 - project:
 
     name: dcaegen2-platform-blueprints-rebase
-
     project: dcaegen2/platform/blueprints
-
     project-name: dcaegen2-platform-blueprints
 
     stream:
@@ -34,4 +32,4 @@
           branch: '{stream}'
 
     jobs:
-      - '{project-name}-{stream}-rebase'
+      - 'onap-{project-name}-{stream}-rebase'
diff --git a/jjb/oom/oom-offline-installer-push-upstream.yaml b/jjb/onap/oom-offline-installer/oom-offline-installer-push-upstream.yaml
similarity index 95%
rename from jjb/oom/oom-offline-installer-push-upstream.yaml
rename to jjb/onap/oom-offline-installer/oom-offline-installer-push-upstream.yaml
index 3fcc782..1a198ca 100644
--- a/jjb/oom/oom-offline-installer-push-upstream.yaml
+++ b/jjb/onap/oom-offline-installer/oom-offline-installer-push-upstream.yaml
@@ -25,5 +25,5 @@
       - master:
           branch: '{stream}'
     jobs:
-      - '{project-name}-{stream}-push-upstream'
+      - 'onap-{project-name}-{stream}-push-upstream'
 
diff --git a/jjb/oom/oom-offline-installer-rebase.yaml b/jjb/onap/oom-offline-installer/oom-offline-installer-rebase.yaml
similarity index 95%
rename from jjb/oom/oom-offline-installer-rebase.yaml
rename to jjb/onap/oom-offline-installer/oom-offline-installer-rebase.yaml
index 0ea8d36..e5732c9 100644
--- a/jjb/oom/oom-offline-installer-rebase.yaml
+++ b/jjb/onap/oom-offline-installer/oom-offline-installer-rebase.yaml
@@ -26,5 +26,5 @@
       - master:
           branch: '{stream}'
     jobs:
-      - '{project-name}-{stream}-rebase'
+      - 'onap-{project-name}-{stream}-rebase'
 
diff --git a/jjb/oom/oom-push-upstream-jobs.yaml b/jjb/onap/oom/oom-push-upstream-jobs.yaml
similarity index 95%
rename from jjb/oom/oom-push-upstream-jobs.yaml
rename to jjb/onap/oom/oom-push-upstream-jobs.yaml
index 2a48450..ea20070 100644
--- a/jjb/oom/oom-push-upstream-jobs.yaml
+++ b/jjb/onap/oom/oom-push-upstream-jobs.yaml
@@ -30,4 +30,4 @@
           branch: '{stream}'
 
     jobs:
-      - '{project-name}-{stream}-push-upstream'
+      - 'onap-{project-name}-{stream}-push-upstream'
diff --git a/jjb/oom/oom-rebase-jobs.yaml b/jjb/onap/oom/oom-rebase-jobs.yaml
similarity index 95%
rename from jjb/oom/oom-rebase-jobs.yaml
rename to jjb/onap/oom/oom-rebase-jobs.yaml
index b256c05..73249ea 100644
--- a/jjb/oom/oom-rebase-jobs.yaml
+++ b/jjb/onap/oom/oom-rebase-jobs.yaml
@@ -30,4 +30,4 @@
       - casablanca:
           branch: '{stream}'
     jobs:
-      - '{project-name}-{stream}-rebase'
+      - 'onap-{project-name}-{stream}-rebase'
diff --git a/jjb/policy/policy-api-push-upstream-jobs.yaml b/jjb/onap/policy-api/policy-api-push-upstream-jobs.yaml
similarity index 95%
rename from jjb/policy/policy-api-push-upstream-jobs.yaml
rename to jjb/onap/policy-api/policy-api-push-upstream-jobs.yaml
index 664fee2..b054969 100644
--- a/jjb/policy/policy-api-push-upstream-jobs.yaml
+++ b/jjb/onap/policy-api/policy-api-push-upstream-jobs.yaml
@@ -28,4 +28,4 @@
           branch: '{stream}'
 
     jobs:
-      - '{project-name}-{stream}-push-upstream'
+      - 'onap-{project-name}-{stream}-push-upstream'
diff --git a/jjb/policy/policy-api-rebase-jobs.yaml b/jjb/onap/policy-api/policy-api-rebase-jobs.yaml
similarity index 95%
rename from jjb/policy/policy-api-rebase-jobs.yaml
rename to jjb/onap/policy-api/policy-api-rebase-jobs.yaml
index 890c775..4e76e01 100644
--- a/jjb/policy/policy-api-rebase-jobs.yaml
+++ b/jjb/onap/policy-api/policy-api-rebase-jobs.yaml
@@ -30,4 +30,4 @@
           branch: '{stream}'
 
     jobs:
-      - '{project-name}-{stream}-rebase'
+      - 'onap-{project-name}-{stream}-rebase'
diff --git a/jjb/policy/policy-api-verify-jobs.yaml b/jjb/onap/policy-api/policy-api-verify-jobs.yaml
similarity index 95%
rename from jjb/policy/policy-api-verify-jobs.yaml
rename to jjb/onap/policy-api/policy-api-verify-jobs.yaml
index f364de9..13c3771 100644
--- a/jjb/policy/policy-api-verify-jobs.yaml
+++ b/jjb/onap/policy-api/policy-api-verify-jobs.yaml
@@ -33,4 +33,4 @@
           branch: '{stream}'
 
     jobs:
-      - '{project-name}-{stream}-verify-java'
+      - 'onap-{project-name}-{stream}-verify-java'
diff --git a/jjb/policy/policy-models-push-upstream-jobs.yaml b/jjb/onap/policy-models/policy-models-push-upstream-jobs.yaml
similarity index 95%
rename from jjb/policy/policy-models-push-upstream-jobs.yaml
rename to jjb/onap/policy-models/policy-models-push-upstream-jobs.yaml
index 6a23aed..1f4ad85 100644
--- a/jjb/policy/policy-models-push-upstream-jobs.yaml
+++ b/jjb/onap/policy-models/policy-models-push-upstream-jobs.yaml
@@ -28,4 +28,4 @@
           branch: '{stream}'
 
     jobs:
-      - '{project-name}-{stream}-push-upstream'
+      - 'onap-{project-name}-{stream}-push-upstream'
diff --git a/jjb/policy/policy-models-rebase-jobs.yaml b/jjb/onap/policy-models/policy-models-rebase-jobs.yaml
similarity index 95%
rename from jjb/policy/policy-models-rebase-jobs.yaml
rename to jjb/onap/policy-models/policy-models-rebase-jobs.yaml
index 0a78f81..f5bc7db 100644
--- a/jjb/policy/policy-models-rebase-jobs.yaml
+++ b/jjb/onap/policy-models/policy-models-rebase-jobs.yaml
@@ -32,4 +32,4 @@
 #          branch: '{stream}'
 
     jobs:
-      - '{project-name}-{stream}-rebase'
+      - 'onap-{project-name}-{stream}-rebase'
diff --git a/jjb/policy/policy-models-verify-jobs.yaml b/jjb/onap/policy-models/policy-models-verify-jobs.yaml
similarity index 95%
rename from jjb/policy/policy-models-verify-jobs.yaml
rename to jjb/onap/policy-models/policy-models-verify-jobs.yaml
index 08f8bdd..880855b 100644
--- a/jjb/policy/policy-models-verify-jobs.yaml
+++ b/jjb/onap/policy-models/policy-models-verify-jobs.yaml
@@ -33,4 +33,4 @@
           branch: '{stream}'
 
     jobs:
-      - '{project-name}-{stream}-verify-java'
+      - 'onap-{project-name}-{stream}-verify-java'