diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index db3b887..57d978d 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,38 +1,44 @@
+---
 document: modulemd
 version: 2
 data:
-    summary: Varnish HTTP cache
-    description: Varnish Cache web application accelerator
-    license:
-        module: [ MIT ]
-    dependencies:
-        - buildrequires:
-                platform: [el8]
-          requires:
-                platform: [el8]
-    references:
-        documentation: http://varnish-cache.org/docs/
-        tracker: https://github.com/varnishcache/varnish-cache/issues
-    profiles:
-        common:
-            rpms:
-                - varnish
-                - varnish-modules
-    buildopts:
-        rpms:
-            macros: |
-                %_without_python2 1
-                %_with_python3 1
-    api:
-        rpms:
-            - varnish
-            - varnish-modules
-    components:
-        rpms:
-            varnish:
-                rationale: Module API.
-                ref: stream-6
-            varnish-modules:
-                rationale: Extension modules.
-                ref: stream-6
-                buildorder: 1
+  name: varnish
+  stream: 6
+  summary: Varnish HTTP cache
+  description: >-
+    Varnish Cache web application accelerator
+  license:
+    module:
+    - MIT
+  dependencies:
+  - buildrequires:
+      platform: [el8]
+    requires:
+      platform: [el8]
+  references:
+    documentation: http://varnish-cache.org/docs/
+    tracker: https://github.com/varnishcache/varnish-cache/issues
+  profiles:
+    common:
+      rpms:
+      - varnish
+      - varnish-modules
+  api:
+    rpms:
+    - varnish
+    - varnish-modules
+  buildopts:
+    rpms:
+      macros: |
+        %_without_python2 1
+        %_with_python3 1
+  components:
+    rpms:
+      varnish:
+        rationale: Module API.
+        ref: stream-6-rhel-8.3.0
+      varnish-modules:
+        rationale: Extension modules.
+        ref: stream-6-rhel-8.3.0
+        buildorder: 1
+...
diff --git a/varnish.yaml b/varnish.yaml
deleted file mode 100644
index f9baf02..0000000
--- a/varnish.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-document: modulemd
-version: 2
-data:
-  summary: Varnish HTTP cache
-  description: Varnish Cache web application accelerator
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      platform:
-      - el8.0.0
-    requires:
-      platform:
-      - el8
-  references:
-    documentation: http://varnish-cache.org/docs/
-    tracker: https://github.com/varnishcache/varnish-cache/issues
-  profiles:
-    common:
-      rpms:
-      - varnish
-      - varnish-modules
-  buildopts:
-    rpms:
-      macros: '%_without_python2 1
-
-        %_with_python3 1
-
-        '
-  api:
-    rpms:
-    - varnish
-    - varnish-modules
-  components:
-    rpms:
-      varnish:
-        rationale: Module API.
-        ref: baf70dbd9e4810f09ee4d20bdbcecd919bc35de8
-      varnish-modules:
-        rationale: Extension modules.
-        ref: 0555447031289c5757f409aba2be5276b5d7d87f
-        buildorder: 1
-  name: varnish
-  stream: '6'