diff --git a/jobs.yaml b/jobs.yaml
index 963bace..99eb418 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -12,42 +12,34 @@
         artifactNumToKeep: 5
     wrappers:
       - workspace-cleanup:
-          include: 
+          include:
             - "*"
           dirmatch: true
 
 # ---- Mininet Build and Test Jobs ----
 - project:
     name: mininet-build
+    flavor:
+      - precise32server
+      - precise64server
+      - trusty32server
+      - trusty64server
+      - utopic32server
+      - utopic64server
     jobs:
-        - 'mininet-{flavor}':
-            flavor: 'precise32server'
-        - 'mininet-{flavor}':
-            flavor: 'precise64server'
-        - 'mininet-{flavor}':
-            flavor: 'trusty32server'
-        - 'mininet-{flavor}':
-            flavor: 'trusty64server'
-        - 'mininet-{flavor}':
-            flavor: 'utopic32server'
-        - 'mininet-{flavor}':
-            flavor: 'utopic64server'
+      - 'mininet-{flavor}'
 
 - project:
     name: mininet-test
+    flavor:
+      - precise32server
+      - precise64server
+      - trusty32server
+      - trusty64server
+      - utopic32server
+      - utopic64server
     jobs:
-        - 'mininet-{flavor}-test':
-            flavor: 'precise32server'
-        - 'mininet-{flavor}-test':
-            flavor: 'precise64server'
-        - 'mininet-{flavor}-test':
-            flavor: 'trusty32server'
-        - 'mininet-{flavor}-test':
-            flavor: 'trusty64server'
-        - 'mininet-{flavor}-test':
-            flavor: 'utopic32server'
-        - 'mininet-{flavor}-test':
-            flavor: 'utopic64server'
+      - 'mininet-{flavor}-test'
 
 - job-template:
     name: 'mininet-{flavor}'
@@ -68,7 +60,7 @@
     name: 'mininet-{flavor}-test'
     parameters:
         - string:
-            name: dir 
+            name: dir
             default: /var/lib/jenkins/jobs/mininet-{flavor}/workspace
             description: "$dir defaults to last build when using Build Now."
     builders:
@@ -110,7 +102,7 @@
     parameters:
         - string:
             name: GERRIT_REFSPEC
-            default: refs/heads/master 
+            default: refs/heads/master
             description: "Use master as default when using Build Now."
     scm:
       - git: