diff --git a/jjb/OnosSystemTest/onos-test-freestyle.yaml b/jjb/OnosSystemTest/onos-test-freestyle.yaml
index ca5d837..4227cce 100644
--- a/jjb/OnosSystemTest/onos-test-freestyle.yaml
+++ b/jjb/OnosSystemTest/onos-test-freestyle.yaml
@@ -16,6 +16,16 @@
       - 'Fabric2'
       - 'Fabric3'
 
+- init-station-plate-clean: &init-station-plate-clean
+    name: init-station-plate-clean
+    clean-station-type:
+      - 'BM'
+      - 'Fabric'
+      - 'Fabric2'
+      - 'Fabric3'
+      - 'Fabric4'
+      - 'Fabric5'
+
 - job-free-version-plate: &job-free-version-plate
     name: job-free-version-plate
     version:
@@ -113,7 +123,7 @@
       - shell: !include-raw-escape: vm-bm-clean-up.sh
 
 - job-template:
-    name: test-station-log-cleanup-BM
+    name: test-station-log-cleanup-{clean-station-type}
     description: |
                   <!-- Managed by Jenkins Job Builder -->
                   clean up periodically ~/OnosSystemTest/TestON/logs - delete logs older than $DAYS_OLD days.
@@ -137,7 +147,7 @@
          stream: '{stream}'
          lftools-version: '{lftools-version}'
 
-    node: 'TestStation-BMs'
+    node: 'TestStation-{clean-station-type}s'
 
     triggers:
       - timed: '01 08 1 * *'
@@ -601,9 +611,10 @@
 
     <<: *test-free-init-procedure-plate
     <<: *init-station-plate
+    <<: *init-station-plate-clean
     jobs:
       - 'test-station-log-cleanup-VM'
-      - 'test-station-log-cleanup-BM'
+      - 'test-station-log-cleanup-{clean-station-type}'
       - 'test-station-log-cleanup-CHO'
 
 - project: