diff --git a/python39.yaml b/python39.yaml
index e42911b..732e181 100644
--- a/python39.yaml
+++ b/python39.yaml
@@ -17,6 +17,10 @@ data:
         - buildrequires:
               platform: [el8.4.0]
 
+              # Depending on our selves for bootstrapping
+              # This is not needed in bootstrap phase 1 and can be disabled
+              python39: [3.9-bootstrap]
+
               # sicpy needs package swig
               swig: [3.0]
               # mod_wsgi needs several packages from httpd
@@ -37,6 +41,20 @@ data:
                 - python39-rpm-macros
     buildopts:
         rpms:
+                # === Bootstrap phase 1 ===
+                #
+                # %python3_pkgversion 39
+                # # python39
+                # %_without_rpmwheels 1
+                # %_without_optimizations 1
+                # # python39, setuptools, wheel
+                # %_with_bootstrap 1
+                # # python39, setuptools, pip
+                # %_without_tests 1
+                # # pip
+                # %_without_doc 1
+
+
             # Macros bootstrapping info:
             #   Only the macros that are below the `macros: |` declaration are
             #   being used in the module at a given time. If you want to switch
@@ -49,37 +67,104 @@ data:
             #   therefore it's safer to just move them out of the macros
             #   section entirely to avoid possible issues.
             macros: |
-                # === Bootstrap phase 1 ===
+                # === Bootstrap phase 2 ===
                 #
                 %python3_pkgversion 39
-                # python39
-                %_without_rpmwheels 1
-                %_without_optimizations 1
-                # python39, setuptools, wheel
-                %_with_bootstrap 1
-                # python39, setuptools, pip
+                # setuptools, pip, ...
                 %_without_tests 1
-                # pip
-                %_without_doc 1
 
     components:
         rpms:
             # === Bootstrap phase 1 ===
             #
-            python39:
-                rationale: The main Python interpreter
-                ref: 93a1c0a50478623f84220798338b4d66a2e7117c
-                buildorder: 10
+            # python39:
+            #     rationale: The main Python interpreter
+            #     ref: 93a1c0a50478623f84220798338b4d66a2e7117c
+            #     buildorder: 10
+            # python3x-setuptools:
+            #     rationale: Packaging tool
+            #     ref: 1950ae3d8549d4df835b6e31337bebd9a40bf4f8
+            #     buildorder: 20
+            # python-wheel:
+            #     rationale: Packaging tool
+            #     ref: 1d3137dab7dbb7c7fa4526224de74ab47cadbd95
+            #     buildorder: 30
+            # python3x-pip:
+            #     rationale: Packaging tool
+            #     ref: 6d97c1df67685383c70ad4ef043c3d4d8231352d
+            #     buildorder: 40
+
+
+            # === Bootstrap phase 2 ===
+            #
             python3x-setuptools:
                 rationale: Packaging tool
                 ref: 1950ae3d8549d4df835b6e31337bebd9a40bf4f8
+                buildorder: 10
+            python3x-pyparsing:
+                rationale: Python component
+                ref: ad9334c8fb4a6a6e24252c4a94f64523044b0368
                 buildorder: 20
+            python39:
+                rationale: The main Python interpreter
+                ref: 93a1c0a50478623f84220798338b4d66a2e7117c
+                buildorder: 30
             python-wheel:
                 rationale: Packaging tool
                 ref: 1d3137dab7dbb7c7fa4526224de74ab47cadbd95
-                buildorder: 30
+                buildorder: 40
             python3x-pip:
                 rationale: Packaging tool
                 ref: 6d97c1df67685383c70ad4ef043c3d4d8231352d
                 buildorder: 40
+            python3x-six:
+                rationale: Python component
+                ref: 3930eca3dcbfbe7c80ab9c0f4d385e3f818016eb
+                buildorder: 40
+            python-py:
+                rationale: Python component
+                ref: f98dc1297bfd38a5356aee346c59259cd983bfaa
+                buildorder: 40
+            python-chardet:
+                rationale: Python component
+                # stream branch shared with python38 module
+                ref: 04b5d1be6d2e14ece3a43caa87b79216ea35b65a
+                buildorder: 40
+            python-attrs:
+                rationale: Python component
+                ref: b68e1e37d4944f9a20e452bb3596e5f75b9506be
+                buildorder: 40
+            python-pluggy:
+                rationale: Python component
+                ref: 2abffaab2ce5b6a5e0121442bdd5a49eb4c4f752
+                buildorder: 40
+            python-pysocks:
+                rationale: Python component
+                # stream branch shared with python38 module
+                ref: 483216203ae75373f15aea373c80ee0585c13e63
+                buildorder: 40
+            python-wcwidth:
+                rationale: Python component
+                ref: d45e8c1e3fcd02f21d6bdd008f877380c1dd69c1
+                buildorder: 40
+            python-packaging:
+                rationale: Python component
+                ref: d6dd7925507609cedacc346a2793842dfbdcdf72
+                buildorder: 40
+            python-toml:
+                rationale: Python component
+                ref: dc3e570c0f28ba1c9b9bbca871b122e0a5f8a2ff
+                buildorder: 40
+            python-iniconfig:
+                rationale: Python component
+                ref: f707fca709c2a1d006dcff691dfa2b9b648ecb7f
+                buildorder: 40
+            python-more-itertools:
+                rationale: Python component
+                ref: 4c7d27c844b65549cf4162977488b7b63288b377
+                buildorder: 50
+            pytest:
+                rationale: Python component
+                ref: 0e0110864115c99e4e69ed78021a478fac350f33
+                buildorder: 60
 ...