diff --git a/src/tools/packager/Package-Core.py b/src/tools/packager/Package-Core.py
index 52c1cd71..21b4840e 100644
--- a/src/tools/packager/Package-Core.py
+++ b/src/tools/packager/Package-Core.py
@@ -133,7 +133,7 @@ def generate_compiled_script(source_code_path, merged_file_full_path, merged_fil
                 elif os.path.basename(file_path) in ('PatchOperator.py', 'PackageManager.py', 'Constants.py', 'LifecycleManager.py', 'SystemctlManager.py'):
                     modules_to_be_merged.insert(0, file_path)
                 elif os.path.basename(file_path) == 'TdnfPackageManager.py':
-                    # Insert before `AzL3PackageManager.py`; fallback to append.
+                    # Insert before `AzL3TdnfPackageManager.py`; fallback to insert before __main__.py or append.
                     inserted = False
                     for i, p in enumerate(modules_to_be_merged):
                         if os.path.basename(p) == 'AzL3TdnfPackageManager.py':
@@ -141,7 +141,10 @@ def generate_compiled_script(source_code_path, merged_file_full_path, merged_fil
                             inserted = True
                             break
                     if not inserted:
-                        modules_to_be_merged.append(file_path)
+                        if len(modules_to_be_merged) > 0 and '__main__.py' in modules_to_be_merged[-1]:
+                            modules_to_be_merged.insert(-1, file_path)
+                        else:
+                            modules_to_be_merged.append(file_path)
                 else:
                     if len(modules_to_be_merged) > 0 and '__main__.py' in modules_to_be_merged[-1]:
                         modules_to_be_merged.insert(-1, file_path)