diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 0b3713e..3fb3791 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -12,7 +12,6 @@ data:
             - MIT
     dependencies:
         - buildrequires:
-              mongodb: [3.6]
               platform: [el8]
               # Depend on the previous build of this module so all the
               # dependencies already exist and we don't have to build one
@@ -154,147 +153,147 @@ data:
         rpms:
             babel:
                 rationale: Tools for internationalizing Python applications
-                ref: stream-2.5.1-rhel-8.0.0
+                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.0.0
+                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.0.0
+                ref: stream-1.14.2-rhel-8.1.0
             pytest:
                 rationale: Simple powerful testing with Python
-                ref: stream-3.4.2-rhel-8.0.0
+                ref: stream-3.4.2-rhel-8.1.0
             python2:
                 rationale: Main Python language interpreter
-                ref: stream-2.7-rhel-8.0.0
+                ref: stream-2.7-rhel-8.1.0
             python2-pip:
                 rationale: Python Packaging ecosystem
-                ref: stream-9.0.3-rhel-8.0.0
+                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.0.0
+                ref: stream-python27-rhel-8.1.0
             python2-setuptools:
                 rationale: Python Packaging ecosystem
-                ref: stream-39.0.1-rhel-8.0.0
+                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.0.0
+                ref: stream-0.8.0-rhel-8.1.0
             python-attrs:
                 rationale: Python attributes without boilerplate
-                ref: stream-17.4.0-rhel-8.0.0
+                ref: stream-17.4.0-rhel-8.1.0
             python-backports:
                 rationale: Namespace for backported Python features
-                ref: stream-1.0-rhel-8.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                ref: stream-1.15.0-rhel-8.1.0
             python-docutils:
                 rationale: System for processing plaintext documentation
-                ref: stream-0.14-rhel-8.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                ref: stream-1.0.18-rhel-8.1.0
             python-jinja2:
                 rationale: General purpose template engine
-                ref: stream-2.10-rhel-8.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                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.0.0
+                ref: stream-1.23-rhel-8.1.0
             python-virtualenv:
                 rationale: Tool to create isolated Python environments
-                ref: stream-15.1.0-rhel-8.0.0
+                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.0.0
+                ref: stream-0.30.0-rhel-8.1.0
             pytz:
                 rationale: Runtime requires of babel, and python2-babel
-                ref: stream-2017.2-rhel-8.0.0
+                ref: stream-2017.2-rhel-8.1.0
             PyYAML:
                 rationale: YAML parser and emitter for Python
-                ref: stream-3.12-rhel-8.0.0
+                ref: stream-3.12-rhel-8.1.0
             scipy:
                 rationale: Scientific Tools for Python
-                ref: stream-1.0.0-rhel-8.0.0
+                ref: stream-1.0.0-rhel-8.1.0
             python-lxml:
                 rationale: XML processing library
-                ref: stream-4.2.3-rhel-8.0.0
+                ref: stream-4.2.3-rhel-8.1.0
             python-docs:
                 rationale: Documentation for Python
-                ref: stream-2.7-rhel-8.0.0
+                ref: stream-2.7-rhel-8.1.0
diff --git a/python27.yaml b/python27.yaml
deleted file mode 100644
index 82bfa7b..0000000
--- a/python27.yaml
+++ /dev/null
@@ -1,283 +0,0 @@
-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:
-      mongodb: [3.6]
-      platform: [el8.0.0]
-      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
-        # for: python-jinja2
-        %_with_python2 1
-        # to solve circular dependency between pytest and [attrs, pluggy]
-        # %_without_tests 1
-  components:
-    rpms:
-      babel:
-        rationale: Tools for internationalizing Python applications
-        ref: f4cde9af57ce7d6c1ad076f6af635604e6127f6b
-      Cython:
-        rationale: Language for writing Python extension modules. Build dependency
-          of numpy and PyYAML
-        ref: 4b5428fdce73211057cbc1bd05ba5eca5003664e
-      numpy:
-        rationale: A fast multidimensional array facility for Python
-        ref: db4ade4e20e0af65a0de48e463b3adf88b9c4ce3
-      pytest:
-        rationale: Simple powerful testing with Python
-        ref: fe975984f622cd62a037aa6a4bcdcd239cf4a892
-      python2:
-        rationale: Main Python language interpreter
-        ref: dd77da9bba031be1f09ff9e16efa065bed161120
-      python2-pip:
-        rationale: Python Packaging ecosystem
-        ref: d32402ab1d20952ac7ec14a4b6690ccec264584a
-      python2-rpm-macros:
-        rationale: Python 2 RPM macros - dependency of python2-devel
-        ref: 243b57f48cd96454cb993128a1a081a94998dd5b
-      python2-setuptools:
-        rationale: Python Packaging ecosystem
-        ref: fc97cd55317886033c4e3429464a53e7d58151c2 
-      python-PyMySQL:
-        rationale: Python adapter for the MySQL/MariaDB databases
-        ref: 605b65e3a15c44ee9fa3c7f3a0e9d64f7475805e
-      python-attrs:
-        rationale: Python attributes without boilerplate
-        ref: 4f9a13631dcbc5b7b8a1d6465e7ebf3250b9620b
-      python-backports:
-        rationale: Namespace for backported Python features
-        ref: 4a046a5f0922a9498e43ddc8b30d6b284c12f6e8
-      python-backports-ssl_match_hostname:
-        rationale: The ssl.match_hostname() function from Python 3. Dependency of
-          urllib3/requests.
-        ref: 7cd607c5f4afc98dd11099cb12f13922a9baa2dd
-      python-chardet:
-        rationale: Character encoding auto-detection in Python. Dependency of requests.
-        ref: a09219b7605df4be88a043ff0cd0839c5fb00df7
-      python-coverage:
-        rationale: Code coverage testing module for Python
-        ref: 807c9db77cae33232bb694456a9f42c5588602dd
-      python-dns:
-        rationale: DNS toolkit for Python. Useful package for IPA and mailman.
-        ref: ee76854812680824c3221b192b43b7d74d069503
-      python-docutils:
-        rationale: System for processing plaintext documentation
-        ref: ce0a27b26d3ef6035b0d970b872b548319fdba8b
-      python-funcsigs:
-        rationale: Python function signatures from PEP362 for Python 2.6, 2.7 and
-          3.2+. Dependency of Pytest and mock.
-        ref: 0117c972fe58f9cffe05e9b3f7bb6fdd4196d9ad
-      python-idna:
-        rationale: Internationalized Domain Names in Applications (IDNA). Dependency
-          of requests.
-        ref: 9562151f4b6f6460f2b9093fee292f5e9f0ed1ad
-      python-ipaddress:
-        rationale: Port of the python 3.3+ ipaddress module to 2.6+. Dependency of
-          urllib3/requests.
-        ref: e5ac1bebaa8d4c556c9883e17945f821543d482d
-      python-jinja2:
-        rationale: General purpose template engine
-        ref: f4b369b8e8e1c9d20d79d5eb76d56c49d429025f
-      python-markupsafe:
-        rationale: Implements a XML/HTML/XHTML Markup safe string for Python
-        ref: 807695700c9cad79f5be5146289703c32b111d7f
-      python-mock:
-        rationale: A Python Mocking and Patching Library for Testing
-        ref: 64d2d34db36b791a54a5cbe9eb7856610029de83
-      python-nose:
-        rationale: Discovery-based unit test extension for Python
-        ref: c6a3f5a6524b5eafb6fb31145f729da0377f9f5c
-      python-pluggy:
-        rationale: The plugin manager stripped of pytest specific details
-        ref: 62375de1025aa6e163650fe748d619a375ca722f
-      python-psycopg2:
-        rationale: Python adapter for the PostgreSQL database
-        ref: 7a10c71af98cefd36e03264a734550c33bf36bce
-      python-py:
-        rationale: Library with cross-python path, ini-parsing, io, code, log facilities
-        ref: e7febf9eaaaf5d143658e138f994fcdb6fb1ec66
-      python-pygments:
-        rationale: Syntax highlighting engine written in Python
-        ref: 1ee25355888321b13fd831b3f96d6b41e1c2facb
-      python-pymongo:
-        rationale: Python driver for MongoDB
-        ref: a7576c9ec2f175e68d2551d42ded67491e2dd05c
-      python-pysocks:
-        rationale: A Python SOCKS client module. Dependency of urllib3/requests.
-        ref: 5fff00f45523f7c8486cef7c60aa11112e7f71d3
-      python-pytest-mock:
-        rationale: Thin-wrapper around the mock package for easier use with py.test.
-          Build dependency of requests.
-        ref: 371f9138940ffdcb27e580809a13578de24fa0c5
-      python-requests:
-        rationale: HTTP library, written in Python, for human beings
-        ref: 77a5f2f16e896be2c2c148ec30e39630919fe8c9
-      python-setuptools_scm:
-        rationale: Blessed package to manage your versions by scm tags. Build dependency
-          of pytest and pytest-mock.
-        ref: 5a7fc0de9475843876214fe203f1fe9acbaaedda
-      python-six:
-        rationale: Python 2 and 3 compatibility utilities
-        ref: 9f6730c5d0b9ae1bf8581e3614ff914bfd7c318a
-      python-sqlalchemy:
-        rationale: Modular and flexible ORM library for python
-        ref: 71b3dbcb18a83d5fa7163436c486a9abc5ee1662
-      python-urllib3:
-        rationale: Python HTTP library with thread-safe connection pooling and file
-          post. Dependency of requests.
-        ref: 721b527fe8df9df1256499ff035dae1edeb1275f
-      python-virtualenv:
-        rationale: Tool to create isolated Python environments
-        ref: 9d6471b15520d28d43ebbdef6f4cfe2e9e270d8f
-      python-wheel:
-        rationale: Used for unbundling of pip and setuptools
-        ref: e6bb603c764161e3c9b0abed65a5624a0ee2fcb7
-      pytz:
-        rationale: Runtime requires of babel, and python2-babel
-        ref: 25f804ef78e98ad0d29e57e14af5d5c663ac43db
-      PyYAML:
-        rationale: YAML parser and emitter for Python
-        ref: c150709802fc90bc1c4b10588523ea4c8afa030c
-      scipy:
-        rationale: Scientific Tools for Python
-        ref: 38498a973a631e29ec6499cea1ec260b9889cf1a
-      python-lxml:
-        rationale: XML processing library
-        ref: f43624956d99481d9fdf0b33f343eee5c7061f30
-      python-docs:
-        rationale: Documentation for Python
-        ref: 3144ba3087e8d8fcc050a7be309f6d76ea2d90cd