diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 2f17c6e..2316221 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -238,130 +238,130 @@ data:
             #
             python38:
                 rationale: The main Python interpreter
-                ref: stream-3.8-rhel-8.6.0
+                ref: stream-3.8-rhel-8.7.0
             python3x-setuptools:
                 rationale: Packaging tool
-                ref: stream-41.6.0-rhel-8.6.0
+                ref: stream-41.6.0-rhel-8.7.0
             python-wheel:
                 rationale: Packaging tool
-                ref: stream-0.33.6-rhel-8.6.0
+                ref: stream-0.33.6-rhel-8.7.0
             python3x-pip:
                 rationale: Packaging tool
-                ref: stream-19.3.1-rhel-8.6.0
+                ref: stream-19.3.1-rhel-8.7.0
 
             python3x-six:
                 rationale: Python component
-                ref: stream-1.12.0-rhel-8.6.0
+                ref: stream-1.12.0-rhel-8.7.0
             python-py:
                 rationale: Python component
-                ref: stream-1.8.0-rhel-8.6.0
+                ref: stream-1.8.0-rhel-8.7.0
             python-chardet:
                 rationale: Python component
-                ref: stream-3.0.4-python38-rhel-8.6.0
+                ref: stream-3.0.4-python38-rhel-8.7.0
             python-attrs:
                 rationale: Python component
-                ref: stream-19.3.0-rhel-8.6.0
+                ref: stream-19.3.0-rhel-8.7.0
             python-pluggy:
                 rationale: Python component
-                ref: stream-0.13.0-rhel-8.6.0
+                ref: stream-0.13.0-rhel-8.7.0
             python-markupsafe:
                 rationale: Python component
-                ref: stream-1.1.1-rhel-8.6.0
+                ref: stream-1.1.1-rhel-8.7.0
             python-pysocks:
                 rationale: Python component
-                ref: stream-1.7.1-rhel-8.6.0
+                ref: stream-1.7.1-rhel-8.7.0
             python3x-pyparsing:
                 rationale: Python component
-                ref: stream-2.4.5-rhel-8.6.0
+                ref: stream-2.4.5-rhel-8.7.0
             python-atomicwrites:
                 rationale: Python component
-                ref: stream-1.3.0-rhel-8.6.0
+                ref: stream-1.3.0-rhel-8.7.0
             python-wcwidth:
                 rationale: Python component
-                ref: stream-0.1.7-rhel-8.6.0
+                ref: stream-0.1.7-rhel-8.7.0
             python-more-itertools:
                 rationale: Python component
-                ref: stream-7.2.0-rhel-8.6.0
+                ref: stream-7.2.0-rhel-8.7.0
             python-packaging:
                 rationale: Python component
-                ref: stream-19.2-rhel-8.6.0
+                ref: stream-19.2-rhel-8.7.0
             pytest:
                 rationale: Python component
-                ref: stream-4.6.6-rhel-8.6.0
+                ref: stream-4.6.6-rhel-8.7.0
             pytz:
                 rationale: Python component
-                ref: stream-2019.3-rhel-8.6.0
+                ref: stream-2019.3-rhel-8.7.0
             babel:
                 rationale: Python component
-                ref: stream-2.7.0-rhel-8.6.0
+                ref: stream-2.7.0-rhel-8.7.0
             python-idna:
                 rationale: Python component
-                ref: stream-2.8-rhel-8.6.0
+                ref: stream-2.8-rhel-8.7.0
             python-urllib3:
                 rationale: Python component
-                ref: stream-1.25.7-rhel-8.6.0
+                ref: stream-1.25.7-rhel-8.7.0
             Cython:
                 rationale: Python component
-                ref: stream-0.29.14-rhel-8.6.0
+                ref: stream-0.29.14-rhel-8.7.0
             python-asn1crypto:
                 rationale: Python component
-                ref: stream-1.2.0-rhel-8.6.0
+                ref: stream-1.2.0-rhel-8.7.0
             python-ply:
                 rationale: Python component
-                ref: stream-3.11-rhel-8.6.0
+                ref: stream-3.11-rhel-8.7.0
             python-psutil:
                 rationale: Python component
-                ref: stream-5.6.4-rhel-8.6.0
+                ref: stream-5.6.4-rhel-8.7.0
             python-psycopg2:
                 rationale: Python component
-                ref: stream-2.8.4-rhel-8.6.0
+                ref: stream-2.8.4-rhel-8.7.0
             mod_wsgi:
                 rationale: Python component
-                ref: stream-4.6.8-rhel-8.6.0
+                ref: stream-4.6.8-rhel-8.7.0
 
             python-requests:
                 rationale: Python component
-                ref: stream-2.22.0-rhel-8.6.0
+                ref: stream-2.22.0-rhel-8.7.0
                 # buildorder: 10
             python-jinja2:
                 rationale: Python component
-                ref: stream-2.10.3-rhel-8.6.0
+                ref: stream-2.11.3-rhel-8.7.0
                 # buildorder: 10
             numpy:
                 rationale: Python component
-                ref: stream-1.17.3-rhel-8.6.0
+                ref: stream-1.17.3-rhel-8.7.0
                 # buildorder: 10
             PyYAML:
                 rationale: Python component
-                ref: stream-5.3.1-rhel-8.6.0
+                ref: stream-5.3.1-rhel-8.7.0
                 # buildorder: 10
             python-pycparser:
                 rationale: Python component
-                ref: stream-2.19-rhel-8.6.0
+                ref: stream-2.19-rhel-8.7.0
                 # buildorder: 10
             python-lxml:
                 rationale: Python component
-                ref: stream-4.4.1-rhel-8.6.0
+                ref: stream-4.4.1-rhel-8.7.0
                 # buildorder: 10
 
             python-cffi:
                 rationale: Python component
-                ref: stream-1.13.2-rhel-8.6.0
+                ref: stream-1.13.2-rhel-8.7.0
                 # buildorder: 20
             scipy:
                 rationale: Python component
-                ref: stream-1.3.1-rhel-8.6.0
+                ref: stream-1.3.1-rhel-8.7.0
                 # buildorder: 20
 
             python-cryptography:
                 rationale: Python component
-                ref: stream-2.8-rhel-8.6.0
+                ref: stream-2.8-rhel-8.7.0
                 # needs cffi
                 # buildorder: 30
 
             python-PyMySQL:
                 rationale: Python component
-                ref: stream-0.10.1-python38-rhel-8.6.0
+                ref: stream-0.10.1-python38-rhel-8.7.0
                 # needs cryptography
                 # buildorder: 40
 ...
diff --git a/python38.yaml b/python38.yaml
deleted file mode 100644
index 83c58b5..0000000
--- a/python38.yaml
+++ /dev/null
@@ -1,218 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  name: python38
-  stream: "3.8"
-  summary: Python programming language, version 3.8
-  description: >-
-    This module gives users access to the internal Python 3.8 in RHEL8, as
-
-    well as provides some additional Python packages the users might need.
-
-    In addition to these you can install any python3-* package available
-
-    in RHEL and use it with Python from this module.
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      httpd: [2.4]
-      platform: [el8.6.0]
-      python38: [3.8-bootstrap]
-      swig: [3.0]
-    requires:
-      platform: [el8]
-  references:
-    community: https://www.python.org/
-    documentation: https://docs.python.org/3.8/
-  profiles:
-    build:
-      rpms:
-      - python38
-      - python38-devel
-      - python38-rpm-macros
-    common:
-      rpms:
-      - python38
-  api:
-    rpms:
-    - python38
-    - python38-Cython
-    - python38-PyMySQL
-    - python38-asn1crypto
-    - python38-babel
-    - python38-cffi
-    - python38-chardet
-    - python38-cryptography
-    - python38-devel
-    - python38-idle
-    - python38-idna
-    - python38-jinja2
-    - python38-libs
-    - python38-lxml
-    - python38-markupsafe
-    - python38-mod_wsgi
-    - python38-numpy
-    - python38-numpy-f2py
-    - python38-pip
-    - python38-pip-wheel
-    - python38-ply
-    - python38-psutil
-    - python38-psycopg2
-    - python38-pycparser
-    - python38-pysocks
-    - python38-pytz
-    - python38-pyyaml
-    - python38-requests
-    - python38-rpm-macros
-    - python38-scipy
-    - python38-setuptools
-    - python38-setuptools-wheel
-    - python38-six
-    - python38-test
-    - python38-tkinter
-    - python38-urllib3
-    - python38-wheel
-    - python38-wheel-wheel
-  filter:
-    rpms:
-    - python38-atomicwrites
-    - python38-attrs
-    - python38-more-itertools
-    - python38-packaging
-    - python38-pluggy
-    - python38-py
-    - python38-pyparsing
-    - python38-pytest
-    - python38-wcwidth
-  buildopts:
-    rpms:
-      macros: >
-        # === Bootstrap phase 3/4 ===
-
-        #
-
-        %python3_pkgversion 38
-
-        %_without_python2 1
-
-        # py, pyparsing, atomicwrites, packaging, pytest
-
-        %_without_docs 1
-  components:
-    rpms:
-      Cython:
-        rationale: Python component
-        ref: 6fd15dc5dd8beba861c7dd2cae96c6ffdce479b1
-      PyYAML:
-        rationale: Python component
-        ref: 9a5a9a0393de544d88cb78a4fcfda18efc4759c5
-      babel:
-        rationale: Python component
-        ref: 227108b6f0c0f9686193e5c738c8ce70ff43db9e
-      mod_wsgi:
-        rationale: Python component
-        ref: 8add44143f3b76d4eb0a4e5237b86d7770afd971
-      numpy:
-        rationale: Python component
-        ref: dfb61a142f90c0b8495f4645d2835f8ba8383257
-      pytest:
-        rationale: Python component
-        ref: d2854f6746913377d27f49ac2be01c1e6aa16ff5
-      python-PyMySQL:
-        rationale: Python component
-        ref: 173146ccc90488b5c442d4011464ab13673e5e0e
-      python-asn1crypto:
-        rationale: Python component
-        ref: a76406f22f1df8af46439738f675f42c38c55328
-      python-atomicwrites:
-        rationale: Python component
-        ref: b94fddf57c6fbd09c9d7bd5a9d7dd666376e5386
-      python-attrs:
-        rationale: Python component
-        ref: e9bcb854a4017201a396d14a2f941a37a13010f3
-      python-cffi:
-        rationale: Python component
-        ref: 7863c65b2cc9d3caf9e21d8a0da66430f38dbca2
-      python-chardet:
-        rationale: Python component
-        ref: 04b5d1be6d2e14ece3a43caa87b79216ea35b65a
-      python-cryptography:
-        rationale: Python component
-        ref: 5c743a97fdb06d99fc583a7be55ea1dd0050dd6f
-      python-idna:
-        rationale: Python component
-        ref: f31aae82e6cc6bf72df28f33a6f79e0d9869dc18
-      python-jinja2:
-        rationale: Python component
-        ref: aa2c5985d72f71ebc735ac40b42f3e594cf72eed
-      python-lxml:
-        rationale: Python component
-        ref: cb6cf79636c57a6e5f59f6f9dac329a56b21f783
-      python-markupsafe:
-        rationale: Python component
-        ref: 411ed0ff3ec0682aeef30fead3696673096fca82
-      python-more-itertools:
-        rationale: Python component
-        ref: e1d5d8a6b5d705f7dd4e3253ae33c7560cbd2150
-      python-packaging:
-        rationale: Python component
-        ref: 419429934421600cc834be5890be0400bfb7620a
-      python-pluggy:
-        rationale: Python component
-        ref: ba5dde76d5398b1c869eaaf2619bf7061d472fb6
-      python-ply:
-        rationale: Python component
-        ref: f113e7017224318a0e816f6e78f938187ff60515
-      python-psutil:
-        rationale: Python component
-        ref: e9f4c9756ebddcc6b2ebdc20050bc90a64a9f50f
-      python-psycopg2:
-        rationale: Python component
-        ref: d5342d2c15e078b550a5142647bed6310e34a9e7
-      python-py:
-        rationale: Python component
-        ref: 725721338027fabba187fcee663ee3e9bd3290d7
-      python-pycparser:
-        rationale: Python component
-        ref: d8780afffcee334655c6afc845213e51cc118423
-      python-pysocks:
-        rationale: Python component
-        ref: 483216203ae75373f15aea373c80ee0585c13e63
-      python-requests:
-        rationale: Python component
-        ref: 4f3cf0a863b3375816762185a43f454db4485c18
-      python-urllib3:
-        rationale: Python component
-        ref: f4a8dde4dc7d391cb3ee1902ff409fb145cb1c6d
-      python-wcwidth:
-        rationale: Python component
-        ref: be8f2b04d24c914cf2743628f95138cd91d58b44
-      python-wheel:
-        rationale: Packaging tool
-        ref: 978b5e98e50979fd0d5e9c3fecee62dab896bcc9
-      python38:
-        rationale: The main Python interpreter
-        ref: c71d4e501fdee9d0c0606c346328b9e733f40a22
-      python3x-pip:
-        rationale: Packaging tool
-        ref: 5250f20417253e48e7f06c845f102da222758ba1
-      python3x-pyparsing:
-        rationale: Python component
-        ref: 83e48edf172c5764192df37c87f61509132e98cc
-      python3x-setuptools:
-        rationale: Packaging tool
-        ref: 56fb730eaa8459d2f8b0c76104722b751761518a
-      python3x-six:
-        rationale: Python component
-        ref: 79212410a62640d6ba6fb9bee8c6f8ed88a7401f
-      pytz:
-        rationale: Python component
-        ref: e511e149f15c72f6899fcb6ec77d16b5f601b6bd
-      scipy:
-        rationale: Python component
-        ref: 9b831368aba1a84483e855a720a7c74799fb9aa7
-...
-