diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 30cdc43..ded9d11 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -153,135 +153,135 @@ data:
       Cython:
         rationale: Language for writing Python extension modules. Build dependency
           of numpy and PyYAML
-        ref: stream-0.28.1-rhel-8.3.0
+        ref: stream-0.28.1-rhel-8.4.0
       PyYAML:
         rationale: YAML parser and emitter for Python
-        ref: stream-3.12-rhel-8.3.0
+        ref: stream-3.12-rhel-8.4.0
       babel:
         rationale: Tools for internationalizing Python applications
-        ref: stream-2.5.1-rhel-8.3.0
+        ref: stream-2.5.1-rhel-8.4.0
       numpy:
         rationale: A fast multidimensional array facility for Python
-        ref: stream-1.14.2-rhel-8.3.0
+        ref: stream-1.14.2-rhel-8.4.0
       pytest:
         rationale: Simple powerful testing with Python
-        ref: stream-3.4.2-rhel-8.3.0
+        ref: stream-3.4.2-rhel-8.4.0
       python-PyMySQL:
         rationale: Python adapter for the MySQL/MariaDB databases
-        ref: stream-0.8.0-rhel-8.3.0
+        ref: stream-0.8.0-rhel-8.4.0
       python-attrs:
         rationale: Python attributes without boilerplate
-        ref: stream-17.4.0-rhel-8.3.0
+        ref: stream-17.4.0-rhel-8.4.0
       python-backports:
         rationale: Namespace for backported Python features
-        ref: stream-1.0-rhel-8.3.0
+        ref: stream-1.0-rhel-8.4.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.3.0
+        ref: stream-3.5.0.1-rhel-8.4.0
       python-chardet:
         rationale: Character encoding auto-detection in Python. Dependency of requests.
-        ref: stream-3.0.4-rhel-8.3.0
+        ref: stream-3.0.4-rhel-8.4.0
       python-coverage:
         rationale: Code coverage testing module for Python
-        ref: stream-4.5.1-rhel-8.3.0
+        ref: stream-4.5.1-rhel-8.4.0
       python-dns:
         rationale: DNS toolkit for Python. Useful package for IPA and mailman.
-        ref: stream-1.15.0-rhel-8.3.0
+        ref: stream-1.15.0-rhel-8.4.0
       python-docs:
         rationale: Documentation for Python
-        ref: stream-2.7-rhel-8.3.0
+        ref: stream-2.7-rhel-8.4.0
       python-docutils:
         rationale: System for processing plaintext documentation
-        ref: stream-0.14-rhel-8.3.0
+        ref: stream-0.14-rhel-8.4.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.3.0
+        ref: stream-1.0.2-rhel-8.4.0
       python-idna:
         rationale: Internationalized Domain Names in Applications (IDNA). Dependency
           of requests.
-        ref: stream-2.5-rhel-8.3.0
+        ref: stream-2.5-rhel-8.4.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.3.0
+        ref: stream-1.0.18-rhel-8.4.0
       python-jinja2:
         rationale: General purpose template engine
-        ref: stream-2.10-rhel-8.3.0
+        ref: stream-2.10-rhel-8.4.0
       python-lxml:
         rationale: XML processing library
-        ref: stream-4.2.3-rhel-8.3.0
+        ref: stream-4.2.3-rhel-8.4.0
       python-markupsafe:
         rationale: Implements a XML/HTML/XHTML Markup safe string for Python
-        ref: stream-0.23-rhel-8.3.0
+        ref: stream-0.23-rhel-8.4.0
       python-mock:
         rationale: A Python Mocking and Patching Library for Testing
-        ref: stream-2.0.0-rhel-8.3.0
+        ref: stream-2.0.0-rhel-8.4.0
       python-nose:
         rationale: Discovery-based unit test extension for Python
-        ref: stream-1.3.7-rhel-8.3.0
+        ref: stream-1.3.7-rhel-8.4.0
       python-pluggy:
         rationale: The plugin manager stripped of pytest specific details
-        ref: stream-0.6.0-rhel-8.3.0
+        ref: stream-0.6.0-rhel-8.4.0
       python-psycopg2:
         rationale: Python adapter for the PostgreSQL database
-        ref: stream-2.7.4-rhel-8.3.0
+        ref: stream-2.7.4-rhel-8.4.0
       python-py:
         rationale: Library with cross-python path, ini-parsing, io, code, log facilities
-        ref: stream-1.5.3-rhel-8.3.0
+        ref: stream-1.5.3-rhel-8.4.0
       python-pygments:
         rationale: Syntax highlighting engine written in Python
-        ref: stream-2.2.0-rhel-8.3.0
+        ref: stream-2.2.0-rhel-8.4.0
       python-pymongo:
         rationale: Python driver for MongoDB
-        ref: stream-3.6.1-rhel-8.3.0
+        ref: stream-3.6.1-rhel-8.4.0
       python-pysocks:
         rationale: A Python SOCKS client module. Dependency of urllib3/requests.
-        ref: stream-1.6.8-rhel-8.3.0
+        ref: stream-1.6.8-rhel-8.4.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.3.0
+        ref: stream-1.9.0-rhel-8.4.0
       python-requests:
         rationale: HTTP library, written in Python, for human beings
-        ref: stream-2.20.0-rhel-8.3.0
+        ref: stream-2.20.0-rhel-8.4.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.3.0
-      python-six:
+        ref: stream-1.15.7-rhel-8.4.0
+      python2-six:
         rationale: Python 2 and 3 compatibility utilities
-        ref: stream-1.11.0-rhel-8.3.0
+        ref: stream-1.11.0-rhel-8.4.0
       python-sqlalchemy:
         rationale: Modular and flexible ORM library for python
-        ref: stream-1.3.2-rhel-8.3.0
+        ref: stream-1.3.2-rhel-8.4.0
       python-urllib3:
         rationale: Python HTTP library with thread-safe connection pooling and file
           post. Dependency of requests.
-        ref: stream-1.23-rhel-8.3.0
+        ref: stream-1.23-rhel-8.4.0
       python-virtualenv:
         rationale: Tool to create isolated Python environments
-        ref: stream-15.1.0-rhel-8.3.0
+        ref: stream-15.1.0-rhel-8.4.0
       python-wheel:
         rationale: Used for unbundling of pip and setuptools
-        ref: stream-0.30.0-rhel-8.3.0
+        ref: stream-0.30.0-rhel-8.4.0
       python2:
         rationale: Main Python language interpreter
-        ref: stream-2.7-rhel-8.3.0
+        ref: stream-2.7-rhel-8.4.0
       python2-pip:
         rationale: Python Packaging ecosystem
-        ref: stream-9.0.3-rhel-8.3.0
+        ref: stream-9.0.3-rhel-8.4.0
       python2-rpm-macros:
         rationale: Python 2 RPM macros - dependency of python2-devel
-        ref: stream-python27-rhel-8.3.0
+        ref: stream-python27-rhel-8.4.0
       python2-setuptools:
         rationale: Python Packaging ecosystem
-        ref: stream-39.0.1-rhel-8.3.0
+        ref: stream-39.0.1-rhel-8.4.0
       pytz:
         rationale: Runtime requires of babel, and python2-babel
-        ref: stream-2017.2-rhel-8.3.0
+        ref: stream-2017.2-rhel-8.4.0
       scipy:
         rationale: Scientific Tools for Python
-        ref: stream-1.0.0-rhel-8.3.0
+        ref: stream-1.0.0-rhel-8.4.0
 ...