diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1aa713c..d7632b58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.20.3] - 2024-07-11
+## [1.20.4] - 2024-07-11
 
 ### Fixed
-- conftest: Fixed '--device all': limit the tests to devices declared in the App manifest
+- conftest: Fixed conftest for cross repository workflows
+
+## [1.20.3] - 2024-07-11
+
+### Added:
+- conftest: Limit the tests to devices declared in the App manifest
 
 ## [1.20.2] - 2024-07-02
 
diff --git a/src/ragger/conftest/base_conftest.py b/src/ragger/conftest/base_conftest.py
index 6e644a6b..f8677a63 100644
--- a/src/ragger/conftest/base_conftest.py
+++ b/src/ragger/conftest/base_conftest.py
@@ -107,7 +107,7 @@ def additional_speculos_arguments() -> List[str]:
 
 
 # Glue to call every test that depends on the firmware once for each required firmware
-def pytest_generate_tests(metafunc):
+def pytest_generate_tests(metafunc, request):
     if "firmware" in metafunc.fixturenames:
         fw_list = []
         ids = []
@@ -116,6 +116,9 @@ def pytest_generate_tests(metafunc):
         backend_name = metafunc.config.getoption("backend")
 
         # Get supported devices list from manifest
+        project_root_dir = find_project_root_dir(Path(request.config.rootpath).resolve())
+        manifest = Manifest.from_path(project_root_dir / "ledger_app.toml")
+
         manifest = Manifest.from_path(
             Path(metafunc.config.rootpath).parent.resolve() / "ledger_app.toml")
         dev_list = ["nanosp" if d == "nanos+" else d for d in manifest.app.devices.json]