diff --git a/include/ck_tile/core/arch/amd_buffer_coherence.hpp b/include/ck_tile/core/arch/amd_buffer_coherence.hpp
index 93e07064cf..d92d1a3e7b 100644
--- a/include/ck_tile/core/arch/amd_buffer_coherence.hpp
+++ b/include/ck_tile/core/arch/amd_buffer_coherence.hpp
@@ -83,9 +83,9 @@ enum struct amd_buffer_coherence_enum
     slc     = SYSTEM_NT,
     glc_slc = DEVICE_NT | SYSTEM_NT,
 
-    // To forward compatible
-    WAVE_NT0 = INT_MAX,
-    WAVE_NT1 = INT_MAX - 1,
+    // TODO:Remove hack here
+    WAVE_NT0 = 0,
+    WAVE_NT1 = 2,
 // gfx94: bit 0 = sc0, bit 1 = nt, bit 3 = swz, bit 4 = sc1
 // SC[1:0] System Cache level: 0=wave, 1=group, 2=device, 3=system
 // NT Non-Temporal: 0=expect temporal reuse; 1=do not expect temporal reuse
@@ -122,9 +122,9 @@ enum struct amd_buffer_coherence_enum
     DEVICE_NT1 = glc,
     SYSTEM_NT1 = slc,
 
-    // To forward compatible
-    WAVE_NT0  = 0,
-    WAVE_NT1  = 2,
+    // TODO:Remove hack here
+    WAVE_NT0 = 0,
+    WAVE_NT1 = 2,
 #endif
 };