diff --git a/kernel/arm64/KERNEL.THUNDERX2T99 b/kernel/arm64/KERNEL.THUNDERX2T99
index 8145e9be9..fa0cc918e 100644
--- a/kernel/arm64/KERNEL.THUNDERX2T99
+++ b/kernel/arm64/KERNEL.THUNDERX2T99
@@ -1,2 +1,8 @@
-include $(KERNELDIR)/KERNEL.VULCAN
+include $(KERNELDIR)/KERNEL.CORTEXA57
+
+ifeq ($(DGEMM_UNROLL_M)x$(DGEMM_UNROLL_N), 8x4)
+DGEMMKERNEL    =  dgemm_kernel_8x4_thunderx2t99.S
+else
+DGEMMKERNEL    =  dgemm_kernel_$(DGEMM_UNROLL_M)x$(DGEMM_UNROLL_N).S
+endif
 
diff --git a/kernel/arm64/KERNEL.VULCAN b/kernel/arm64/KERNEL.VULCAN
index 24567f573..8b0273951 100644
--- a/kernel/arm64/KERNEL.VULCAN
+++ b/kernel/arm64/KERNEL.VULCAN
@@ -1,4 +1,3 @@
-include $(KERNELDIR)/KERNEL.CORTEXA57
+include $(KERNELDIR)/KERNEL.THUNDERX2T99
 
-DGEMMKERNEL    =  dgemm_kernel_$(DGEMM_UNROLL_M)x$(DGEMM_UNROLL_N)_vulcan.S
 
diff --git a/kernel/arm64/dgemm_kernel_8x4_vulcan.S b/kernel/arm64/dgemm_kernel_8x4_thunderx2t99.S
similarity index 100%
rename from kernel/arm64/dgemm_kernel_8x4_vulcan.S
rename to kernel/arm64/dgemm_kernel_8x4_thunderx2t99.S