diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index aa30986..5219cde 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,33 +1,39 @@
+---
 document: modulemd
 version: 2
 data:
-    summary: Electronic mail discussion and e-newsletter lists managing software
-    description: An initial version of the mailman mailing list management software
-    license:
-        module: [MIT]
-    dependencies:
-        - buildrequires:
-                platform: [el8]
-                python27: [2.7]
-          requires:
-                platform: [el8]
-                python27: [2.7]
-    references:
-        documentation: https://launchpad.net/mailman
-        tracker: https://bugs.launchpad.net/mailman
-    profiles:
-        common:
-            rpms:
-                - mailman
-    api:
-        rpms:
-            - mailman
-    filter:
-        rpms:
-            - python3-dns
-    components:
-        rpms:
-            mailman:
-                rationale: Module API.
-                ref: stream-2.1
-                buildorder: 1
+  name: mailman
+  stream: 2.1
+  summary: Electronic mail discussion and e-newsletter lists managing software
+  description: >-
+    An initial version of the mailman mailing list management software
+  license:
+    module:
+    - MIT
+  dependencies:
+  - buildrequires:
+      platform: [el8]
+      python27: [2.7]
+    requires:
+      platform: [el8]
+      python27: [2.7]
+  references:
+    documentation: https://launchpad.net/mailman
+    tracker: https://bugs.launchpad.net/mailman
+  profiles:
+    common:
+      rpms:
+      - mailman
+  api:
+    rpms:
+    - mailman
+  filter:
+    rpms:
+    - python3-dns
+  components:
+    rpms:
+      mailman:
+        rationale: Module API.
+        ref: stream-2.1-rhel-8.3.0
+        buildorder: 1
+...
diff --git a/mailman.yaml b/mailman.yaml
deleted file mode 100644
index 00c6026..0000000
--- a/mailman.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-document: modulemd
-version: 2
-data:
-  summary: Electronic mail discussion and e-newsletter lists managing software
-  description: An initial version of the mailman mailing list management software
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      platform:
-      - el8.0.0
-      python27:
-      - 2.7
-    requires:
-      platform:
-      - el8
-      python27:
-      - 2.7
-  references:
-    documentation: https://launchpad.net/mailman
-    tracker: https://bugs.launchpad.net/mailman
-  profiles:
-    common:
-      rpms:
-      - mailman
-  api:
-    rpms:
-    - mailman
-  filter:
-    rpms:
-    - python3-dns
-  components:
-    rpms:
-      mailman:
-        rationale: Module API.
-        ref: 5c2a97e0e45f07d8f2fb22435618a238d82fa8d3
-        buildorder: 1
-  name: mailman
-  stream: '2.1'