diff --git a/apps/baremetal/acs_runtime_init.c b/apps/baremetal/acs_runtime_init.c
index 975c112a..3f5a6250 100644
--- a/apps/baremetal/acs_runtime_init.c
+++ b/apps/baremetal/acs_runtime_init.c
@@ -51,6 +51,35 @@ acs_list_contains(const uint32_t *list, uint32_t count, uint32_t value)
   return false;
 }
 
+static uint32_t
+acs_clamp_level_for_arch(uint32_t requested_level)
+{
+  uint32_t min_level = 0;
+  uint32_t max_level = 0;
+
+#if  defined(BSA)
+  min_level = BSA_MIN_LEVEL_SUPPORTED;
+  max_level = (uint32_t)BSA_LEVEL_FR;
+#elif defined(SBSA)
+  min_level = SBSA_MIN_LEVEL_SUPPORTED;
+  max_level = (uint32_t)SBSA_LEVEL_FR;
+#elif defined(PC_BSA)
+  min_level = PCBSA_MIN_LEVEL_SUPPORTED;
+  max_level = (uint32_t)PCBSA_LEVEL_FR;
+#else
+  return requested_level;
+#endif
+
+  if (requested_level < min_level || requested_level > max_level) {
+      val_print(WARN,
+              "ACS Level (EL3 parameter) %d is not supported maxing it to level FR\n",
+              requested_level);
+	  return max_level;
+  }
+
+  return requested_level;
+}
+
 bool
 acs_is_module_enabled(uint32_t module_base)
 {
@@ -260,7 +289,7 @@ acs_apply_el3_params(acs_run_request_t *ctx, acs_execution_policy_t *policy)
     ctx->bsa_sw_view_mask = params->software_view_filter;
     policy->pcie_cache_present  = params->cache;
     policy->sys_last_lvl_cache  = params->sys_cache;
-    ctx->level_value = params->level;
+    ctx->level_value = acs_clamp_level_for_arch((uint32_t)params->level);
 
     if (params->level_selection >= LVL_FILTER_NONE &&
        params->level_selection <= LVL_FILTER_FR)
diff --git a/val/include/acs_app_defs.h b/val/include/acs_app_defs.h
index ee995772..b28a84e2 100644
--- a/val/include/acs_app_defs.h
+++ b/val/include/acs_app_defs.h
@@ -36,9 +36,10 @@
 #define PCBSA_MAX_LEVEL_SUPPORTED 1
 
 #define LEVEL_PRINT_FORMAT(level, filter_mode, fr_level) ((filter_mode == LVL_FILTER_FR) ? \
-    ((filter_mode == LVL_FILTER_ONLY && level == fr_level) ? \
-    "\n Starting tests for only level FR " : "\n Starting tests for level FR ") : \
+    "\n Starting tests for level FR " : \
     ((filter_mode == LVL_FILTER_ONLY) ? \
-    "\n Starting tests for only level %2d " : "\n Starting tests for level %2d "))
+    ((level == fr_level) ? "\n Starting tests for only level FR " \
+    : "\n Starting tests for only level %2d ") : \
+    ((level == fr_level) ? "\n Starting tests for level FR " : "\n Starting tests for level %2d ")))
 
 #endif /* __ACS_APP_DEFS_H__ */