diff --git a/abratest/env_manager.py b/abratest/env_manager.py
index 00d412e..2cbcbf1 100644
--- a/abratest/env_manager.py
+++ b/abratest/env_manager.py
@@ -94,7 +94,7 @@ class EnvManager:
 
     def copy_env_files(self, DIR: DirManager) -> None:
         """Copies all env files to STATES/env_files. Files will be renamed to their own TYPE value."""
-        env_files_dir = DIR.STATES / "env_files"
-        env_files_dir.mkdir(exist_ok=True)
-        for env_file in self.env_files:
-            shutil.copy(env_file.env_path, env_files_dir / env_file.env_type)
+        for index, env_file in enumerate(self.env_files):
+            # will create something like 00-authentik-login.test.dev.local-it.cloud.env
+            file_name = "-".join([str(index).zfill(2), env_file.env_type, env_file.env_path.name])
+            shutil.copy(env_file.env_path, DIR.ENV_FILES / file_name)