diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 6181d86..2453e73 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -185,7 +185,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -204,7 +204,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -223,7 +223,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -245,7 +245,7 @@
                                      "INITIAL_ATTESTATION",
                                      "INTERNAL_TRUSTED_STORAGE"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -264,7 +264,7 @@
                 "test_regression":  [False],
                 "test_psa_api":     ["IPC"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -286,7 +286,7 @@
                                      "INITIAL_ATTESTATION",
                                      "INTERNAL_TRUSTED_STORAGE"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [True],
+                "with_otp":         ["ENABLED"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -305,7 +305,7 @@
                 "test_regression":  [False],
                 "test_psa_api":     ["IPC"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [True],
+                "with_otp":         ["ENABLED"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -324,7 +324,7 @@
                 "test_regression":  [True],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -343,7 +343,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -362,7 +362,7 @@
                "test_regression":  [True, False],
                "test_psa_api":     ["OFF"],
                "cmake_build_type": ["Debug", "Release"],
-               "with_otp":         [False],
+               "with_otp":         ["off"],
                "with_bl2":         [True, False],
                "with_ns":          [True, False],
                "profile":          [""],
@@ -384,7 +384,7 @@
                "test_regression":  [True, False],
                "test_psa_api":     ["OFF"],
                "cmake_build_type": ["Debug", "Release"],
-               "with_otp":         [False],
+               "with_otp":         ["off"],
                "with_bl2":         [True, False],
                "with_ns":          [True, False],
                "profile":          [""],
@@ -410,7 +410,7 @@
                "test_regression":  [True, False],
                "test_psa_api":     ["OFF"],
                "cmake_build_type": ["Debug", "Release"],
-               "with_otp":         [False],
+               "with_otp":         ["off"],
                "with_bl2":         [True, False],
                "with_ns":          [True, False],
                "profile":          [""],
@@ -435,7 +435,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -455,7 +455,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -478,7 +478,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          ["profile_small", "profile_medium"],
@@ -500,7 +500,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [True],
+                "with_otp":         ["ENABLED"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -519,7 +519,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -538,7 +538,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -557,7 +557,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -578,7 +578,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -606,7 +606,7 @@
                                      "INITIAL_ATTESTATION",
                                      "INTERNAL_TRUSTED_STORAGE"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -629,7 +629,7 @@
                 "test_regression":  [False],
                 "test_psa_api":     ["IPC"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [True],
+                "with_otp":         ["ENABLED"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -654,7 +654,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -681,7 +681,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          ["profile_small", "profile_medium"],
@@ -706,7 +706,7 @@
                                      "INITIAL_ATTESTATION",
                                      "INTERNAL_TRUSTED_STORAGE"],
                 "cmake_build_type": ["Debug", "Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -725,7 +725,7 @@
                 "test_regression":  [False],
                 "test_psa_api":     ["IPC"],
                 "cmake_build_type": ["Debug", "Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -744,7 +744,7 @@
                 "test_regression":  [True],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release"],
-                "with_otp":         [True],
+                "with_otp":         ["ENABLED"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -764,7 +764,7 @@
                 "test_regression":  [True],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          ["", "profile_small"],
@@ -789,7 +789,7 @@
                 "test_regression":  [True],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
-                "with_otp":         [True],
+                "with_otp":         ["ENABLED"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -812,7 +812,7 @@
                                      "INITIAL_ATTESTATION",
                                      "INTERNAL_TRUSTED_STORAGE"],
                 "cmake_build_type": ["Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -830,7 +830,7 @@
                 "test_regression":  [True],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -865,7 +865,7 @@
                 "test_regression":  [False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True],
                 "profile":          [""],
@@ -885,7 +885,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True],
                 "profile":          [""],
@@ -910,7 +910,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True],
                 "profile":          [""],
@@ -935,7 +935,7 @@
                 "test_regression":  [True],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -959,7 +959,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -986,7 +986,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -1009,7 +1009,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          ["profile_small", "profile_medium"],
@@ -1031,7 +1031,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [True],
+                "with_otp":         ["ENABLED"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -1053,7 +1053,7 @@
                                      "INITIAL_ATTESTATION",
                                      "INTERNAL_TRUSTED_STORAGE"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -1072,7 +1072,7 @@
                 "test_regression":  [False],
                 "test_psa_api":     ["IPC"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -1094,7 +1094,7 @@
                                      "INITIAL_ATTESTATION",
                                      "INTERNAL_TRUSTED_STORAGE"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [True],
+                "with_otp":         ["ENABLED"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -1113,7 +1113,7 @@
                 "test_regression":  [False],
                 "test_psa_api":     ["IPC"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [True],
+                "with_otp":         ["ENABLED"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -1132,7 +1132,7 @@
                 "test_regression":  [True],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -1154,7 +1154,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -1181,7 +1181,7 @@
                 "test_regression":  [True, False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True, False],
                 "with_ns":          [True, False],
                 "profile":          ["profile_small", "profile_medium"],
@@ -1206,7 +1206,7 @@
                                      "INITIAL_ATTESTATION",
                                      "INTERNAL_TRUSTED_STORAGE"],
                 "cmake_build_type": ["Debug", "Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -1225,7 +1225,7 @@
                 "test_regression":  [False],
                 "test_psa_api":     ["IPC"],
                 "cmake_build_type": ["Debug", "Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -1244,7 +1244,7 @@
                 "test_regression":  [True],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug", "Release"],
-                "with_otp":         [True],
+                "with_otp":         ["ENABLED"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -1264,7 +1264,7 @@
                 "test_regression":  [True],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          ["", "profile_small"],
@@ -1290,7 +1290,7 @@
                 "test_regression":  [True],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
-                "with_otp":         [True],
+                "with_otp":         ["ENABLED"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -1313,7 +1313,7 @@
                                      "INITIAL_ATTESTATION",
                                      "INTERNAL_TRUSTED_STORAGE"],
                 "cmake_build_type": ["Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [True],
                 "with_ns":          [True, False],
                 "profile":          [""],
@@ -1332,7 +1332,7 @@
                 "test_regression":  [True],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Release"],
-                "with_otp":         [False],
+                "with_otp":         ["off"],
                 "with_bl2":         [False],
                 "with_ns":          [True, False],
                 "profile":          [""],
diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index 2cc4f87..7d56c7a 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -555,7 +555,7 @@
             if list(i)[5] != "OFF":    #TEST_PSA_API
                 config_param.append(mapTestPsaApi[list(i)[5]])
             config_param.append(list(i)[6]) # BUILD_TYPE
-            if list(i)[7]:  # OTP
+            if list(i)[7] == "ENABLED":  # OTP
                 config_param.append("OTP")
             if list(i)[8]:  # BL2
                 config_param.append("BL2")