diff --git a/jjb/verify/xos-rest-gw.yaml b/jjb/verify/xos-rest-gw.yaml
new file mode 100644
index 0000000..0eb70a4
--- /dev/null
+++ b/jjb/verify/xos-rest-gw.yaml
@@ -0,0 +1,21 @@
+---
+# verification jobs for 'xos-rest-gw' repo
+
+- project:
+    name: xos-rest-gw
+    project: '{name}'
+
+    jobs:
+      - 'verify-xos-rest-gw-jobs':
+          branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+    name: 'verify-xos-rest-gw-jobs'
+    jobs:
+      - 'verify-licensed'
+      - 'tag-collision-reject':
+          dependency-jobs: 'verify_xos-rest-gw_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_xos-rest-gw_tag-collision'
+      - 'xos-rest-gw-unit':
+          dependency-jobs: 'verify_xos-rest-gw_sonarqube'
diff --git a/jjb/xos-rest-gw.yaml b/jjb/xos-rest-gw-unit.yaml
similarity index 82%
rename from jjb/xos-rest-gw.yaml
rename to jjb/xos-rest-gw-unit.yaml
index 34264c0..3c4ff46 100644
--- a/jjb/xos-rest-gw.yaml
+++ b/jjb/xos-rest-gw-unit.yaml
@@ -1,21 +1,13 @@
 ---
-# xos-rest-gw test
-
-- project:
-    name: xos-rest-gw
-
-    project-name: '{name}'
-
-    jobs:
-      - 'xos-rest-gw'
+# xos-rest-gw unit test
 
 - job-template:
-    id: 'xos-rest-gw'
-    name: 'xos-rest-gw'
+    id: 'xos-rest-gw-unit'
+    name: '{id}'
 
     description: |
       <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/xos-rest-gw.yaml
+      Created by {id} job-template from ci-management/jjb/xos-rest-gw-unit.yaml
       Test for the XOS Rest Gateway that combine REST APIs and WebSocket
 
     properties:
@@ -32,8 +24,8 @@
     triggers:
       - cord-infra-gerrit-trigger-patchset:
           gerrit-server-name: '{gerrit-server-name}'
-          project-regexp: '^xos-rest-gw'
-          branch-regexp: '{supported-branches-regexp}'
+          project-regexp: '^{project}$'
+          branch-regexp: '{branch-regexp}'
           dependency-jobs: '{dependency-jobs}'
           file-include-regexp: '{all-files-regexp}'