diff --git a/fips-check.sh b/fips-check.sh
index 19a452f69..5ee63a704 100755
--- a/fips-check.sh
+++ b/fips-check.sh
@@ -231,6 +231,7 @@ linuxv5.2.1)
 v6.0.0)
   WOLF_REPO_TAG='WCv6.0.0-RC1'
   FIPS_REPO_TAG='WCv6.0.0-RC1'
+  ASM_PICKUPS_TAG='WCv6.0.0-RC2'
   FIPS_OPTION='v6'
   FIPS_FILES=(
     "wolfcrypt/src/fips.c:${FIPS_REPO_TAG}"
@@ -246,21 +247,21 @@ v6.0.0)
     "wolfcrypt/src/aes_gcm_x86_asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/aes_xts_asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/aes.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-aes-asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-32-curve25519_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-curve25519_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-curve25519.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-sha256-asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-sha512-asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-aes.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-curve25519_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-aes.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/port/arm/armv8-curve25519_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-curve25519.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/armv8-sha256.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-sha3-asm_c.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-sha3-asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-sha512-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-sha3-asm_c.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/port/arm/armv8-sha3-asm.S:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/port/arm/armv8-sha512-asm_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-sha512-asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/armv8-sha512.c:${WOLF_REPO_TAG}"
     "wolfcrypt/src/cmac.c:${WOLF_REPO_TAG}"
@@ -282,15 +283,15 @@ v6.0.0)
     "wolfcrypt/src/sha3_asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/sha512_asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/sha512.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_arm32.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_arm64.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_armthumb.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_c32.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_c64.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_cortexm.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sp_arm32.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/sp_arm64.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/sp_armthumb.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/sp_c32.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/sp_c64.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/sp_cortexm.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/sp_x86_64_asm.asm:${WOLF_REPO_TAG}"
     "wolfcrypt/src/sp_x86_64_asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_x86_64.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sp_x86_64.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/thumb2-aes-asm_c.c:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/thumb2-aes-asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/thumb2-curve25519_c.c:${WOLF_REPO_TAG}"