diff --git a/.gitmodules b/.gitmodules
index 22c723ac1..d7c02a1ed 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,8 +8,10 @@
   branch = main
 [submodule "ccpp/physics"]
   path = ccpp/physics
-  url = https://github.com/ufs-community/ccpp-physics
-  branch = ufs/dev
+#  url = https://github.com/ufs-community/ccpp-physics
+#  branch = ufs/dev
+  url = https://github.com/rhaesung/ccpp-physics
+  branch = hr5
 [submodule "upp"]
   path = upp
   url = https://github.com/NOAA-EMC/UPP
diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90
index d2a8bdf5a..41eae554f 100644
--- a/ccpp/driver/GFS_diagnostics.F90
+++ b/ccpp/driver/GFS_diagnostics.F90
@@ -1411,7 +1411,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'pevpr_ave'
     ExtDiag(idx)%desc = 'averaged potential evaporation rate'
-    ExtDiag(idx)%unit = 'W/m**2'
+    ExtDiag(idx)%unit = 'mm/s'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%time_avg = .TRUE.
     allocate (ExtDiag(idx)%data(nblks))
@@ -2225,7 +2225,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'pevpr'
     ExtDiag(idx)%desc = 'instantaneous surface potential evaporation'
-    ExtDiag(idx)%unit = 'W/m**2'
+    ExtDiag(idx)%unit = 'mm/s'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     allocate (ExtDiag(idx)%data(nblks))
     do nb = 1,nblks
diff --git a/ccpp/physics b/ccpp/physics
index a7fe01c4d..80d5c4014 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit a7fe01c4da43955de38bac8c39667478cd03c711
+Subproject commit 80d5c40141cf0b441487392ca5fec2748cee2fde