diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index f6eb923..3e12925 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -129,19 +129,19 @@ data:
             #
             # python38:
             #     rationale: The main Python interpreter
-            #     ref: stream-3.8-rhel-8.2.0
+            #     ref: stream-3.8-rhel-8.3.0
             #     buildorder: 10
             # python3x-setuptools:
             #     rationale: Packaging tool
-            #     ref: stream-41.6.0-rhel-8.2.0
+            #     ref: stream-41.6.0-rhel-8.3.0
             #     buildorder: 20
             # python-wheel:
             #     rationale: Packaging tool
-            #     ref: stream-0.33.6-rhel-8.2.0
+            #     ref: stream-0.33.6-rhel-8.3.0
             #     buildorder: 30
             # python3x-pip:
             #     rationale: Packaging tool
-            #     ref: stream-19.3.1-rhel-8.2.0
+            #     ref: stream-19.3.1-rhel-8.3.0
             #     buildorder: 40
 
 
@@ -149,72 +149,72 @@ data:
             #
             # python3x-setuptools:
             #     rationale: Packaging tool
-            #     ref: stream-41.6.0-rhel-8.2.0
+            #     ref: stream-41.6.0-rhel-8.3.0
             #     buildorder: 10
             # python38:
             #     rationale: The main Python interpreter
-            #     ref: stream-3.8-rhel-8.2.0
+            #     ref: stream-3.8-rhel-8.3.0
             #     buildorder: 20
             # python-wheel:
             #     rationale: Packaging tool
-            #     ref: stream-0.33.6-rhel-8.2.0
+            #     ref: stream-0.33.6-rhel-8.3.0
             #     buildorder: 30
             # python3x-pip:
             #     rationale: Packaging tool
-            #     ref: stream-19.3.1-rhel-8.2.0
+            #     ref: stream-19.3.1-rhel-8.3.0
             #     buildorder: 30
             #
             # python-six:
             #     rationale: Python component
-            #     ref: stream-1.12.0-rhel-8.2.0
+            #     ref: stream-1.12.0-rhel-8.3.0
             #     buildorder: 30
             # python-py:
             #     rationale: Python component
-            #     ref: stream-1.8.0-rhel-8.2.0
+            #     ref: stream-1.8.0-rhel-8.3.0
             #     buildorder: 30
             # python-chardet:
             #     rationale: Python component
-            #     ref: stream-3.0.4-python38-rhel-8.2.0
+            #     ref: stream-3.0.4-python38-rhel-8.3.0
             #     buildorder: 30
             # python-attrs:
             #     rationale: Python component
-            #     ref: stream-19.3.0-rhel-8.2.0
+            #     ref: stream-19.3.0-rhel-8.3.0
             #     buildorder: 30
             # python-pluggy:
             #     rationale: Python component
-            #     ref: stream-0.13.0-rhel-8.2.0
+            #     ref: stream-0.13.0-rhel-8.3.0
             #     buildorder: 30
             # python-markupsafe:
             #     rationale: Python component
-            #     ref: stream-1.1.1-rhel-8.2.0
+            #     ref: stream-1.1.1-rhel-8.3.0
             #     buildorder: 30
             # python-pysocks:
             #     rationale: Python component
-            #     ref: stream-1.7.1-rhel-8.2.0
+            #     ref: stream-1.7.1-rhel-8.3.0
             #     buildorder: 30
             # python3x-pyparsing:
             #     rationale: Python component
-            #     ref: stream-2.4.5-rhel-8.2.0
+            #     ref: stream-2.4.5-rhel-8.3.0
             #     buildorder: 30
             # python-atomicwrites:
             #     rationale: Python component
-            #     ref: stream-1.3.0-rhel-8.2.0
+            #     ref: stream-1.3.0-rhel-8.3.0
             #     buildorder: 30
             # python-wcwidth:
             #     rationale: Python component
-            #     ref: stream-0.1.7-rhel-8.2.0
+            #     ref: stream-0.1.7-rhel-8.3.0
             #     buildorder: 30
             # python-more-itertools:
             #     rationale: Python component
-            #     ref: stream-7.2.0-rhel-8.2.0
+            #     ref: stream-7.2.0-rhel-8.3.0
             #     buildorder: 40
             # python-packaging:
             #     rationale: Python component
-            #     ref: stream-19.2-rhel-8.2.0
+            #     ref: stream-19.2-rhel-8.3.0
             #     buildorder: 40
             # pytest:
             #     rationale: Python component
-            #     ref: stream-4.6.6-rhel-8.2.0
+            #     ref: stream-4.6.6-rhel-8.3.0
             #     buildorder: 50
 
 
@@ -224,130 +224,130 @@ data:
             #
             python38:
                 rationale: The main Python interpreter
-                ref: stream-3.8-rhel-8.2.0
+                ref: stream-3.8-rhel-8.3.0
             python3x-setuptools:
                 rationale: Packaging tool
-                ref: stream-41.6.0-rhel-8.2.0
+                ref: stream-41.6.0-rhel-8.3.0
             python-wheel:
                 rationale: Packaging tool
-                ref: stream-0.33.6-rhel-8.2.0
+                ref: stream-0.33.6-rhel-8.3.0
             python3x-pip:
                 rationale: Packaging tool
-                ref: stream-19.3.1-rhel-8.2.0
+                ref: stream-19.3.1-rhel-8.3.0
 
             python-six:
                 rationale: Python component
-                ref: stream-1.12.0-rhel-8.2.0
+                ref: stream-1.12.0-rhel-8.3.0
             python-py:
                 rationale: Python component
-                ref: stream-1.8.0-rhel-8.2.0
+                ref: stream-1.8.0-rhel-8.3.0
             python-chardet:
                 rationale: Python component
-                ref: stream-3.0.4-python38-rhel-8.2.0
+                ref: stream-3.0.4-python38-rhel-8.3.0
             python-attrs:
                 rationale: Python component
-                ref: stream-19.3.0-rhel-8.2.0
+                ref: stream-19.3.0-rhel-8.3.0
             python-pluggy:
                 rationale: Python component
-                ref: stream-0.13.0-rhel-8.2.0
+                ref: stream-0.13.0-rhel-8.3.0
             python-markupsafe:
                 rationale: Python component
-                ref: stream-1.1.1-rhel-8.2.0
+                ref: stream-1.1.1-rhel-8.3.0
             python-pysocks:
                 rationale: Python component
-                ref: stream-1.7.1-rhel-8.2.0
+                ref: stream-1.7.1-rhel-8.3.0
             python3x-pyparsing:
                 rationale: Python component
-                ref: stream-2.4.5-rhel-8.2.0
+                ref: stream-2.4.5-rhel-8.3.0
             python-atomicwrites:
                 rationale: Python component
-                ref: stream-1.3.0-rhel-8.2.0
+                ref: stream-1.3.0-rhel-8.3.0
             python-wcwidth:
                 rationale: Python component
-                ref: stream-0.1.7-rhel-8.2.0
+                ref: stream-0.1.7-rhel-8.3.0
             python-more-itertools:
                 rationale: Python component
-                ref: stream-7.2.0-rhel-8.2.0
+                ref: stream-7.2.0-rhel-8.3.0
             python-packaging:
                 rationale: Python component
-                ref: stream-19.2-rhel-8.2.0
+                ref: stream-19.2-rhel-8.3.0
             pytest:
                 rationale: Python component
-                ref: stream-4.6.6-rhel-8.2.0
+                ref: stream-4.6.6-rhel-8.3.0
             pytz:
                 rationale: Python component
-                ref: stream-2019.3-rhel-8.2.0
+                ref: stream-2019.3-rhel-8.3.0
             babel:
                 rationale: Python component
-                ref: stream-2.7.0-rhel-8.2.0
+                ref: stream-2.7.0-rhel-8.3.0
             python-idna:
                 rationale: Python component
-                ref: stream-2.8-rhel-8.2.0
+                ref: stream-2.8-rhel-8.3.0
             python-urllib3:
                 rationale: Python component
-                ref: stream-1.25.7-rhel-8.2.0
+                ref: stream-1.25.7-rhel-8.3.0
             Cython:
                 rationale: Python component
-                ref: stream-0.29.14-rhel-8.2.0
+                ref: stream-0.29.14-rhel-8.3.0
             python-asn1crypto:
                 rationale: Python component
-                ref: stream-1.2.0-rhel-8.2.0
+                ref: stream-1.2.0-rhel-8.3.0
             python-ply:
                 rationale: Python component
-                ref: stream-3.11-rhel-8.2.0
+                ref: stream-3.11-rhel-8.3.0
             python-psutil:
                 rationale: Python component
-                ref: stream-5.6.4-rhel-8.2.0
+                ref: stream-5.6.4-rhel-8.3.0
             python-psycopg2:
                 rationale: Python component
-                ref: stream-2.8.4-rhel-8.2.0
+                ref: stream-2.8.4-rhel-8.3.0
             mod_wsgi:
                 rationale: Python component
-                ref: stream-4.6.8-rhel-8.2.0
+                ref: stream-4.6.8-rhel-8.3.0
 
             python-requests:
                 rationale: Python component
-                ref: stream-2.22.0-rhel-8.2.0
+                ref: stream-2.22.0-rhel-8.3.0
                 # buildorder: 10
             python-jinja2:
                 rationale: Python component
-                ref: stream-2.10.3-rhel-8.2.0
+                ref: stream-2.10.3-rhel-8.3.0
                 # buildorder: 10
             numpy:
                 rationale: Python component
-                ref: stream-1.17.3-rhel-8.2.0
+                ref: stream-1.17.3-rhel-8.3.0
                 # buildorder: 10
             PyYAML:
                 rationale: Python component
-                ref: stream-5.1.2-rhel-8.2.0
+                ref: stream-5.1.2-rhel-8.3.0
                 # buildorder: 10
             python-pycparser:
                 rationale: Python component
-                ref: stream-2.19-rhel-8.2.0
+                ref: stream-2.19-rhel-8.3.0
                 # buildorder: 10
             python-lxml:
                 rationale: Python component
-                ref: stream-4.4.1-rhel-8.2.0
+                ref: stream-4.4.1-rhel-8.3.0
                 # buildorder: 10
 
             python-cffi:
                 rationale: Python component
-                ref: stream-1.13.2-rhel-8.2.0
+                ref: stream-1.13.2-rhel-8.3.0
                 # buildorder: 20
             scipy:
                 rationale: Python component
-                ref: stream-1.3.1-rhel-8.2.0
+                ref: stream-1.3.1-rhel-8.3.0
                 # buildorder: 20
 
             python-cryptography:
                 rationale: Python component
-                ref: stream-2.8-rhel-8.2.0
+                ref: stream-2.8-rhel-8.3.0
                 # needs cffi
                 # buildorder: 30
 
             python-PyMySQL:
                 rationale: Python component
-                ref: stream-0.9.3-rhel-8.2.0
+                ref: stream-0.9.3-rhel-8.3.0
                 # needs cryptography
                 # buildorder: 40
 ...
diff --git a/python38.yaml b/python38.yaml
deleted file mode 100644
index b3cc980..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.2.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: b871f2a867f2ee61a56e3c18f75a8dfc68e89843
-      PyYAML:
-        rationale: Python component
-        ref: e4b1edac83eb4bbfb82871ec046c58bcaf11c801
-      babel:
-        rationale: Python component
-        ref: d73d38b46059481794742edfdc594b2b7b2672c3
-      mod_wsgi:
-        rationale: Python component
-        ref: 3b2be9b690139e2744d062114e8173a81ddf5276
-      numpy:
-        rationale: Python component
-        ref: 759bc4c64233347f70702ae054fe1e1587f977fb
-      pytest:
-        rationale: Python component
-        ref: 18302b036a2e6023361221f39e8b22ac97613b5c
-      python-PyMySQL:
-        rationale: Python component
-        ref: 73d151b08260cef888eda2758a48243c69b9658c
-      python-asn1crypto:
-        rationale: Python component
-        ref: a03a7d5994b84b533c52a609891055a4749828af
-      python-atomicwrites:
-        rationale: Python component
-        ref: 57988c05687b8cbeea831c7f8dd4338ecff339b6
-      python-attrs:
-        rationale: Python component
-        ref: c1645763ce1dc24a3164f075679480c353cd0031
-      python-cffi:
-        rationale: Python component
-        ref: b47768f1a87f422df9bd41a29543919cb6282e55
-      python-chardet:
-        rationale: Python component
-        ref: 130ed5c6a1a0e198c5ed3f1eee57397f6e2f07aa
-      python-cryptography:
-        rationale: Python component
-        ref: accdf51d877b2842207f69b1139043bf08b26f82
-      python-idna:
-        rationale: Python component
-        ref: e68b89c9da7532978b5a91f6930776cf70c19527
-      python-jinja2:
-        rationale: Python component
-        ref: b2e771448965bd145e82088bee22fd6f7fa7a98b
-      python-lxml:
-        rationale: Python component
-        ref: 8f0b66892ce19bbe0d4d2eea29e36f0a96c7123f
-      python-markupsafe:
-        rationale: Python component
-        ref: 55eda70fb552b8f27b9abc10413231e4aa3e250a
-      python-more-itertools:
-        rationale: Python component
-        ref: 7be3b533ac5b3ec79e25983cf897e9de974aa3ab
-      python-packaging:
-        rationale: Python component
-        ref: 960bd901199e38570beaab9bf27afc0d8317cdd7
-      python-pluggy:
-        rationale: Python component
-        ref: 26b680ac0552266c32472cc24f32703461a60a0b
-      python-ply:
-        rationale: Python component
-        ref: 1b85a77ef0c76bb8ccdb0cd3b7f12e2ab6a73b2e
-      python-psutil:
-        rationale: Python component
-        ref: 33196a6fac5862360ae34bb5704eb4e614d3778b
-      python-psycopg2:
-        rationale: Python component
-        ref: 2bdfb7f195c60f2928d4669f6bef90463c2fa28d
-      python-py:
-        rationale: Python component
-        ref: 91e348b3a155cca4e43d8506703457a72eb36021
-      python-pycparser:
-        rationale: Python component
-        ref: 0c07a74bd7a829868f3b322563a347b7611585e6
-      python-pysocks:
-        rationale: Python component
-        ref: 4cd06487b7e7a3cad79582857b54b185a3335d60
-      python-requests:
-        rationale: Python component
-        ref: 304e478f49018e671eb7cdc55fc5cd2a07f7d351
-      python-six:
-        rationale: Python component
-        ref: c3fbe12ac8914ddaaef52ee03b923750e8f13c48
-      python-urllib3:
-        rationale: Python component
-        ref: 90d2c586cc6a486bc25af1603b10bcc44b3cbbc2
-      python-wcwidth:
-        rationale: Python component
-        ref: f5a5c66b46b6019f35cfcb1d0b27ab5c73f31c3a
-      python-wheel:
-        rationale: Packaging tool
-        ref: 1d0003bf8233867fb05b7f9cd5ee23155f2832ad
-      python38:
-        rationale: The main Python interpreter
-        ref: 09e27f7b72bfc3f8ec89a220a873c3b33882bda6
-      python3x-pip:
-        rationale: Packaging tool
-        ref: 8752740ddcac86afca7d9d89d74c88c8b5bedd81
-      python3x-pyparsing:
-        rationale: Python component
-        ref: f9af576893a765f873725891cd47459d17fcc742
-      python3x-setuptools:
-        rationale: Packaging tool
-        ref: e4083f3362275c766b7df6c3af534a563f9ff9e4
-      pytz:
-        rationale: Python component
-        ref: b82da6115f201f98c2932427d2febfd1c18f249f
-      scipy:
-        rationale: Python component
-        ref: d7fd8478570957a18ba1e40495f75d7ea9185a7e
-...
-