diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 9c450ba..42c93cf 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -25,9 +25,9 @@
 - project:
     name: sdc-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}-testng'
-      - '{project-name}-{stream}-csit-{functionality}-testng'
-    project-name: 'sdc-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng'
+      - '{project-name}-arm64-{stream}-csit-{functionality}-testng'
+    project-name: 'sdc'
     stream:
       - 'master':
           branch: 'master'
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
index b53b053..fd74015 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-gvnfm-vnflcm-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-gvnfm-vnflcm-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-gvnfm-vnflcm'
     stream: 'master'
     functionality:
       - 'sanity-check':
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml
index 709a957..d92aa0f 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-gvnfm-vnfmgr-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-gvnfm-vnfmgr-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-gvnfm-vnfmgr'
     stream: 'master'
     functionality:
       - 'sanity-check':
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
index b6d179c..040331b 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-gvnfm-vnfres-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-gvnfm-vnfres-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-gvnfm-vnfres'
     stream: 'master'
     functionality:
       - 'sanity-check':
diff --git a/jjb/vfc/vfc-nfvo-catalog-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
index 3055868..d30007d 100644
--- a/jjb/vfc/vfc-nfvo-catalog-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-catalog-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-catalog-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-catalog'
     stream: 'master'
     functionality:
       - 'sanity-check':
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
index 41e99f2..fbcd28d 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-driver-ems-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-driver-ems-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-driver-ems'
     stream: 'master'
     functionality:
       - 'sanity-check':
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
index 96de3d7..2ea2e82 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-driver-sfc-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-driver-sfc-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-driver-sfc'
     stream: 'master'
     functionality:
       - 'sanity-check':
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
index 517fda3..c0e096d 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-driver-vnfm-gvnfm-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
     stream: 'master'
     functionality:
       - 'sanity-check':
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
index 98702f2..1c0c00e 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-driver-vnfm-svnfm-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-driver-vnfm-svnfm'
     stream: 'master'
     functionality:
       - 'sanity-check':
diff --git a/jjb/vfc/vfc-nfvo-lcm-csit.yaml b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
index be7eb6d..4b05bf4 100644
--- a/jjb/vfc/vfc-nfvo-lcm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-lcm-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-lcm-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-lcm'
     stream: 'master'
     functionality:
       - 'sanity-check':
diff --git a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
index 8697121..c06ead1 100644
--- a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-multivimproxy-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-multivimproxy-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-multivimproxy'
     stream: 'master'
     functionality:
       - 'sanity-check':
diff --git a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
index b955426..254cff5 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-resmanagement-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-resmanagement-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-resmanagement'
     stream: 'master'
     functionality:
       - 'sanity-check':
diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
index 4b3e95d..656849c 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
@@ -17,9 +17,9 @@
 - project:
     name: vfc-nfvo-wfengine-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-wfengine-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-wfengine'
     stream: 'master'
     functionality:
       - 'sanity-check'
diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml
index 54a7cf0..04d6536 100644
--- a/jjb/vid/vid-csit.yaml
+++ b/jjb/vid/vid-csit.yaml
@@ -18,9 +18,9 @@
 - project:
     name: vid-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vid-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vid'
     stream:
       - 'master':
           branch: 'master'