diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index d737077..eab8eca 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -771,10 +771,6 @@ _tkg_srcprep() {
       fi
     fi
 
-    if [ "$_kver" = "603" ]; then
-      _disable "MLX5_CORE"
-    fi
-
     _msg="Applying Glitched PDS patch"
     tkgpatch="$srcdir/0005${doa}-glitched-pds.patch" && _tkg_patcher
 
@@ -792,10 +788,6 @@ _tkg_srcprep() {
       tkgpatch="$srcdir/0009-glitched-ondemand-bmq.patch" && _tkg_patcher
     fi
 
-    if [ "$_kver" = "603" ]; then
-      _disable "MLX5_CORE"
-    fi
-
     _msg="Applying Glitched BMQ patch"
     tkgpatch="$srcdir/0009-glitched-bmq.patch" && _tkg_patcher
   elif [ "${_cpusched}" = "cacule" ]; then
@@ -884,6 +876,10 @@ _tkg_srcprep() {
   # buggy project C/PSI interaction workaround
   if [ "${_cpusched}" = "pds" ] || [ "${_cpusched}" = "bmq" ]; then
     _enable "PSI_DEFAULT_DISABLED"
+    # Disable MLX5_CORE on Prjc 6.3.y
+    if [ "$_kver" = "603" ]; then
+      _disable "MLX5_CORE"
+    fi
   fi
 
   if [ -n "$_custom_commandline" ]; then