diff --git a/jjb/OnosSystemTest/onos-test-freestyle.yaml b/jjb/OnosSystemTest/onos-test-freestyle.yaml
index 4cb35e4..1769170 100644
--- a/jjb/OnosSystemTest/onos-test-freestyle.yaml
+++ b/jjb/OnosSystemTest/onos-test-freestyle.yaml
@@ -428,7 +428,7 @@
          stream: '{stream}'
          lftools-version: '{lftools-version}'
 
-    node: 'TestStation-Fabric{fabricOn}s'
+    node: '{node}'
     publishers:
 
       - archive:
@@ -578,13 +578,16 @@
     jobs:
       - 'SR-log-storage':
          version: '{sr-version-current}'
-         fabricOn: '4'
+         node: 'TestStation-Fabric4s'
       - 'SR-log-storage':
          version: '{sr-version-previous}'
-         fabricOn: '2'
+         node: 'TestStation-Fabric2s'
       - 'SR-log-storage':
          version: '{sr-version-before-previous}'
-         fabricOn: '3'
+         node: 'TestStation-Fabric3s'
+      - 'SR-log-storage':
+         version: 'Tofino'
+         node: 'QA-POD'
 
 - project:
     name: personal-station