diff --git a/providers/leancrypto/artifacts_certs_r4.zip b/providers/leancrypto/artifacts_certs_r4.zip
index b43df3f..026998b 100644
Binary files a/providers/leancrypto/artifacts_certs_r4.zip and b/providers/leancrypto/artifacts_certs_r4.zip differ
diff --git a/providers/leancrypto/compatMatrices/artifacts_certs_r4/bc_leancrypto.csv b/providers/leancrypto/compatMatrices/artifacts_certs_r4/bc_leancrypto.csv
index 0fe2d6c..6874ff5 100644
--- a/providers/leancrypto/compatMatrices/artifacts_certs_r4/bc_leancrypto.csv
+++ b/providers/leancrypto/compatMatrices/artifacts_certs_r4/bc_leancrypto.csv
@@ -8,3 +8,5 @@ key_algorithm_oid,test_result
 2.16.840.1.101.3.4.3.17,Y
 2.16.840.1.101.3.4.3.18,Y
 2.16.840.1.101.3.4.3.19,Y
+2.16.840.1.114027.80.8.1.23,Y
+2.16.840.1.114027.80.8.1.30,Y
diff --git a/providers/leancrypto/compatMatrices/artifacts_certs_r4/cht_leancrypto.csv b/providers/leancrypto/compatMatrices/artifacts_certs_r4/cht_leancrypto.csv
index 0fe2d6c..6874ff5 100644
--- a/providers/leancrypto/compatMatrices/artifacts_certs_r4/cht_leancrypto.csv
+++ b/providers/leancrypto/compatMatrices/artifacts_certs_r4/cht_leancrypto.csv
@@ -8,3 +8,5 @@ key_algorithm_oid,test_result
 2.16.840.1.101.3.4.3.17,Y
 2.16.840.1.101.3.4.3.18,Y
 2.16.840.1.101.3.4.3.19,Y
+2.16.840.1.114027.80.8.1.23,Y
+2.16.840.1.114027.80.8.1.30,Y
diff --git a/providers/leancrypto/compatMatrices/artifacts_certs_r4/seventhsense.ai_leancrypto.csv b/providers/leancrypto/compatMatrices/artifacts_certs_r4/seventhsense.ai_leancrypto.csv
index 0fe2d6c..6874ff5 100644
--- a/providers/leancrypto/compatMatrices/artifacts_certs_r4/seventhsense.ai_leancrypto.csv
+++ b/providers/leancrypto/compatMatrices/artifacts_certs_r4/seventhsense.ai_leancrypto.csv
@@ -8,3 +8,5 @@ key_algorithm_oid,test_result
 2.16.840.1.101.3.4.3.17,Y
 2.16.840.1.101.3.4.3.18,Y
 2.16.840.1.101.3.4.3.19,Y
+2.16.840.1.114027.80.8.1.23,Y
+2.16.840.1.114027.80.8.1.30,Y
diff --git a/providers/leancrypto/gen.sh b/providers/leancrypto/gen.sh
index d8f7225..93a1350 100755
--- a/providers/leancrypto/gen.sh
+++ b/providers/leancrypto/gen.sh
@@ -30,13 +30,11 @@ CERTTYPES_SLH_DSA="
 	SLH-DSA-SHAKE-128S:2.16.840.1.101.3.4.3.26
 	SLH-DSA-SHAKE-128F:2.16.840.1.101.3.4.3.27"
 
-# These definitions are currently disabled as there seems to be an issue in
-# leancrypto
 CERTTYPES_COMPOSITE_ML_DSA="
 	ML-DSA65-ED25519:SHA512-2.16.840.1.114027.80.8.1.30
 	ML-DSA44-ED25519:SHA512-2.16.840.1.114027.80.8.1.23"
 
-CERTTYPES="$CERTTYPES_ML_DSA $CERTTYPES_SLH_DSA"
+CERTTYPES="$CERTTYPES_ML_DSA $CERTTYPES_SLH_DSA $CERTTYPES_COMPOSITE_ML_DSA"
 
 ################################################################################
 # No further configurations below this line
diff --git a/providers/leancrypto/leancrypto_check_with_ietf.sh b/providers/leancrypto/leancrypto_check_with_ietf.sh
index 79a834a..f685a99 100755
--- a/providers/leancrypto/leancrypto_check_with_ietf.sh
+++ b/providers/leancrypto/leancrypto_check_with_ietf.sh
@@ -114,7 +114,7 @@ extract_files() {
 
 bc_test() {
 	local slh_dsa_files="slh-dsa-shake-128f-2.16.840.1.101.3.4.3.27_ta.der slh-dsa-shake-128s-2.16.840.1.101.3.4.3.26_ta.der slh-dsa-shake-192f-2.16.840.1.101.3.4.3.29_ta.der slh-dsa-shake-192s-2.16.840.1.101.3.4.3.28_ta.der slh-dsa-shake-256f-2.16.840.1.101.3.4.3.31_ta.der slh-dsa-shake-256s-2.16.840.1.101.3.4.3.30_ta.der"
-	#local composite_ml_dsa_files="MLDSA44-Ed25519-SHA512-2.16.840.1.114027.80.8.1.23_ta.der MLDSA65-Ed25519-SHA512-2.16.840.1.114027.80.8.1.30_ta.der"
+	local composite_ml_dsa_files="MLDSA44-Ed25519-SHA512-2.16.840.1.114027.80.8.1.23_ta.der MLDSA65-Ed25519-SHA512-2.16.840.1.114027.80.8.1.30_ta.der"
 	local ml_dsa_files="ml-dsa-44-2.16.840.1.101.3.4.3.17_ta.der ml-dsa-65-2.16.840.1.101.3.4.3.18_ta.der ml-dsa-87-2.16.840.1.101.3.4.3.19_ta.der"
 
 	local files="$slh_dsa_files $composite_ml_dsa_files $ml_dsa_files"
@@ -143,7 +143,7 @@ redhound_test() {
 cht_test() {
 	local subdir="artifacts_certs_r4"
 	local slh_dsa_files="$subdir/SLH-DSA-SHAKE-128f-2.16.840.1.101.3.4.3.27_ta.der $subdir/SLH-DSA-SHAKE-128s-2.16.840.1.101.3.4.3.26_ta.der $subdir/SLH-DSA-SHAKE-192f-2.16.840.1.101.3.4.3.29_ta.der $subdir/SLH-DSA-SHAKE-192s-2.16.840.1.101.3.4.3.28_ta.der $subdir/SLH-DSA-SHAKE-256f-2.16.840.1.101.3.4.3.31_ta.der $subdir/SLH-DSA-SHAKE-256s-2.16.840.1.101.3.4.3.30_ta.der"
-	#local composite_ml_dsa_files="$subdir/id-MLDSA44-Ed25519-2.16.840.1.114027.80.8.1.23_ta.der $subdir/id-MLDSA65-Ed25519-2.16.840.1.114027.80.8.1.30_ta.der"
+	local composite_ml_dsa_files="$subdir/id-MLDSA44-Ed25519-2.16.840.1.114027.80.8.1.23_ta.der $subdir/id-MLDSA65-Ed25519-2.16.840.1.114027.80.8.1.30_ta.der"
 	local ml_dsa_files="$subdir/ML-DSA-44-2.16.840.1.101.3.4.3.17_ta.der $subdir/ML-DSA-65-2.16.840.1.101.3.4.3.18_ta.der $subdir/ML-DSA-87-2.16.840.1.101.3.4.3.19_ta.der"
 
 	local files="$slh_dsa_files $composite_ml_dsa_files $ml_dsa_files"
@@ -223,7 +223,7 @@ kris_test() {
 
 seventhsense_test() {
 	local slh_dsa_files="SlhDsaShake128f-2.16.840.1.101.3.4.3.27_ta.der SlhDsaShake128s-2.16.840.1.101.3.4.3.26_ta.der SlhDsaShake192f-2.16.840.1.101.3.4.3.29_ta.der SlhDsaShake192s-2.16.840.1.101.3.4.3.28_ta.der SlhDsaShake256f-2.16.840.1.101.3.4.3.31_ta.der SlhDsaShake256s-2.16.840.1.101.3.4.3.30_ta.der"
-	#local composite_ml_dsa_files="MlDsa44Ed25519-2.16.840.1.114027.80.8.1.23_ta.der MlDsa65Ed25519-2.16.840.1.114027.80.8.1.30_ta.der"
+	local composite_ml_dsa_files="MlDsa44Ed25519-2.16.840.1.114027.80.8.1.23_ta.der MlDsa65Ed25519-2.16.840.1.114027.80.8.1.30_ta.der"
 	local ml_dsa_files="MlDsa44-2.16.840.1.101.3.4.3.17_ta.der MlDsa65-2.16.840.1.101.3.4.3.18_ta.der MlDsa87-2.16.840.1.101.3.4.3.19_ta.der"
 
 	local files="$slh_dsa_files $composite_ml_dsa_files $ml_dsa_files"
@@ -238,7 +238,7 @@ seventhsense_test() {
 leancrypto_test() {
 	local subdir="artifacts_certs_r4"
 	local slh_dsa_files="$subdir/SLH-DSA-SHAKE-128F-2.16.840.1.101.3.4.3.27_ta.der $subdir/SLH-DSA-SHAKE-128S-2.16.840.1.101.3.4.3.26_ta.der $subdir/SLH-DSA-SHAKE-192F-2.16.840.1.101.3.4.3.29_ta.der $subdir/SLH-DSA-SHAKE-192S-2.16.840.1.101.3.4.3.28_ta.der $subdir/SLH-DSA-SHAKE-256F-2.16.840.1.101.3.4.3.31_ta.der $subdir/SLH-DSA-SHAKE-256S-2.16.840.1.101.3.4.3.30_ta.der"
-	#local composite_ml_dsa_files="$subdir/id-MLDSA44-ED25519-2.16.840.1.114027.80.8.1.23_ta.der $subdir/id-MLDSA65-ED25519-2.16.840.1.114027.80.8.1.30_ta.der"
+	local composite_ml_dsa_files="$subdir/ML-DSA44-ED25519-SHA512-2.16.840.1.114027.80.8.1.23_ta.der $subdir/ML-DSA65-ED25519-SHA512-2.16.840.1.114027.80.8.1.30_ta.der"
 	local ml_dsa_files="$subdir/ML-DSA44-2.16.840.1.101.3.4.3.17_ta.der $subdir/ML-DSA65-2.16.840.1.101.3.4.3.18_ta.der $subdir/ML-DSA87-2.16.840.1.101.3.4.3.19_ta.der"
 
 	local files="$slh_dsa_files $composite_ml_dsa_files $ml_dsa_files"