diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index ea76ba3..b5732d9 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,31 +1,33 @@
+---
 document: modulemd
 version: 2
 data:
-    summary: Apache module suporting OpenID Connect authentication
-    description: >-
-        This module enables an Apache 2.x web server to operate as an
-        OpenID Connect Relying Party and/or OAuth 2.0 Resource Server.
-    license:
-        module:
-            - MIT
-    dependencies:
-      - buildrequires:
-            platform: [el8]
-        requires:
-            platform: [el8]
-    references:
-        community: https://github.com/zmartzone/mod_auth_openidc
-        documentation: https://github.com/zmartzone/mod_auth_openidc/wiki
-        tracker: https://github.com/zmartzone/mod_auth_openidc/issues
-    components:
-        rpms:
-            mod_auth_openidc:
-                rationale: Provides the core functionality.
-                ref: stream-mod_auth_open_idc-2.3
-                buildorder: 2
-            cjose:
-                rationale: Provides JOSE support
-                ref: stream-mod_auth_open_idc-2.3
-                buildorder: 1
-                
-
+  name: mod_auth_openidc
+  stream: 2.3
+  summary: Apache module suporting OpenID Connect authentication
+  description: >-
+    This module enables an Apache 2.x web server to operate as an OpenID Connect Relying
+    Party and/or OAuth 2.0 Resource Server.
+  license:
+    module:
+    - MIT
+  dependencies:
+  - buildrequires:
+      platform: [el8]
+    requires:
+      platform: [el8]
+  references:
+    community: https://github.com/zmartzone/mod_auth_openidc
+    documentation: https://github.com/zmartzone/mod_auth_openidc/wiki
+    tracker: https://github.com/zmartzone/mod_auth_openidc/issues
+  components:
+    rpms:
+      cjose:
+        rationale: Provides JOSE support
+        ref: stream-mod_auth_open_idc-2.3-rhel-8.2.0
+        buildorder: 1
+      mod_auth_openidc:
+        rationale: Provides the core functionality.
+        ref: stream-mod_auth_open_idc-2.3-rhel-8.2.0
+        buildorder: 2
+...
diff --git a/mod_auth_openidc.yaml b/mod_auth_openidc.yaml
deleted file mode 100644
index ec64a15..0000000
--- a/mod_auth_openidc.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-document: modulemd
-version: 2
-data:
-  summary: Apache module suporting OpenID Connect authentication
-  description: This module enables an Apache 2.x web server to operate as an OpenID
-    Connect Relying Party and/or OAuth 2.0 Resource Server.
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      platform:
-      - el8.0.0
-    requires:
-      platform:
-      - el8
-  references:
-    community: https://github.com/zmartzone/mod_auth_openidc
-    documentation: https://github.com/zmartzone/mod_auth_openidc/wiki
-    tracker: https://github.com/zmartzone/mod_auth_openidc/issues
-  components:
-    rpms:
-      mod_auth_openidc:
-        rationale: Provides the core functionality.
-        ref: d242e170ce9dc782fdca9318d2e388f1b8553e2f
-        buildorder: 2
-      cjose:
-        rationale: Provides JOSE support
-        ref: 96ae33cc2db332dfb12b555faa11f57a01529578
-        buildorder: 1
-  name: mod_auth_openidc
-  stream: '2.3'