diff --git a/lib/atombuild.py b/lib/atombuild.py
index ea74bd2..86f9796 100644
--- a/lib/atombuild.py
+++ b/lib/atombuild.py
@@ -32,19 +32,32 @@ BASE_REQUIREMENTS = [
 
 
 def _prepare_build_env_base_files(root: str):
+    # Create root directory
     os.makedirs(root, exist_ok=True)
+
+    # Create var, run and tmp
     os.mkdir(f"{root}/var")
     os.mkdir(f"{root}/var/tmp")
     os.mkdir(f"{root}/var/run")
     os.mkdir(f"{root}/tmp")
     os.mkdir(f"{root}/run")
+
+    # Copy repository config files
     os.makedirs(f"{root}/var/db/packie")
     shutil.copytree("/var/config/packie/repos.d", f"{root}/var/config/packie/repos.d")
+
+    # Create directories for kernel pseudo filesystems
     os.mkdir(f"{root}/dev")
     os.mkdir(f"{root}/sys")
     os.mkdir(f"{root}/proc")
+
+    # Create home directory of root (some scripts may require it)
     os.makedirs(f"{root}/home/root")
 
+    # Copy DNS config
+    os.makedirs(f"{root}/etc", exist_ok=True)
+    shutil.copy2("/etc/resolv.conf", f"{root}/etc/resolv.conf")
+
 
 def prepare_build_env(root: str, extreq: list[str] = []):
     # Skip if the environment is already initialized
@@ -65,10 +78,6 @@ def prepare_build_env(root: str, extreq: list[str] = []):
     # Refresh certificates
     enter_build_env(root, ["certutil", "refresh"])
 
-    # Copy DNS config
-    os.makedirs(f"{root}/etc", exist_ok=True)
-    shutil.copy2("/etc/resolv.conf", f"{root}/etc/resolv.conf")
-
     # Create initialized tag
     with open(f"{root}/.INIT", "wt+") as file:
         file.write("OK")