diff --git a/python38.yaml b/python38.yaml
index a74d8e7..744cfca 100644
--- a/python38.yaml
+++ b/python38.yaml
@@ -19,7 +19,7 @@ data:
 
               # Depending on our selves for bootstrapping
               # This is not needed in bootstrap phase 1 and can be disabled
-              # python38: [3.8-bootstrap]
+              python38: [3.8-bootstrap]
 
               # sicpy needs package swig
               swig: [3.0]
@@ -41,18 +41,18 @@ data:
                 - python38-rpm-macros
     buildopts:
         rpms:
-                # === Bootstrap phase 2 ===
+                # === Bootstrap phase 1 ===
                 #
                 # %python3_pkgversion 38
                 # %_without_python2 1
-                # # python38, setuptools, six, py, chardet, attrs, pluggy, pysocks,
-                # # atomicwrites, wcwidth, packaging
+                # # python38, setuptools, wheel
+                # %_with_bootstrap 1
+                # # python38
+                # %_without_rpmwheels 1
+                # # python38, setuptools, pip
                 # %_without_tests 1
-                # # py, pyparsing, atomicwrites, packaging, pytest
-                # %_without_docs 1
-                # # pytest
-                # %_without_timeout 1
-                # %_without_optional_tests 1
+                # # pip
+                # %_without_doc 1
 
                 # === Bootstrap phase 3/4 ===
                 #
@@ -73,50 +73,30 @@ 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 38
                 %_without_python2 1
-                # python38, setuptools, wheel
-                %_with_bootstrap 1
-                # python38
-                %_without_rpmwheels 1
-                # python38, setuptools, pip
+                # python38, setuptools, six, py, chardet, attrs, pluggy, pysocks,
+                # atomicwrites, wcwidth, packaging
                 %_without_tests 1
-                # pip
-                %_without_doc 1
+                # py, pyparsing, atomicwrites, packaging, pytest
+                %_without_docs 1
+                # pytest
+                %_without_timeout 1
+                %_without_optional_tests 1
 
     components:
         rpms:
             # === Bootstrap phase 1 ===
             #
-            python38:
-                rationale: The main Python interpreter
-                ref: e336cb9a1476ad581ed1ae12b51cba7e0b0ca219
-                buildorder: 10
-            python3x-setuptools:
-                rationale: Packaging tool
-                ref: e871d8d55c2566ebc7bad9b362261eee046b4581
-                buildorder: 20
-            python-wheel:
-                rationale: Packaging tool
-                ref: f3f14d2af2afb451b7a29e3e0bcc51ec7f9d20cf
-                buildorder: 30
-            python3x-pip:
-                rationale: Packaging tool
-                ref: bcedfd39e51647ff333e1e23ce830014fa856d61
-                buildorder: 40
-
-
-            # === Bootstrap phase 2 ===
-            #
-            # python3x-setuptools:
-            #     rationale: Packaging tool
-            #     ref: e871d8d55c2566ebc7bad9b362261eee046b4581
-            #     buildorder: 10
             # python38:
             #     rationale: The main Python interpreter
             #     ref: e336cb9a1476ad581ed1ae12b51cba7e0b0ca219
+            #     buildorder: 10
+            # python3x-setuptools:
+            #     rationale: Packaging tool
+            #     ref: e871d8d55c2566ebc7bad9b362261eee046b4581
             #     buildorder: 20
             # python-wheel:
             #     rationale: Packaging tool
@@ -125,60 +105,80 @@ data:
             # python3x-pip:
             #     rationale: Packaging tool
             #     ref: bcedfd39e51647ff333e1e23ce830014fa856d61
-            #     buildorder: 30
-            #
-            # python-six:
-            #     rationale: Python component
-            #     ref: 5eb513dbb67d9d78ac924bafac2a244acee79db5
-            #     buildorder: 30
-            # python-py:
-            #     rationale: Python component
-            #     ref: 9234c89c42c53615e825e158ad5336e684070ae1
-            #     buildorder: 30
-            # python-chardet:
-            #     rationale: Python component
-            #     ref: 8fd25f76ad2b48f12926b078855c6cbdc0e5cdfe
-            #     buildorder: 30
-            # python-attrs:
-            #     rationale: Python component
-            #     ref: b5a79261179bfe1f22f6ccaf72f10d48855124a0
-            #     buildorder: 30
-            # python-pluggy:
-            #     rationale: Python component
-            #     ref: efd68bcb5fca5a950d553b6e25268f22715becef
-            #     buildorder: 30
-            # python-markupsafe:
-            #     rationale: Python component
-            #     ref: 83ad5192a6a16089aefce6bf42f04dbf35ab6e62
-            #     buildorder: 30
-            # python-pysocks:
-            #     rationale: Python component
-            #     ref: 1f78d0dcce716c59c354f17a8b4744cc7a6426e5
-            #     buildorder: 30
-            # python3x-pyparsing:
-            #     rationale: Python component
-            #     ref: 2aa5156074845410abbc856a6788b477963a9246
-            #     buildorder: 30
-            # python-atomicwrites:
-            #     rationale: Python component
-            #     ref: d6795fd52b4950ed87cdb0db43a8f680ff130b2b
-            #     buildorder: 30
-            # python-wcwidth:
-            #     rationale: Python component
-            #     ref: 48b14edc5b0744ebe35d1e4ce5cb0533b629f20e
-            #     buildorder: 30
-            # python-more-itertools:
-            #     rationale: Python component
-            #     ref: 47d82b6c6a3ca04cdc3b14b2c1b5321b742b1a0b
-            #     buildorder: 40
-            # python-packaging:
-            #     rationale: Python component
-            #     ref: f665d0bd3569478862fc243fc61f519100dfc23e
             #     buildorder: 40
-            # pytest:
-            #     rationale: Python component
-            #     ref: 04936ffd6499a401831a73dace596eb6429c38a9
-            #     buildorder: 50
+
+
+            # === Bootstrap phase 2 ===
+            #
+            python3x-setuptools:
+                rationale: Packaging tool
+                ref: e871d8d55c2566ebc7bad9b362261eee046b4581
+                buildorder: 10
+            python38:
+                rationale: The main Python interpreter
+                ref: e336cb9a1476ad581ed1ae12b51cba7e0b0ca219
+                buildorder: 20
+            python-wheel:
+                rationale: Packaging tool
+                ref: f3f14d2af2afb451b7a29e3e0bcc51ec7f9d20cf
+                buildorder: 30
+            python3x-pip:
+                rationale: Packaging tool
+                ref: bcedfd39e51647ff333e1e23ce830014fa856d61
+                buildorder: 30
+
+            python-six:
+                rationale: Python component
+                ref: 5eb513dbb67d9d78ac924bafac2a244acee79db5
+                buildorder: 30
+            python-py:
+                rationale: Python component
+                ref: 9234c89c42c53615e825e158ad5336e684070ae1
+                buildorder: 30
+            python-chardet:
+                rationale: Python component
+                ref: 8fd25f76ad2b48f12926b078855c6cbdc0e5cdfe
+                buildorder: 30
+            python-attrs:
+                rationale: Python component
+                ref: b5a79261179bfe1f22f6ccaf72f10d48855124a0
+                buildorder: 30
+            python-pluggy:
+                rationale: Python component
+                ref: efd68bcb5fca5a950d553b6e25268f22715becef
+                buildorder: 30
+            python-markupsafe:
+                rationale: Python component
+                ref: 83ad5192a6a16089aefce6bf42f04dbf35ab6e62
+                buildorder: 30
+            python-pysocks:
+                rationale: Python component
+                ref: 1f78d0dcce716c59c354f17a8b4744cc7a6426e5
+                buildorder: 30
+            python3x-pyparsing:
+                rationale: Python component
+                ref: 2aa5156074845410abbc856a6788b477963a9246
+                buildorder: 30
+            python-atomicwrites:
+                rationale: Python component
+                ref: d6795fd52b4950ed87cdb0db43a8f680ff130b2b
+                buildorder: 30
+            python-wcwidth:
+                rationale: Python component
+                ref: 48b14edc5b0744ebe35d1e4ce5cb0533b629f20e
+                buildorder: 30
+            python-more-itertools:
+                rationale: Python component
+                ref: 47d82b6c6a3ca04cdc3b14b2c1b5321b742b1a0b
+                buildorder: 40
+            python-packaging:
+                rationale: Python component
+                ref: f665d0bd3569478862fc243fc61f519100dfc23e
+                buildorder: 40
+            pytest:
+                rationale: Python component
+                ref: 04936ffd6499a401831a73dace596eb6429c38a9
+                buildorder: 50
 
 
             # === Bootstrap phase 3/4 ===