diff --git a/python39.yaml b/python39.yaml
index 44af123..e1c457b 100644
--- a/python39.yaml
+++ b/python39.yaml
@@ -104,10 +104,10 @@ data:
                 # # pip
                 # %_without_doc 1
 
-                # === Bootstrap phase 3 ===
+                # === Bootstrap phase 2 ===
                 #
                 # %python3_pkgversion 39
-                # # scipy needs pybind11 to build and pybind11 needs scipy for tests
+                # # setuptools, pip, ...
                 # %_without_tests 1
 
                 # === Bootstrap phase 4 ===
@@ -127,13 +127,12 @@ data:
             #   therefore it's safer to just move them out of the macros
             #   section entirely to avoid possible issues.
             macros: |
-                # === Bootstrap phase 2 ===
+                # === Bootstrap phase 3 ===
                 #
                 %python3_pkgversion 39
-                # setuptools, pip, ...
+                # scipy needs pybind11 to build and pybind11 needs scipy for tests
                 %_without_tests 1
 
-
     components:
         rpms:
             # === Bootstrap phase 1 ===
@@ -158,199 +157,196 @@ data:
 
             # === Bootstrap phase 2 ===
             #
-            python3x-setuptools:
-                rationale: Packaging tool
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 10
-            python3x-pyparsing:
-                rationale: Python component
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 20
-            python39:
-                rationale: The main Python interpreter
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 30
-            python-wheel:
-                rationale: Packaging tool
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 40
-            python3x-pip:
-                rationale: Packaging tool
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 40
-            python3x-six:
-                rationale: Python component
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 40
-            python-py:
-                rationale: Python component
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 40
-            python-chardet:
-                rationale: Python component
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 40
-            python-attrs:
-                rationale: Python component
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 40
-            python-pluggy:
-                rationale: Python component
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 40
-            python-pysocks:
-                rationale: Python component
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 40
-            python-wcwidth:
-                rationale: Python component
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 40
-            python-packaging:
-                rationale: Python component
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 40
-            python-toml:
-                rationale: Python component
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 40
-            python-iniconfig:
-                rationale: Python component
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 40
-            python-more-itertools:
-                rationale: Python component
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 50
-            pytest:
-                rationale: Python component
-                ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 60
+            # python3x-setuptools:
+            #     rationale: Packaging tool
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 10
+            # python3x-pyparsing:
+            #     rationale: Python component
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 20
+            # python39:
+            #     rationale: The main Python interpreter
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 30
+            # python-wheel:
+            #     rationale: Packaging tool
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 40
+            # python3x-pip:
+            #     rationale: Packaging tool
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 40
+            # python3x-six:
+            #     rationale: Python component
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 40
+            # python-py:
+            #     rationale: Python component
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 40
+            # python-chardet:
+            #     rationale: Python component
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 40
+            # python-attrs:
+            #     rationale: Python component
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 40
+            # python-pluggy:
+            #     rationale: Python component
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 40
+            # python-pysocks:
+            #     rationale: Python component
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 40
+            # python-wcwidth:
+            #     rationale: Python component
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 40
+            # python-packaging:
+            #     rationale: Python component
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 40
+            # python-toml:
+            #     rationale: Python component
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 40
+            # python-iniconfig:
+            #     rationale: Python component
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 40
+            # python-more-itertools:
+            #     rationale: Python component
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 50
+            # pytest:
+            #     rationale: Python component
+            #     ref: stream-python39-3.9-rhel-8.9.0
+            #     buildorder: 60
 
 
             # === Bootstrap phase 3/4 ===
             # For bootstrap phase 3 uncomment all `buildorder:` lines below,
             # for bootstrap phase 4 comment them out.
             #
-            # python3x-setuptools:
-            #     rationale: Packaging tool
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python3x-pyparsing:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python39:
-            #     rationale: The main Python interpreter
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-wheel:
-            #     rationale: Packaging tool
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python3x-pip:
-            #     rationale: Packaging tool
-            #     ref: stream-python39-3.9-rhel-8.9.0
+            python3x-setuptools:
+               rationale: Packaging tool
+               ref: stream-python39-3.9-rhel-8.9.0
+            python3x-pyparsing:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python39:
+               rationale: The main Python interpreter
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-wheel:
+               rationale: Packaging tool
+               ref: stream-python39-3.9-rhel-8.9.0
+            python3x-pip:
+               rationale: Packaging tool
+               ref: stream-python39-3.9-rhel-8.9.0
 
-            # python3x-six:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-py:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-chardet:
-            #     rationale: Python component
-            #     # stream branch shared with python38 module
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-attrs:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-pluggy:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-pysocks:
-            #     rationale: Python component
-            #     # stream branch shared with python38 module
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-wcwidth:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-packaging:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-toml:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-iniconfig:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-more-itertools:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # pytest:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
+            python3x-six:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-py:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-chardet:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-attrs:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-pluggy:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-pysocks:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-wcwidth:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-packaging:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-toml:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-iniconfig:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-more-itertools:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            pytest:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
 
-            # python-idna:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-urllib3:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # Cython:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-ply:
-            #     rationale: Python component
-            #     # stream branch shared with python38 module
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-psutil:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-psycopg2:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # mod_wsgi:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            # python-requests:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            #     # buildorder: 10
-            # numpy:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            #     # buildorder: 10
-            # PyYAML:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            #     # buildorder: 10
-            # python-pycparser:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            #     # buildorder: 10
-            # python-lxml:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            #     # buildorder: 10
-            # python-cffi:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            #     # buildorder: 20
-            # pybind11:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            #     # needs numpy
-            #     # buildorder: 20
-            # scipy:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            #     # needs pybind11
-            #     # buildorder: 30
-            # python-cryptography:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            #     # needs cffi
-            #     # buildorder: 30
-            # python-PyMySQL:
-            #     rationale: Python component
-            #     ref: stream-python39-3.9-rhel-8.9.0
-            #     # needs cryptography
-            #     # buildorder: 40
+            python-idna:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-urllib3:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            Cython:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-ply:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-psutil:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-psycopg2:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            mod_wsgi:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+            python-requests:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+               buildorder: 10
+            numpy:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+               buildorder: 10
+            PyYAML:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+               buildorder: 10
+            python-pycparser:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+               buildorder: 10
+            python-lxml:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+               buildorder: 10
+            python-cffi:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+               buildorder: 20
+            pybind11:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+               # needs numpy
+               buildorder: 20
+            scipy:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+               # needs pybind11
+               buildorder: 30
+            python-cryptography:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+               # needs cffi
+               buildorder: 30
+            python-PyMySQL:
+               rationale: Python component
+               ref: stream-python39-3.9-rhel-8.9.0
+               # needs cryptography
+               buildorder: 40
 ...