diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 3fb3791..685d040 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,299 +1,287 @@
+---
 document: modulemd
 version: 2
 data:
-    name: python27
-    stream: 2.7
-    summary: Python programming language, version 2.7
-    description: |-
-        This module provides the Python 2.7 interpreter and additional Python
-        packages the users might need.
-    license:
-        module:
-            - MIT
-    dependencies:
-        - buildrequires:
-              platform: [el8]
-              # Depend on the previous build of this module so all the
-              # dependencies already exist and we don't have to build one
-              # package at a time along the dependency graph
-              python27: [2.7]
-          requires:
-              platform: [el8]
-    references:
-        community: https://www.python.org/
-        documentation: https://docs.python.org/2.7/
-    profiles:
-        common:
-            rpms:
-                - python2
-                - python2-libs
-                - python2-pip
-                - python2-setuptools
-    filter:
-        rpms:
-            - python3-attrs
-            - python3-babel
-            - python3-bson
-            - python3-chardet
-            - python3-coverage
-            - python3-Cython
-            - python3-docutils
-            - python3-idna
-            - python3-jinja2
-            - python3-markupsafe
-            - python3-mock
-            - python3-nose
-            - python3-numpy
-            - python3-numpy-doc
-            - python3-numpy-f2py
-            - python3-pluggy
-            - python3-psycopg2
-            - python3-psycopg2-debug
-            - python3-psycopg2-tests
-            - python3-py
-            - python3-pygments
-            - python3-pymongo
-            - python3-pymongo-gridfs
-            - python3-PyMySQL
-            - python3-pysocks
-            - python3-pytest
-            - python3-pytest-mock
-            - python3-pytz
-            - python3-PyYAML
-            - python3-requests
-            - python3-scipy
-            - python3-setuptools_scm
-            - python3-six
-            - python3-sqlalchemy
-            - python3-urllib3
-            - python3-virtualenv
-    api:
-        rpms:
-            - babel
-            - python-sqlalchemy-doc
-            - python2
-            - python2-attrs
-            - python2-babel
-            - python2-backports
-            - python2-backports-ssl_match_hostname
-            - python2-bson
-            - python2-chardet
-            - python2-coverage
-            - python2-Cython
-            - python2-debug
-            - python2-devel
-            - python2-dns
-            - python2-docs
-            - python2-docs-info
-            - python2-docutils
-            - python2-funcsigs
-            - python2-idna
-            - python2-ipaddress
-            - python2-jinja2
-            - python2-libs
-            - python2-lxml
-            - python2-markupsafe
-            - python2-mock
-            - python2-nose
-            - python2-numpy
-            - python2-numpy-doc
-            - python2-numpy-f2py
-            - python2-pip
-            - python2-pluggy
-            - python2-psycopg2
-            - python2-psycopg2-debug
-            - python2-psycopg2-tests
-            - python2-py
-            - python2-pygments
-            - python2-pymongo
-            - python2-pymongo-gridfs
-            - python2-PyMySQL
-            - python2-pysocks
-            - python2-pytest
-            - python2-pytest-mock
-            - python2-pytz
-            - python2-pyyaml
-            - python2-requests
-            - python2-rpm-macros
-            - python2-scipy
-            - python2-setuptools
-            - python2-setuptools_scm
-            - python2-six
-            - python2-sqlalchemy
-            - python2-test
-            - python2-tkinter
-            - python2-tools
-            - python2-urllib3
-            - python2-virtualenv
-            - python2-wheel
-    buildopts:
-        rpms:
-            macros: |
-                # Note that we cannot disable building of all Python 3 subpackages,
-                # because python2-devel (needed to build all Python 2 packages)
-                # has a runtime dependency on python3-rpm-generators, and that
-                # package requires python3-setuptools at runtime. By rebuilding
-                # python-setuptools SRPM with only python2, we overshadow the
-                # already built python3 subpackage and it is no longer
-                # available for python3-rpm-generators when building python-pip
-                # (or any other Python package).
-                # We can disable Python 3 in all packages but ...
-                %_without_python3 1
-                # ... we have to have a way to enable some of them as described
-                # above. With this macro, we can add some module-specific
-                # conditions for python3-* subpackages and other special cases.
-                # %_with_python27_module 1
+  name: python27
+  stream: 2.7
+  summary: Python programming language, version 2.7
+  description: >-
+    This module provides the Python 2.7 interpreter and additional Python
 
-                # for: python-jinja2
-                %_with_python2 1
+    packages the users might need.
+  license:
+    module:
+    - MIT
+  dependencies:
+  - buildrequires:
+      platform: [el8]
+      python27: [2.7]
+    requires:
+      platform: [el8]
+  references:
+    community: https://www.python.org/
+    documentation: https://docs.python.org/2.7/
+  profiles:
+    common:
+      rpms:
+      - python2
+      - python2-libs
+      - python2-pip
+      - python2-setuptools
+  api:
+    rpms:
+    - babel
+    - python-sqlalchemy-doc
+    - python2
+    - python2-Cython
+    - python2-PyMySQL
+    - python2-attrs
+    - python2-babel
+    - python2-backports
+    - python2-backports-ssl_match_hostname
+    - python2-bson
+    - python2-chardet
+    - python2-coverage
+    - python2-debug
+    - python2-devel
+    - python2-dns
+    - python2-docs
+    - python2-docs-info
+    - python2-docutils
+    - python2-funcsigs
+    - python2-idna
+    - python2-ipaddress
+    - python2-jinja2
+    - python2-libs
+    - python2-lxml
+    - python2-markupsafe
+    - python2-mock
+    - python2-nose
+    - python2-numpy
+    - python2-numpy-doc
+    - python2-numpy-f2py
+    - python2-pip
+    - python2-pluggy
+    - python2-psycopg2
+    - python2-psycopg2-debug
+    - python2-psycopg2-tests
+    - python2-py
+    - python2-pygments
+    - python2-pymongo
+    - python2-pymongo-gridfs
+    - python2-pysocks
+    - python2-pytest
+    - python2-pytest-mock
+    - python2-pytz
+    - python2-pyyaml
+    - python2-requests
+    - python2-rpm-macros
+    - python2-scipy
+    - python2-setuptools
+    - python2-setuptools_scm
+    - python2-six
+    - python2-sqlalchemy
+    - python2-test
+    - python2-tkinter
+    - python2-tools
+    - python2-urllib3
+    - python2-virtualenv
+    - python2-wheel
+  filter:
+    rpms:
+    - python3-Cython
+    - python3-PyMySQL
+    - python3-PyYAML
+    - python3-attrs
+    - python3-babel
+    - python3-bson
+    - python3-chardet
+    - python3-coverage
+    - python3-docutils
+    - python3-idna
+    - python3-jinja2
+    - python3-markupsafe
+    - python3-mock
+    - python3-nose
+    - python3-numpy
+    - python3-numpy-doc
+    - python3-numpy-f2py
+    - python3-pluggy
+    - python3-psycopg2
+    - python3-psycopg2-debug
+    - python3-psycopg2-tests
+    - python3-py
+    - python3-pygments
+    - python3-pymongo
+    - python3-pymongo-gridfs
+    - python3-pysocks
+    - python3-pytest
+    - python3-pytest-mock
+    - python3-pytz
+    - python3-requests
+    - python3-scipy
+    - python3-setuptools_scm
+    - python3-six
+    - python3-sqlalchemy
+    - python3-urllib3
+    - python3-virtualenv
+  buildopts:
+    rpms:
+      macros: |
+        # Note that we cannot disable building of all Python 3 subpackages,
+        # because python2-devel (needed to build all Python 2 packages)
+        # has a runtime dependency on python3-rpm-generators, and that
+        # package requires python3-setuptools at runtime. By rebuilding
+        # python-setuptools SRPM with only python2, we overshadow the
+        # already built python3 subpackage and it is no longer
+        # available for python3-rpm-generators when building python-pip
+        # (or any other Python package).
+        # We can disable Python 3 in all packages but ...
+        %_without_python3 1
+        # ... we have to have a way to enable some of them as described
+        # above. With this macro, we can add some module-specific
+        # conditions for python3-* subpackages and other special cases.
+        # %_with_python27_module 1
 
-                # to solve circular dependency between pytest and [attrs, pluggy]
-                # %_without_tests 1
-    components:
-        rpms:
-            babel:
-                rationale: Tools for internationalizing Python applications
-                ref: stream-2.5.1-rhel-8.1.0
-            Cython:
-                rationale:
-                    Language for writing Python extension modules.
-                    Build dependency of numpy and PyYAML
-                ref: stream-0.28.1-rhel-8.1.0
-            numpy:
-                rationale: A fast multidimensional array facility for Python
-                ref: stream-1.14.2-rhel-8.1.0
-            pytest:
-                rationale: Simple powerful testing with Python
-                ref: stream-3.4.2-rhel-8.1.0
-            python2:
-                rationale: Main Python language interpreter
-                ref: stream-2.7-rhel-8.1.0
-            python2-pip:
-                rationale: Python Packaging ecosystem
-                ref: stream-9.0.3-rhel-8.1.0
-            python2-rpm-macros:
-                rationale: Python 2 RPM macros - dependency of python2-devel
-                ref: stream-python27-rhel-8.1.0
-            python2-setuptools:
-                rationale: Python Packaging ecosystem
-                ref: stream-39.0.1-rhel-8.1.0
-            python-PyMySQL:
-                rationale: Python adapter for the MySQL/MariaDB databases
-                ref: stream-0.8.0-rhel-8.1.0
-            python-attrs:
-                rationale: Python attributes without boilerplate
-                ref: stream-17.4.0-rhel-8.1.0
-            python-backports:
-                rationale: Namespace for backported Python features
-                ref: stream-1.0-rhel-8.1.0
-            python-backports-ssl_match_hostname:
-                rationale:
-                    The ssl.match_hostname() function from Python 3.
-                    Dependency of urllib3/requests.
-                ref: stream-3.5.0.1-rhel-8.1.0
-            python-chardet:
-                rationale:
-                    Character encoding auto-detection in Python.
-                    Dependency of requests.
-                ref: stream-3.0.4-rhel-8.1.0
-            python-coverage:
-                rationale: Code coverage testing module for Python
-                ref: stream-4.5.1-rhel-8.1.0
-            python-dns:
-                rationale: DNS toolkit for Python. Useful package for IPA and mailman.
-                ref: stream-1.15.0-rhel-8.1.0
-            python-docutils:
-                rationale: System for processing plaintext documentation
-                ref: stream-0.14-rhel-8.1.0
-            python-funcsigs:
-                rationale:
-                    Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+.
-                    Dependency of Pytest and mock.
-                ref: stream-1.0.2-rhel-8.1.0
-            python-idna:
-                rationale:
-                    Internationalized Domain Names in Applications (IDNA).
-                    Dependency of requests.
-                ref: stream-2.5-rhel-8.1.0
-            python-ipaddress:
-                rationale:
-                    Port of the python 3.3+ ipaddress module to 2.6+.
-                    Dependency of urllib3/requests.
-                ref: stream-1.0.18-rhel-8.1.0
-            python-jinja2:
-                rationale: General purpose template engine
-                ref: stream-2.10-rhel-8.1.0
-            python-markupsafe:
-                rationale:
-                    Implements a XML/HTML/XHTML Markup safe string for Python
-                ref: stream-0.23-rhel-8.1.0
-            python-mock:
-                rationale: A Python Mocking and Patching Library for Testing
-                ref: stream-2.0.0-rhel-8.1.0
-            python-nose:
-                rationale: Discovery-based unit test extension for Python
-                ref: stream-1.3.7-rhel-8.1.0
-            python-pluggy:
-                rationale: The plugin manager stripped of pytest specific details
-                ref: stream-0.6.0-rhel-8.1.0
-            python-psycopg2:
-                rationale: Python adapter for the PostgreSQL database
-                ref: stream-2.7.4-rhel-8.1.0
-            python-py:
-                rationale: Library with cross-python path, ini-parsing, io, code, log facilities
-                ref: stream-1.5.3-rhel-8.1.0
-            python-pygments:
-                rationale: Syntax highlighting engine written in Python
-                ref: stream-2.2.0-rhel-8.1.0
-            python-pymongo:
-                # Package maintainer: mskalick
-                rationale: Python driver for MongoDB
-                ref: stream-3.6.1-rhel-8.1.0
-            python-pysocks:
-                rationale: A Python SOCKS client module. Dependency of urllib3/requests.
-                ref: stream-1.6.8-rhel-8.1.0
-            python-pytest-mock:
-                rationale:
-                    Thin-wrapper around the mock package for easier use with py.test.
-                    Build dependency of requests.
-                ref: stream-1.9.0-rhel-8.1.0
-            python-requests:
-                rationale: HTTP library, written in Python, for human beings
-                ref: stream-2.20.0-rhel-8.1.0
-            python-setuptools_scm:
-                rationale:
-                    Blessed package to manage your versions by scm tags.
-                    Build dependency of pytest and pytest-mock.
-                ref: stream-1.15.7-rhel-8.1.0
-            python-six:
-                rationale: Python 2 and 3 compatibility utilities
-                ref: stream-1.11.0-rhel-8.1.0
-            python-sqlalchemy:
-                rationale: Modular and flexible ORM library for python
-                ref: stream-1.3.2-rhel-8.1.0
-            python-urllib3:
-                rationale:
-                    Python HTTP library with thread-safe connection pooling and file post.
-                    Dependency of requests.
-                ref: stream-1.23-rhel-8.1.0
-            python-virtualenv:
-                rationale: Tool to create isolated Python environments
-                ref: stream-15.1.0-rhel-8.1.0
-            python-wheel:
-                rationale: Used for unbundling of pip and setuptools
-                ref: stream-0.30.0-rhel-8.1.0
-            pytz:
-                rationale: Runtime requires of babel, and python2-babel
-                ref: stream-2017.2-rhel-8.1.0
-            PyYAML:
-                rationale: YAML parser and emitter for Python
-                ref: stream-3.12-rhel-8.1.0
-            scipy:
-                rationale: Scientific Tools for Python
-                ref: stream-1.0.0-rhel-8.1.0
-            python-lxml:
-                rationale: XML processing library
-                ref: stream-4.2.3-rhel-8.1.0
-            python-docs:
-                rationale: Documentation for Python
-                ref: stream-2.7-rhel-8.1.0
+        # for: python-jinja2
+        %_with_python2 1
+
+        # to solve circular dependency between pytest and [attrs, pluggy]
+        # %_without_tests 1
+  components:
+    rpms:
+      Cython:
+        rationale: Language for writing Python extension modules. Build dependency
+          of numpy and PyYAML
+        ref: stream-0.28.1-rhel-8.2.0
+      PyYAML:
+        rationale: YAML parser and emitter for Python
+        ref: stream-3.12-rhel-8.2.0
+      babel:
+        rationale: Tools for internationalizing Python applications
+        ref: stream-2.5.1-rhel-8.2.0
+      numpy:
+        rationale: A fast multidimensional array facility for Python
+        ref: stream-1.14.2-rhel-8.2.0
+      pytest:
+        rationale: Simple powerful testing with Python
+        ref: stream-3.4.2-rhel-8.2.0
+      python-PyMySQL:
+        rationale: Python adapter for the MySQL/MariaDB databases
+        ref: stream-0.8.0-rhel-8.2.0
+      python-attrs:
+        rationale: Python attributes without boilerplate
+        ref: stream-17.4.0-rhel-8.2.0
+      python-backports:
+        rationale: Namespace for backported Python features
+        ref: stream-1.0-rhel-8.2.0
+      python-backports-ssl_match_hostname:
+        rationale: The ssl.match_hostname() function from Python 3. Dependency of
+          urllib3/requests.
+        ref: stream-3.5.0.1-rhel-8.2.0
+      python-chardet:
+        rationale: Character encoding auto-detection in Python. Dependency of requests.
+        ref: stream-3.0.4-rhel-8.2.0
+      python-coverage:
+        rationale: Code coverage testing module for Python
+        ref: stream-4.5.1-rhel-8.2.0
+      python-dns:
+        rationale: DNS toolkit for Python. Useful package for IPA and mailman.
+        ref: stream-1.15.0-rhel-8.2.0
+      python-docs:
+        rationale: Documentation for Python
+        ref: stream-2.7-rhel-8.2.0
+      python-docutils:
+        rationale: System for processing plaintext documentation
+        ref: stream-0.14-rhel-8.2.0
+      python-funcsigs:
+        rationale: Python function signatures from PEP362 for Python 2.6, 2.7 and
+          3.2+. Dependency of Pytest and mock.
+        ref: stream-1.0.2-rhel-8.2.0
+      python-idna:
+        rationale: Internationalized Domain Names in Applications (IDNA). Dependency
+          of requests.
+        ref: stream-2.5-rhel-8.2.0
+      python-ipaddress:
+        rationale: Port of the python 3.3+ ipaddress module to 2.6+. Dependency of
+          urllib3/requests.
+        ref: stream-1.0.18-rhel-8.2.0
+      python-jinja2:
+        rationale: General purpose template engine
+        ref: stream-2.10-rhel-8.2.0
+      python-lxml:
+        rationale: XML processing library
+        ref: stream-4.2.3-rhel-8.2.0
+      python-markupsafe:
+        rationale: Implements a XML/HTML/XHTML Markup safe string for Python
+        ref: stream-0.23-rhel-8.2.0
+      python-mock:
+        rationale: A Python Mocking and Patching Library for Testing
+        ref: stream-2.0.0-rhel-8.2.0
+      python-nose:
+        rationale: Discovery-based unit test extension for Python
+        ref: stream-1.3.7-rhel-8.2.0
+      python-pluggy:
+        rationale: The plugin manager stripped of pytest specific details
+        ref: stream-0.6.0-rhel-8.2.0
+      python-psycopg2:
+        rationale: Python adapter for the PostgreSQL database
+        ref: stream-2.7.4-rhel-8.2.0
+      python-py:
+        rationale: Library with cross-python path, ini-parsing, io, code, log facilities
+        ref: stream-1.5.3-rhel-8.2.0
+      python-pygments:
+        rationale: Syntax highlighting engine written in Python
+        ref: stream-2.2.0-rhel-8.2.0
+      python-pymongo:
+        rationale: Python driver for MongoDB
+        ref: stream-3.6.1-rhel-8.2.0
+      python-pysocks:
+        rationale: A Python SOCKS client module. Dependency of urllib3/requests.
+        ref: stream-1.6.8-rhel-8.2.0
+      python-pytest-mock:
+        rationale: Thin-wrapper around the mock package for easier use with py.test.
+          Build dependency of requests.
+        ref: stream-1.9.0-rhel-8.2.0
+      python-requests:
+        rationale: HTTP library, written in Python, for human beings
+        ref: stream-2.20.0-rhel-8.2.0
+      python-setuptools_scm:
+        rationale: Blessed package to manage your versions by scm tags. Build dependency
+          of pytest and pytest-mock.
+        ref: stream-1.15.7-rhel-8.2.0
+      python-six:
+        rationale: Python 2 and 3 compatibility utilities
+        ref: stream-1.11.0-rhel-8.2.0
+      python-sqlalchemy:
+        rationale: Modular and flexible ORM library for python
+        ref: stream-1.3.2-rhel-8.2.0
+      python-urllib3:
+        rationale: Python HTTP library with thread-safe connection pooling and file
+          post. Dependency of requests.
+        ref: stream-1.23-rhel-8.2.0
+      python-virtualenv:
+        rationale: Tool to create isolated Python environments
+        ref: stream-15.1.0-rhel-8.2.0
+      python-wheel:
+        rationale: Used for unbundling of pip and setuptools
+        ref: stream-0.30.0-rhel-8.2.0
+      python2:
+        rationale: Main Python language interpreter
+        ref: stream-2.7-rhel-8.2.0
+      python2-pip:
+        rationale: Python Packaging ecosystem
+        ref: stream-9.0.3-rhel-8.2.0
+      python2-rpm-macros:
+        rationale: Python 2 RPM macros - dependency of python2-devel
+        ref: stream-python27-rhel-8.2.0
+      python2-setuptools:
+        rationale: Python Packaging ecosystem
+        ref: stream-39.0.1-rhel-8.2.0
+      pytz:
+        rationale: Runtime requires of babel, and python2-babel
+        ref: stream-2017.2-rhel-8.2.0
+      scipy:
+        rationale: Scientific Tools for Python
+        ref: stream-1.0.0-rhel-8.2.0
+...