diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index 89a07d8..9f556e6 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -187,9 +187,13 @@
               params_collection["PARTITION_PS"] == "OFF")) {
       print("LAVA is not needed for ${build_url}")
     }
-    // Workaround: test cases on MUSCA_B1 with OTP enabled could not pass for the time being.
-    // Do not test it to aviod blocking CI.
-    else if (params_collection["OTP"] == "ENABLED") {
+    // Only submit LAVA test for a specified OTP enabled config in nightly or release job
+    else if (params_collection["OTP"] == "ENABLED" && \
+             params_collection["CONFIG_NAME"] != "MUSCA_B1_ARMCLANG_PSA_3_REG_Debug_OTP_BL2_NS") {
+      print("LAVA is not needed for ${build_url}")
+    }
+    else if (params_collection["CONFIG_NAME"] == "MUSCA_B1_ARMCLANG_PSA_3_REG_Debug_OTP_BL2_NS" && \
+             !(env.JOB_NAME.equals("tf-m-nightly") || env.JOB_NAME.equals("tf-m-release"))) {
       print("LAVA is not needed for ${build_url}")
     }
     else {