diff --git a/jjb/OnosSystemTest/onos-test-freestyle.yaml b/jjb/OnosSystemTest/onos-test-freestyle.yaml
index a651ad3..c535491 100644
--- a/jjb/OnosSystemTest/onos-test-freestyle.yaml
+++ b/jjb/OnosSystemTest/onos-test-freestyle.yaml
@@ -406,7 +406,8 @@
       - shell: !include-raw-escape: running-cho.sh
 
 - job-template:
-    name: 'SR-log-{sr-version}'
+    name: 'SR-log-{version}'
+    id: SR-log-storage
 
     <<: *test-free-job-boiler-plate
     properties:
@@ -422,30 +423,7 @@
          stream: '{stream}'
          lftools-version: '{lftools-version}'
 
-    node: 'TestStation-Fabric3s'
-    publishers:
-
-      - archive:
-         artifacts: '*'
-
-- job-template:
-    name: 'SR-log-{sr-versions}'
-
-    <<: *test-free-job-boiler-plate
-    properties:
-
-      - build-discarder:
-         num-to-keep: 50
-
-    parameters:
-
-      - lf-infra-parameters:
-         project: '{project}'
-         branch: '{stream}'
-         stream: '{stream}'
-         lftools-version: '{lftools-version}'
-
-    node: 'TestStation-Fabric2s'
+    node: 'TestStation-Fabric{fabricOn}s'
     publishers:
 
       - archive:
@@ -526,6 +504,7 @@
            - 'Fabric'
            - 'Fabric2'
            - 'Fabric3'
+           - 'Fabric4'
            - 'Fabric5'
 
 - project:
@@ -585,18 +564,25 @@
 
     <<: *test-free-init-procedure-plate
 
-    sr-version:
-      - '1.11'
+    sr-version-before-previous:
       - '1.12'
 
-    sr-versions:
-      - 'master'
+    sr-version-previous:
       - '1.13'
 
+    sr-version-current:
+      - 'master'
 
     jobs:
-      - 'SR-log-{sr-version}'
-      - 'SR-log-{sr-versions}'
+      - 'SR-log-storage':
+         version: '{sr-version-current}'
+         fabricOn: '4'
+      - 'SR-log-storage':
+         version: '{sr-version-previous}'
+         fabricOn: '2'
+      - 'SR-log-storage':
+         version: '{sr-version-before-previous}'
+         fabricOn: '3'
 
 - project:
     name: personal-station