diff --git a/providers/kris/default/artifacts.zip b/providers/kris/default/artifacts.zip
deleted file mode 100644
index 5595fedf..00000000
Binary files a/providers/kris/default/artifacts.zip and /dev/null differ
diff --git a/providers/kris/default/check_r3.sh b/providers/kris/default/check_r3.sh
index 2fe12a46..60dea6cb 100755
--- a/providers/kris/default/check_r3.sh
+++ b/providers/kris/default/check_r3.sh
@@ -66,23 +66,16 @@ check() {
 	cd ..
 }
 
-    if [ $# -ne 1 ]; then
-       echo "No target directory to check provided. Exiting."
-       exit -1
-    else
-        pushd $1 >/dev/null 2>/dev/null
-    fi
-    #echo "Checking in $(pwd)"
-    if [ ! -d "artifacts" ]; then
-        echo "No artifacts found. Exiting."
-        exit -1
-    fi
-    cd artifacts
-    echo "key_algorithm_oid,test_result"
-    for oid_folder in 1*_ta.*; do
-	   target=$(echo $oid_folder | sed -r "s/(.*)_ta.*/\1/g")
-       check_cert "${target}_ta"
-       result=$(check "${target}_ta.pem")
-	   echo "${target},${result}"
-    done
-    popd 2>/dev/null >/dev/null
+#echo "Checking in $(pwd)"
+if [ ! -d "artifacts" ]; then
+    echo "No artifacts found. Exiting."
+    exit -1
+fi
+cd artifacts
+echo "key_algorithm_oid,test_result"
+for oid_folder in 1*_ta.*; do
+   target=$(echo $oid_folder | sed -r "s/(.*)_ta.*/\1/g")
+   check_cert "${target}_ta"
+   result=$(check "${target}_ta.pem")
+   echo "${target},${result}"
+done
diff --git a/providers/kris/default/gen_r3.sh b/providers/kris/default/gen_r3.sh
index d8184c41..669e41e2 100755
--- a/providers/kris/default/gen_r3.sh
+++ b/providers/kris/default/gen_r3.sh
@@ -2,6 +2,7 @@
 # set -x
 
 DIR=../artifacts
+source oids.sh
 
 gen() {
    ALG=$1
@@ -17,13 +18,13 @@ gen() {
 }
 
 # Dilithium
-gen DILITHIUM_2 1.3.6.1.4.1.2.267.7.4.4
-gen DILITHIUM_3 1.3.6.1.4.1.2.267.7.6.5
-gen DILITHIUM_5 1.3.6.1.4.1.2.267.7.8.7
-gen MLDSA_44_IPD 1.3.6.1.4.1.2.267.12.4.4
-gen MLDSA_65_IPD 1.3.6.1.4.1.2.267.12.6.5
-gen MLDSA_87_IPD 1.3.6.1.4.1.2.267.12.8.7
+gen DILITHIUM_2 ${DILITHIUM_2}
+gen DILITHIUM_3 ${DILITHIUM_3}
+gen DILITHIUM_5 ${DILITHIUM_5}
+gen MLDSA_44_IPD ${MLDSA_44_IPD}
+gen MLDSA_65_IPD ${MLDSA_65_IPD}
+gen MLDSA_87_IPD ${MLDSA_87_IPD}
 
 # Falcon
-gen FALCON_512 1.3.9999.3.6
-gen FALCON_1024 1.3.9999.3.9
+gen FALCON_512 ${FALCON_512}
+gen FALCON_1024 ${FALCON_1024}
diff --git a/providers/kris/export_oids.sh b/providers/kris/default/oids.sh
similarity index 90%
rename from providers/kris/export_oids.sh
rename to providers/kris/default/oids.sh
index 0fc024ad..aa630f8e 100644
--- a/providers/kris/export_oids.sh
+++ b/providers/kris/default/oids.sh
@@ -4,5 +4,5 @@ export DILITHIUM_5=1.3.6.1.4.1.2.267.7.8.7
 export MLDSA_44_IPD=1.3.6.1.4.1.2.267.12.4.4
 export MLDSA_65_IPD=1.3.6.1.4.1.2.267.12.6.5
 export MLDSA_87_IPD=1.3.6.1.4.1.2.267.12.8.7
-export FALCON_512=1.3.9999.3.6
+export FALCON_512=1.3.9999.3.1
 export FALCON_1024=1.3.9999.3.9