diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py
index 707cf08009..318ca6a119 100644
--- a/archinstall/lib/mirrors.py
+++ b/archinstall/lib/mirrors.py
@@ -354,9 +354,14 @@ def select_optional_repositories(preset: list[Repository]) -> list[Repository]:
 	:rtype: Repository
 	"""
 
-	repositories = [Repository.Multilib, Repository.Testing]
+	repositories = [
+		Repository.Multilib,
+		Repository.MultilibTesting,
+		Repository.CoreTesting,
+		Repository.ExtraTesting,
+	]
 	items = [MenuItem(r.value, value=r) for r in repositories]
-	group = MenuItemGroup(items, sort_items=True)
+	group = MenuItemGroup(items, sort_items=False)
 	group.set_selected_by_value(preset)
 
 	result = SelectMenu[Repository](
diff --git a/archinstall/lib/models/packages.py b/archinstall/lib/models/packages.py
index 557f0f425c..218981c0f0 100644
--- a/archinstall/lib/models/packages.py
+++ b/archinstall/lib/models/packages.py
@@ -13,21 +13,9 @@ class Repository(Enum):
 	Extra = 'extra'
 	Multilib = 'multilib'
 	Testing = 'testing'
-
-	def get_repository_list(self) -> list[str]:
-		match self:
-			case Repository.Core:
-				return [Repository.Core.value]
-			case Repository.Extra:
-				return [Repository.Extra.value]
-			case Repository.Multilib:
-				return [Repository.Multilib.value]
-			case Repository.Testing:
-				return [
-					'core-testing',
-					'extra-testing',
-					'multilib-testing',
-				]
+	MultilibTesting = 'multilib-testing'
+	CoreTesting = 'core-testing'
+	ExtraTesting = 'extra-testing'
 
 
 @dataclass
diff --git a/archinstall/lib/packages/packages.py b/archinstall/lib/packages/packages.py
index 6b79de9eba..c8d8e53276 100644
--- a/archinstall/lib/packages/packages.py
+++ b/archinstall/lib/packages/packages.py
@@ -137,7 +137,7 @@ def list_available_packages(
 	"""
 	packages: dict[str, AvailablePackage] = {}
 	current_package: list[str] = []
-	filtered_repos = [name for repo in repositories for name in repo.get_repository_list()]
+	filtered_repos = [repo.value for repo in repositories]
 
 	try:
 		Pacman.run('-Sy')