diff --git a/CMakeLists.txt b/CMakeLists.txt
index 320a1580b..37285a443 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,7 +189,7 @@ target_link_libraries(fv3atm PUBLIC nemsio::nemsio
                                     esmf)
 
 if(INLINE_POST)
-  target_link_libraries(fv3atm PUBLIC nceppost::nceppost)
+  target_link_libraries(fv3atm PUBLIC upp::upp)
 endif()
 
 if(OpenMP_Fortran_FOUND)
diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere
index f06c1767a..61875852b 160000
--- a/atmos_cubed_sphere
+++ b/atmos_cubed_sphere
@@ -1 +1 @@
-Subproject commit f06c1767ad1c44bc34960227405cd65d471973a0
+Subproject commit 61875852b52951f6c6215603a19c826b952fc534
diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
index a45608354..4cbaeb678 100644
--- a/io/CMakeLists.txt
+++ b/io/CMakeLists.txt
@@ -38,7 +38,7 @@ target_link_libraries(io PRIVATE fms
                                  ipd)
 
 if(INLINE_POST)
-  target_link_libraries(io PRIVATE nceppost::nceppost)
+  target_link_libraries(io PRIVATE upp::upp)
 endif()
 
 if(CCPP)
diff --git a/io/makefile b/io/makefile
index eda6adb39..99a0dbdce 100644
--- a/io/makefile
+++ b/io/makefile
@@ -66,7 +66,7 @@ $(LIBRARY): $(OBJS)
 FV3GFS_io.o: FV3GFS_io.F90
 	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) $(ESMF_INC) -c FV3GFS_io.F90
 post_nems_routines.o: post_nems_routines.F90
-	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -I$(POST_INC) -c post_nems_routines.F90
+	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -I$(UPP_INC) -c post_nems_routines.F90
 module_write_nemsio.o: module_write_nemsio.F90
 	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) $(ESMF_INC) $(NEMSIOINC) -c module_write_nemsio.F90
 module_write_netcdf.o: module_write_netcdf.F90
@@ -80,7 +80,7 @@ module_write_internal_state.o: module_write_internal_state.F90
 module_wrt_grid_comp.o: module_wrt_grid_comp.F90
 	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) $(ESMF_INC) -c module_wrt_grid_comp.F90
 post_gfs.o: post_gfs.F90
-	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) $(ESMF_INC) -I$(POST_INC) -c post_gfs.F90
+	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) $(ESMF_INC) -I$(UPP_INC) -c post_gfs.F90
 post_gfs_stub.o: post_gfs_stub.F90
 	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) $(ESMF_INC) -c post_gfs_stub.F90