diff --git a/solutions/ess-maker-skills/scripts/flightcheck/cli.py b/solutions/ess-maker-skills/scripts/flightcheck/cli.py
index ffccdd0..ba7c805 100644
--- a/solutions/ess-maker-skills/scripts/flightcheck/cli.py
+++ b/solutions/ess-maker-skills/scripts/flightcheck/cli.py
@@ -110,6 +110,10 @@ def main():
         "--environment-id",
         help="Override the Power Platform environment ID (used by environment_picker.py)",
     )
+    parser.add_argument(
+        "--no-open", action="store_true",
+        help="Don't open the HTML report in a browser after running",
+    )
     args = parser.parse_args()
 
     # Load config
@@ -286,6 +290,14 @@ def main():
     # Save results
     save_results(result, args.output)
 
+    # Open HTML report in browser
+    if not args.no_open:
+        import webbrowser
+        report_path = os.path.join(args.output, "report.html")
+        if os.path.exists(report_path):
+            abs_path = os.path.abspath(report_path)
+            webbrowser.open(f"file://{abs_path}")
+
     # Exit code
     sys.exit(1 if result.failed > 0 else 0)
 
diff --git a/solutions/ess-maker-skills/scripts/list_environments.py b/solutions/ess-maker-skills/scripts/list_environments.py
index 78e6606..1609e1b 100644
--- a/solutions/ess-maker-skills/scripts/list_environments.py
+++ b/solutions/ess-maker-skills/scripts/list_environments.py
@@ -39,7 +39,7 @@ def parse_raw_environments(raw_envs):
         linked = props.get("linkedEnvironmentMetadata", {})
         instance_url = linked.get("instanceUrl", "").rstrip("/")
         display_name = props.get("displayName", "Unknown")
-        env_type = props.get("environmentType", "Unknown")
+        env_type = props.get("environmentSku", props.get("environmentType", "Unknown"))
         state = props.get("states", {}).get("runtime", {}).get("id", "Unknown")
         env_id = env.get("name", "")