diff --git a/circuits/scripts/build/build_cpp.sh b/circuits/scripts/build/build_cpp.sh
index 1a516fa8b..ab5d40247 100755
--- a/circuits/scripts/build/build_cpp.sh
+++ b/circuits/scripts/build/build_cpp.sh
@@ -9,62 +9,66 @@ fi
 
 REGISTER_CIRCUITS=(
     # passport
-    "register_sha1_sha1_sha1_ecdsa_brainpoolP224r1:true"
-    "register_sha1_sha1_sha1_ecdsa_secp256r1:true"
-    "register_sha1_sha1_sha1_rsa_65537_4096:true"
-    "register_sha1_sha256_sha256_rsa_65537_4096:true"
-    "register_sha224_sha224_sha224_ecdsa_brainpoolP224r1:true"
-    "register_sha256_sha224_sha224_ecdsa_secp224r1:true"
-    "register_sha256_sha256_sha224_ecdsa_secp224r1:true"
-    "register_sha256_sha256_sha256_ecdsa_brainpoolP256r1:true"
-    "register_sha256_sha256_sha256_ecdsa_brainpoolP384r1:true"
-    "register_sha256_sha256_sha256_ecdsa_secp256r1:true"
-    "register_sha256_sha256_sha256_ecdsa_secp384r1:true"
-    "register_sha256_sha256_sha256_rsa_3_4096:true"
-    "register_sha256_sha256_sha256_rsa_65537_4096:true"
-    "register_sha256_sha256_sha256_rsapss_3_32_2048:true"
-    "register_sha256_sha256_sha256_rsapss_65537_32_2048:true"
-    "register_sha256_sha256_sha256_rsapss_65537_32_3072:true"
-    "register_sha256_sha256_sha256_rsapss_65537_64_2048:true"
-    "register_sha384_sha384_sha384_ecdsa_brainpoolP384r1:true"
-    "register_sha384_sha384_sha384_ecdsa_brainpoolP512r1:true"
-    "register_sha384_sha384_sha384_ecdsa_secp384r1:true"
-    "register_sha384_sha384_sha384_rsapss_65537_48_2048:true"
-    "register_sha512_sha512_sha256_rsa_65537_4096:true"
-    "register_sha512_sha512_sha512_ecdsa_brainpoolP512r1:true"
-    "register_sha512_sha512_sha512_ecdsa_secp521r1:true"
-    "register_sha512_sha512_sha512_rsa_65537_4096:true"
-    "register_sha512_sha512_sha512_rsapss_65537_64_2048:true"
+    "register_sha1_sha1_sha1_ecdsa_brainpoolP224r1"
+    "register_sha1_sha1_sha1_ecdsa_secp256r1"
+    "register_sha256_sha1_sha1_rsa_65537_4096"
+    "register_sha1_sha1_sha1_rsa_65537_4096"
+    "register_sha1_sha256_sha256_rsa_65537_4096"
+    "register_sha224_sha224_sha224_ecdsa_brainpoolP224r1"
+    "register_sha256_sha224_sha224_ecdsa_secp224r1"
+    "register_sha256_sha256_sha224_ecdsa_secp224r1"
+    "register_sha256_sha256_sha256_ecdsa_brainpoolP256r1"
+    "register_sha256_sha256_sha256_ecdsa_brainpoolP384r1"
+    "register_sha256_sha256_sha256_ecdsa_secp256r1"
+    "register_sha256_sha256_sha256_ecdsa_secp384r1"
+    "register_sha256_sha256_sha256_rsa_3_4096"
+    "register_sha256_sha256_sha256_rsa_65537_4096"
+    "register_sha256_sha256_sha256_rsapss_3_32_2048"
+    "register_sha256_sha256_sha256_rsapss_65537_32_2048"
+    "register_sha256_sha256_sha256_rsapss_65537_32_3072"
+    "register_sha256_sha256_sha256_rsapss_65537_32_4096"
+    "register_sha256_sha256_sha256_rsapss_65537_64_2048"
+    "register_id_sha512_sha512_sha256_rsapss_65537_32_2048"
+    "register_sha384_sha384_sha384_ecdsa_brainpoolP384r1"
+    "register_sha384_sha384_sha384_ecdsa_brainpoolP512r1"
+    "register_sha384_sha384_sha384_ecdsa_secp384r1"
+    "register_sha512_sha512_sha256_rsapss_65537_32_2048"
+    "register_sha384_sha384_sha384_rsapss_65537_48_2048"
+    "register_sha512_sha512_sha256_rsa_65537_4096"
+    "register_sha512_sha512_sha512_ecdsa_brainpoolP512r1"
+    "register_sha512_sha512_sha512_ecdsa_secp521r1"
+    "register_sha512_sha512_sha512_rsa_65537_4096"
+    "register_sha512_sha512_sha512_rsapss_65537_64_2048"
 )
 
 REGISTER_ID_CIRCUITS=(
     # eu id
-    "register_id_sha1_sha1_sha1_ecdsa_brainpoolP224r1:true"
-    "register_id_sha1_sha1_sha1_ecdsa_secp256r1:true"
-    "register_id_sha1_sha1_sha1_rsa_65537_4096:true"
-    "register_id_sha1_sha256_sha256_rsa_65537_4096:true"
-    "register_id_sha224_sha224_sha224_ecdsa_brainpoolP224r1:true"
-    "register_id_sha256_sha224_sha224_ecdsa_secp224r1:true"
-    "register_id_sha256_sha256_sha224_ecdsa_secp224r1:true"
-    "register_id_sha256_sha256_sha256_ecdsa_brainpoolP256r1:true"
-    "register_id_sha256_sha256_sha256_ecdsa_brainpoolP384r1:true"
-    "register_id_sha256_sha256_sha256_ecdsa_secp256r1:true"
-    "register_id_sha256_sha256_sha256_ecdsa_secp384r1:true"
-    "register_id_sha256_sha256_sha256_rsa_3_4096:true"
-    "register_id_sha256_sha256_sha256_rsa_65537_4096:true"
-    "register_id_sha256_sha256_sha256_rsapss_3_32_2048:true"
-    "register_id_sha256_sha256_sha256_rsapss_65537_32_2048:true"
-    "register_id_sha256_sha256_sha256_rsapss_65537_32_3072:true"
-    "register_id_sha256_sha256_sha256_rsapss_65537_64_2048:true"
-    "register_id_sha384_sha384_sha384_ecdsa_brainpoolP384r1:true"
-    "register_id_sha384_sha384_sha384_ecdsa_brainpoolP512r1:true"
-    "register_id_sha384_sha384_sha384_ecdsa_secp384r1:true"
-    "register_id_sha384_sha384_sha384_rsapss_65537_48_2048:true"
-    "register_id_sha512_sha512_sha256_rsa_65537_4096:true"
-    "register_id_sha512_sha512_sha512_ecdsa_brainpoolP512r1:true"
-    "register_id_sha512_sha512_sha512_ecdsa_secp521r1:true"
-    "register_id_sha512_sha512_sha512_rsa_65537_4096:true"
-    "register_id_sha512_sha512_sha512_rsapss_65537_64_2048:true"
+    "register_id_sha1_sha1_sha1_ecdsa_brainpoolP224r1"
+    "register_id_sha1_sha1_sha1_ecdsa_secp256r1"
+    "register_id_sha1_sha1_sha1_rsa_65537_4096"
+    "register_id_sha1_sha256_sha256_rsa_65537_4096"
+    "register_id_sha224_sha224_sha224_ecdsa_brainpoolP224r1"
+    "register_id_sha256_sha224_sha224_ecdsa_secp224r1"
+    "register_id_sha256_sha256_sha224_ecdsa_secp224r1"
+    "register_id_sha256_sha256_sha256_ecdsa_brainpoolP256r1"
+    "register_id_sha256_sha256_sha256_ecdsa_brainpoolP384r1"
+    "register_id_sha256_sha256_sha256_ecdsa_secp256r1"
+    "register_id_sha256_sha256_sha256_ecdsa_secp384r1"
+    "register_id_sha256_sha256_sha256_rsa_3_4096"
+    "register_id_sha256_sha256_sha256_rsa_65537_4096"
+    "register_id_sha256_sha256_sha256_rsapss_3_32_2048"
+    "register_id_sha256_sha256_sha256_rsapss_65537_32_2048"
+    "register_id_sha256_sha256_sha256_rsapss_65537_32_3072"
+    "register_id_sha256_sha256_sha256_rsapss_65537_64_2048"
+    "register_id_sha384_sha384_sha384_ecdsa_brainpoolP384r1"
+    "register_id_sha384_sha384_sha384_ecdsa_brainpoolP512r1"
+    "register_id_sha384_sha384_sha384_ecdsa_secp384r1"
+    "register_id_sha384_sha384_sha384_rsapss_65537_48_2048"
+    "register_id_sha512_sha512_sha256_rsa_65537_4096"
+    "register_id_sha512_sha512_sha512_ecdsa_brainpoolP512r1"
+    "register_id_sha512_sha512_sha512_ecdsa_secp521r1"
+    "register_id_sha512_sha512_sha512_rsa_65537_4096"
+    "register_id_sha512_sha512_sha512_rsapss_65537_64_2048"
 )
 
 DISCLOSE_CIRCUITS=(
@@ -73,25 +77,25 @@ DISCLOSE_CIRCUITS=(
 )
 
 DSC_CIRCUITS=(
-    "dsc_sha1_ecdsa_brainpoolP256r1:true"
-    "dsc_sha1_ecdsa_secp256r1:true"
-    "dsc_sha1_rsa_65537_4096:true"
-    "dsc_sha256_ecdsa_brainpoolP256r1:true"
-    "dsc_sha256_ecdsa_brainpoolP384r1:true"
-    "dsc_sha256_ecdsa_secp256r1:true"
-    "dsc_sha256_ecdsa_secp384r1:true"
-    "dsc_sha256_ecdsa_secp521r1:true"
-    "dsc_sha256_rsa_65537_4096:true"
-    "dsc_sha256_rsapss_3_32_3072:true"
-    "dsc_sha256_rsapss_65537_32_3072:true"
-    "dsc_sha256_rsapss_65537_32_4096:true"
-    "dsc_sha384_ecdsa_brainpoolP384r1:true"
-    "dsc_sha384_ecdsa_brainpoolP512r1:true"
-    "dsc_sha384_ecdsa_secp384r1:true"
-    "dsc_sha512_ecdsa_brainpoolP512r1:true"
-    "dsc_sha512_ecdsa_secp521r1:true"
-    "dsc_sha512_rsa_65537_4096:true"
-    "dsc_sha512_rsapss_65537_64_4096:true"
+    "dsc_sha1_ecdsa_brainpoolP256r1"
+    "dsc_sha1_ecdsa_secp256r1"
+    "dsc_sha1_rsa_65537_4096"
+    "dsc_sha256_ecdsa_brainpoolP256r1"
+    "dsc_sha256_ecdsa_brainpoolP384r1"
+    "dsc_sha256_ecdsa_secp256r1"
+    "dsc_sha256_ecdsa_secp384r1"
+    "dsc_sha256_ecdsa_secp521r1"
+    "dsc_sha256_rsa_65537_4096"
+    "dsc_sha256_rsapss_3_32_3072"
+    "dsc_sha256_rsapss_65537_32_3072"
+    "dsc_sha256_rsapss_65537_32_4096"
+    "dsc_sha384_ecdsa_brainpoolP384r1"
+    "dsc_sha384_ecdsa_brainpoolP512r1"
+    "dsc_sha384_ecdsa_secp384r1"
+    "dsc_sha512_ecdsa_brainpoolP512r1"
+    "dsc_sha512_ecdsa_secp521r1"
+    "dsc_sha512_rsa_65537_4096"
+    "dsc_sha512_rsapss_65537_64_4096"
 )
 
 if [[ $1 == "register" ]]; then
@@ -126,7 +130,7 @@ for item in "${allowed_circuits[@]}"; do
         continue
     fi
 
-    while [[ ${#pids[@]} -ge 2 ]]; do
+    while [[ ${#pids[@]} -ge 1 ]]; do
         new_pids=()
         for pid in "${pids[@]}"; do
             if kill -0 "$pid" 2>/dev/null; then