diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 9abecca..c5c12a4 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,110 +1,85 @@
-# Keep a generated ruby.yaml file URL here to follow latest configuration.
-# https://github.com/fedora-modularity/dependency-report/blob/master/modules/ruby/ruby.yaml
+---
 document: modulemd
 version: 2
 data:
-    # From ruby.spec Summary
-    summary: An interpreter of object-oriented scripting language
-    # From ruby.spec description
-    description: >-
-        Ruby is the interpreted scripting language for quick and easy
-        object-oriented programming.  It has many features to process text
-        files and to do system management tasks (as in Perl).  It is simple,
-        straight-forward, and extensible.
-    stream: 2.6
-    license:
-        module:
-            - MIT
-    references:
-        community: http://ruby-lang.org/
-        documentation: https://www.ruby-lang.org/en/documentation/
-        tracker: https://bugs.ruby-lang.org/
-    dependencies:
-        - buildrequires:
-            platform: [el8]
-          requires:
-            platform: [el8]
-    components:
-        # SRPMs
-        rpms:
-            ruby:
-                # From ruby.spec Summary
-                rationale: An interpreter of object-oriented scripting language
-                multilib: [x86_64]
-                buildorder: 101
-                ref: stream-ruby-2.6-rhel-8.1.0
-            rubygem-abrt:
-                # From rubygem-abrt.spec Summary
-                rationale: >-
-                    ABRT support for Ruby
-                buildorder: 102
-                ref: stream-ruby-2.6-rhel-8.1.0
-            rubygem-mysql2:
-                # From rubygem-mysql2.spec Summary
-                rationale: >-
-                    A simple, fast Mysql library for Ruby, binding to libmysql
-                buildorder: 102
-                ref: stream-ruby-2.6-rhel-8.1.0
-            rubygem-pg:
-                # From rubygem-pg.spec Summary
-                rationale: >-
-                    A Ruby interface to the PostgreSQL RDBMS
-                buildorder: 102
-                ref: stream-ruby-2.6-rhel-8.1.0
-            rubygem-bson:
-                # From rubygem-bson.spec Summary
-                rationale: >-
-                    Ruby Implementation of the BSON specification
-                buildorder: 102
-                ref: stream-ruby-2.6-rhel-8.1.0
-            rubygem-mongo:
-                # From rubygem-mongo.spec Summary
-                rationale: >-
-                    Ruby driver for MongoDB
-                buildorder: 103
-                ref: stream-ruby-2.6-rhel-8.1.0
-    buildopts:
-        rpms:
-            macros: |
-                %_without_rubypick 1
-    api:
-        # RPMs
-        # From *.spec %package
-        rpms:
-            # From ruby.spec
-            - ruby
-            - ruby-devel
-            - ruby-libs
-            - rubygems
-            - rubygems-devel
-            - rubygem-bigdecimal
-            - rubygem-bundler
-            - rubygem-did_you_mean
-            - rubygem-io-console
-            - rubygem-irb
-            - rubygem-json
-            - rubygem-minitest
-            - rubygem-net-telnet
-            - rubygem-openssl
-            - rubygem-power_assert
-            - rubygem-psych
-            - rubygem-rake
-            - rubygem-rdoc
-            - rubygem-test-unit
-            - rubygem-xmlrpc
-            # From rubygem-abrt.spec
-            - rubygem-abrt
-            # From rubygem-mysql2.spec
-            - rubygem-mysql2
-            # From rubygem-pg.spec
-            - rubygem-pg
-            # From rubygem-bson.spec
-            - rubygem-bson
-            # From rubygem-mongo.spec
-            - rubygem-mongo
-    # Add profiles/default as a temporary workflow,
-    # because of a issue for omitted profiles element.
-    profiles:
-        common:
-            rpms:
-                - ruby
+  stream: 2.6
+  summary: An interpreter of object-oriented scripting language
+  description: >-
+    Ruby is the interpreted scripting language for quick and easy object-oriented
+    programming.  It has many features to process text files and to do system management
+    tasks (as in Perl).  It is simple, straight-forward, and extensible.
+  license:
+    module:
+    - MIT
+  dependencies:
+  - buildrequires:
+      platform: [el8]
+    requires:
+      platform: [el8]
+  references:
+    community: http://ruby-lang.org/
+    documentation: https://www.ruby-lang.org/en/documentation/
+    tracker: https://bugs.ruby-lang.org/
+  profiles:
+    common:
+      rpms:
+      - ruby
+  api:
+    rpms:
+    - ruby
+    - ruby-devel
+    - ruby-libs
+    - rubygem-abrt
+    - rubygem-bigdecimal
+    - rubygem-bson
+    - rubygem-bundler
+    - rubygem-did_you_mean
+    - rubygem-io-console
+    - rubygem-irb
+    - rubygem-json
+    - rubygem-minitest
+    - rubygem-mongo
+    - rubygem-mysql2
+    - rubygem-net-telnet
+    - rubygem-openssl
+    - rubygem-pg
+    - rubygem-power_assert
+    - rubygem-psych
+    - rubygem-rake
+    - rubygem-rdoc
+    - rubygem-test-unit
+    - rubygem-xmlrpc
+    - rubygems
+    - rubygems-devel
+  buildopts:
+    rpms:
+      macros: |
+        %_without_rubypick 1
+  components:
+    rpms:
+      ruby:
+        rationale: An interpreter of object-oriented scripting language
+        ref: stream-ruby-2.6-rhel-8.4.0
+        buildorder: 101
+        multilib: [x86_64]
+      rubygem-abrt:
+        rationale: ABRT support for Ruby
+        ref: stream-ruby-2.6-rhel-8.4.0
+        buildorder: 102
+      rubygem-bson:
+        rationale: Ruby Implementation of the BSON specification
+        ref: stream-ruby-2.6-rhel-8.4.0
+        buildorder: 102
+      rubygem-mongo:
+        rationale: Ruby driver for MongoDB
+        ref: stream-ruby-2.6-rhel-8.4.0
+        buildorder: 103
+      rubygem-mysql2:
+        rationale: A simple, fast Mysql library for Ruby, binding to libmysql
+        ref: stream-ruby-2.6-rhel-8.4.0
+        buildorder: 102
+      rubygem-pg:
+        rationale: A Ruby interface to the PostgreSQL RDBMS
+        ref: stream-ruby-2.6-rhel-8.4.0
+        buildorder: 102
+...