diff --git a/driver/driver.hpp b/driver/driver.hpp
index ef0f908c94..1aef479dfd 100644
--- a/driver/driver.hpp
+++ b/driver/driver.hpp
@@ -26,7 +26,11 @@
 #ifndef GUARD_MIOPEN_DRIVER_HPP
 #define GUARD_MIOPEN_DRIVER_HPP
 
-#include "half.hpp"
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
+#include <half.hpp>
+#endif
 
 #include "random.hpp"
 
diff --git a/driver/reduce_driver.hpp b/driver/reduce_driver.hpp
index 3d83b02802..9d5787c542 100644
--- a/driver/reduce_driver.hpp
+++ b/driver/reduce_driver.hpp
@@ -43,7 +43,11 @@
 #include <string>
 #include <cassert>
 #include <type_traits>
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 #include "random.hpp"
 
 #include "miopen_Reduction.hpp"
diff --git a/fin b/fin
index 55c154d374..389d24ffa4 160000
--- a/fin
+++ b/fin
@@ -1 +1 @@
-Subproject commit 55c154d374cef086daeddc18226910b90555bf18
+Subproject commit 389d24ffa4f93350f579ce5b899166162d5f5350
diff --git a/src/composable_kernel/host/driver_offline/src/conv_bwd_driver_offline.cpp b/src/composable_kernel/host/driver_offline/src/conv_bwd_driver_offline.cpp
index 67cea94813..b4ed42362f 100644
--- a/src/composable_kernel/host/driver_offline/src/conv_bwd_driver_offline.cpp
+++ b/src/composable_kernel/host/driver_offline/src/conv_bwd_driver_offline.cpp
@@ -3,7 +3,11 @@
 #include <initializer_list>
 #include <cstdlib>
 #include <stdlib.h>
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 #include "config.hpp"
 #include "print.hpp"
 #include "device.hpp"
diff --git a/src/composable_kernel/host/driver_offline/src/conv_fwd_driver_offline.cpp b/src/composable_kernel/host/driver_offline/src/conv_fwd_driver_offline.cpp
index 32c33003c5..1bf65fc658 100644
--- a/src/composable_kernel/host/driver_offline/src/conv_fwd_driver_offline.cpp
+++ b/src/composable_kernel/host/driver_offline/src/conv_fwd_driver_offline.cpp
@@ -3,7 +3,11 @@
 #include <initializer_list>
 #include <cstdlib>
 #include <stdlib.h>
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 #include "config.hpp"
 #include "print.hpp"
 #include "device.hpp"
diff --git a/src/fusion.cpp b/src/fusion.cpp
index d7a00f74db..1c1ab2e0ec 100644
--- a/src/fusion.cpp
+++ b/src/fusion.cpp
@@ -39,7 +39,11 @@
 #include <ios>
 #include <algorithm>
 #include <string>
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 
 #define MIOPEN_CHECK(x)          \
     if(x != miopenStatusSuccess) \
diff --git a/src/gemm_v2.cpp b/src/gemm_v2.cpp
index 44d87fb393..ed3d607f72 100644
--- a/src/gemm_v2.cpp
+++ b/src/gemm_v2.cpp
@@ -39,7 +39,11 @@
 #endif
 
 #if MIOPEN_USE_ROCBLAS
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 #if MIOPEN_ROCBLAS_VERSION_FLAT < 2045000
 #include <rocblas.h>
 #else
diff --git a/src/include/miopen/op_kernel_args.hpp b/src/include/miopen/op_kernel_args.hpp
index 0d5f04ff8f..fe733d298b 100644
--- a/src/include/miopen/op_kernel_args.hpp
+++ b/src/include/miopen/op_kernel_args.hpp
@@ -3,7 +3,11 @@
 
 #include <type_traits>
 #include <cstdint>
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 #include <boost/container/small_vector.hpp>
 
 struct OpKernelArg
diff --git a/src/include/miopen/reduce_common.hpp b/src/include/miopen/reduce_common.hpp
index cd106d0d2b..fb3cb265dc 100644
--- a/src/include/miopen/reduce_common.hpp
+++ b/src/include/miopen/reduce_common.hpp
@@ -26,7 +26,11 @@
 #ifndef GUARD_MIOPEN_REDUCE_COMMON_HPP
 #define GUARD_MIOPEN_REDUCE_COMMON_HPP
 
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 #include <miopen/bfloat16.hpp>
 
 namespace reduce {
diff --git a/src/include/miopen/visit_float.hpp b/src/include/miopen/visit_float.hpp
index 5d64360060..8170ce5478 100644
--- a/src/include/miopen/visit_float.hpp
+++ b/src/include/miopen/visit_float.hpp
@@ -28,7 +28,11 @@
 #define GUARD_MLOPEN_VISIT_FLOAT_HPP
 
 #include <miopen/miopen.h>
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 #include <miopen/bfloat16.hpp>
 
 namespace miopen {
diff --git a/src/solver/conv_asm_1x1u_bias_activ_fused.cpp b/src/solver/conv_asm_1x1u_bias_activ_fused.cpp
index f6fcc180fc..43980e1f97 100644
--- a/src/solver/conv_asm_1x1u_bias_activ_fused.cpp
+++ b/src/solver/conv_asm_1x1u_bias_activ_fused.cpp
@@ -38,7 +38,11 @@
 #include <miopen/fusion/solvers.hpp>
 #include <miopen/fusion/fusion_invoke_params.hpp>
 
-#include "half.hpp"
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
+#include <half.hpp>
+#endif
 
 using half_float::half;
 
diff --git a/src/solver/conv_ocl_dir2Dfwd_exhaustive_search.cpp b/src/solver/conv_ocl_dir2Dfwd_exhaustive_search.cpp
index 52a62f5685..d83919174d 100644
--- a/src/solver/conv_ocl_dir2Dfwd_exhaustive_search.cpp
+++ b/src/solver/conv_ocl_dir2Dfwd_exhaustive_search.cpp
@@ -33,7 +33,11 @@
 #include <miopen/legacy_exhaustive_search.hpp>
 #include <miopen/bfloat16.hpp>
 #include <miopen/fusion/fusion_invoke_params.hpp>
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 
 #ifdef max
 #undef max
diff --git a/test/cpu_reduce_util.hpp b/test/cpu_reduce_util.hpp
index e261a4feda..99be88449d 100644
--- a/test/cpu_reduce_util.hpp
+++ b/test/cpu_reduce_util.hpp
@@ -26,7 +26,11 @@
 #ifndef GUARD_CPU_REDUCE_UTIL_HPP
 #define GUARD_CPU_REDUCE_UTIL_HPP
 
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 #include <limits>
 #include <cmath>
 #include <cassert>
diff --git a/test/driver.hpp b/test/driver.hpp
index ba0040a0a8..412f578e17 100644
--- a/test/driver.hpp
+++ b/test/driver.hpp
@@ -37,7 +37,11 @@
 
 #include <functional>
 #include <deque>
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 #include <type_traits>
 #include <boost/filesystem.hpp>
 #include <miopen/functional.hpp>
diff --git a/test/gpu_reference_kernel.cpp b/test/gpu_reference_kernel.cpp
index 39105db92c..65c7ac4f41 100644
--- a/test/gpu_reference_kernel.cpp
+++ b/test/gpu_reference_kernel.cpp
@@ -36,7 +36,11 @@
 #include <ctime>
 #include <tuple> // std::ignore
 #include <type_traits>
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 #include "test.hpp"
 #include "driver.hpp"
 #include "tensor_holder.hpp"
diff --git a/test/serialize.hpp b/test/serialize.hpp
index ded9d18440..0ebe37dab4 100644
--- a/test/serialize.hpp
+++ b/test/serialize.hpp
@@ -29,7 +29,11 @@
 
 #include <miopen/rank.hpp>
 #include <miopen/each_args.hpp>
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 #include <fstream>
 #include <string>
 #include <tuple>
diff --git a/test/tensor_holder.hpp b/test/tensor_holder.hpp
index 7a0ab854f6..f12072e032 100644
--- a/test/tensor_holder.hpp
+++ b/test/tensor_holder.hpp
@@ -36,7 +36,11 @@
 
 #include "serialize.hpp"
 
+#if HIP_PACKAGE_VERSION_FLAT >= 5006000000ULL
+#include <half/half.hpp>
+#else
 #include <half.hpp>
+#endif
 #include <iomanip>
 #include <fstream>