diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake
index bf8b9ecdd7..f43ab26b58 100644
--- a/ports/highfive/portfile.cmake
+++ b/ports/highfive/portfile.cmake
@@ -38,12 +38,10 @@ if("tests" IN_LIST FEATURES)
     )
 endif()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH share/HighFive/CMake)
+# Use PACKAGE_NAME to avoid folder HighFive and highfive are exist at same time
+vcpkg_cmake_config_fixup(PACKAGE_NAME HighFive CONFIG_PATH share/HighFive/CMake)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
-if(NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_IS_OSX)
-  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/HighFive")
-endif()
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/highfive/vcpkg.json b/ports/highfive/vcpkg.json
index 4603bcf4b6..c30c528606 100644
--- a/ports/highfive/vcpkg.json
+++ b/ports/highfive/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "highfive",
   "version": "2.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "HighFive is a modern header-only C++/C++11 friendly interface for libhdf5",
   "homepage": "https://github.com/BlueBrain/HighFive",
   "license": "BSL-1.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 631fc15873..feb7e1bc50 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2694,7 +2694,7 @@
     },
     "highfive": {
       "baseline": "2.3",
-      "port-version": 1
+      "port-version": 2
     },
     "highway": {
       "baseline": "0.14.2",
diff --git a/versions/h-/highfive.json b/versions/h-/highfive.json
index 024a8af17e..eaf02f1bab 100644
--- a/versions/h-/highfive.json
+++ b/versions/h-/highfive.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b1ecca066cce62dd0fbdf760151ee0c3ccc70b81",
+      "version": "2.3",
+      "port-version": 2
+    },
     {
       "git-tree": "e2f9f257e00960a16a162c1f279406f48528db5a",
       "version": "2.3",