diff --git a/varnish.yaml b/varnish.yaml
index a3d510c..adb91a8 100644
--- a/varnish.yaml
+++ b/varnish.yaml
@@ -1,60 +1,67 @@
 document: modulemd-packager
 version: 3
 data:
-    name: varnish
-    stream: 6.0
-    summary: Varnish HTTP cache
-    description: Varnish Cache web application accelerator
-    license:
-      - MIT
-    configurations:
-      - context: f27b74a8
-        platform: f35
-        buildopts:
-            rpms:
-                macros: |
-                    %_without_python2 1
-                    %_with_python3 1
-      - context: 5e5ad4a0
-        platform: f36
-        buildopts:
-            rpms:
-                macros: |
-                    %_without_python2 1
-                    %_with_python3 1
-      - context: 9e842022
-        platform: f37
-        buildopts:
-            rpms:
-                macros: |
-                    %_without_python2 1
-                    %_with_python3 1
-      - context: 75741a8b
-        platform: f38
-        buildopts:
-            rpms:
-                macros: |
-                    %_without_python2 1
-                    %_with_python3 1
-    references:
-        documentation: http://varnish-cache.org/docs/
-        tracker: https://github.com/varnishcache/varnish-cache/issues
-    api:
+  summary: Varnish HTTP cache
+  description: Varnish Cache web application accelerator
+  license:
+    - MIT
+  configurations:
+
+    - context: f27b74a8
+      platform: f35
+      buildopts:
         rpms:
-            - varnish
-            - varnish-modules
-    profiles:
-        default:
-            description: A standard installation
-                rpms:
-                - varnish
-                - varnish-modules
-    components:
+          macros: |
+            %_without_python2 1
+            %_with_python3 1
+
+    - context: 5e5ad4a0
+      platform: f36
+      buildopts:
         rpms:
-            varnish:
-                rationale: Module API.
-                ref: stream-6.0
-            varnish-modules:
-                rationale: Extension modules.
-                ref: stream-6.0
-                buildorder: 1
+          macros: |
+            %_without_python2 1
+            %_with_python3 1
+              
+    - context: 9e842022
+      platform: f37
+      buildopts:
+        rpms:
+          macros: |
+            %_without_python2 1
+            %_with_python3 1
+              
+    - context: 75741a8b
+      platform: f38
+      buildopts:
+        rpms:
+          macros: |
+            %_without_python2 1
+            %_with_python3 1
+              
+  references:
+    documentation: http://varnish-cache.org/docs/
+    tracker: https://github.com/varnishcache/varnish-cache/issues
+    
+  profiles:
+    default:
+      description: A standard installation
+      rpms:
+        - varnish
+        - varnish-modules
+
+  api:
+    rpms:
+      - varnish
+      - varnish-modules
+      
+  components:
+    rpms:
+      varnish:
+        rationale: Module API.
+        ref: stream-6.0
+        buildorder: 0
+      varnish-modules:
+        rationale: Extension modules.
+        ref: stream-6.0
+        buildorder: 10