diff --git a/lava_helper/jinja2_templates/fvp_mps2.jinja2 b/lava_helper/jinja2_templates/fvp_mps2.jinja2
index 7b92e8a..e38b39a 100644
--- a/lava_helper/jinja2_templates/fvp_mps2.jinja2
+++ b/lava_helper/jinja2_templates/fvp_mps2.jinja2
@@ -58,7 +58,11 @@
 {%- if enable_code_coverage %}
     -  "/opt/model/FVP_ARM_Std_Library/FVP_MPS2/FVP_MPS2_AEMv8M"
 {%- endif %}
+{%- if build_type == "Debug" %}
+    -  "--simlimit 2000"
+{%- else %}
     -  "--simlimit 900"
+{%- endif %}
 {% for name, img in binaries.items() %}
     {% if img.application is defined %}
     -  "--application cpu0={{ '{' ~ name.upper() ~ '}' }}"
diff --git a/lava_helper/lava_create_jobs.py b/lava_helper/lava_create_jobs.py
index 0c78a7a..33388c1 100755
--- a/lava_helper/lava_create_jobs.py
+++ b/lava_helper/lava_create_jobs.py
@@ -86,7 +86,8 @@
             "cpu0_initvtor_s": config.get("cpu0_initvtor_s", "0x10000000"),
             "psa_api_suite": os.getenv("TEST_PSA_API") if os.getenv("TEST_PSA_API") == "IPC" else "",
             "binaries": config.get('binaries', []),
-            "data_url_prefix": "{}/artifact/ci_build".format(os.getenv("BUILD_URL"))
+            "data_url_prefix": "{}/artifact/ci_build".format(os.getenv("BUILD_URL")),
+            "build_type": os.getenv("CMAKE_BUILD_TYPE"),
         }
 
         if len(params["monitors"]) == 0: