diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5387962ed1..5d0b3be19d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,6 +174,12 @@ find_package(bacio 2.4.0 REQUIRED)
 find_package(sp 2.3.3 REQUIRED)
 find_package(w3emc 2.9.2 REQUIRED)
 
+if(MPAS)
+  find_package(PnetCDF REQUIRED COMPONENTS Fortran)
+  find_package(PIO REQUIRED COMPONENTS Fortran C)
+  set(FV3 OFF)
+endif()
+
 # Configure Python
 find_package(Python 3.6 REQUIRED COMPONENTS Interpreter)
 message("Found Python: ${Python_EXECUTABLE}")
@@ -189,13 +195,16 @@ endif()
 ### Atmosphere Components [FV3, MPAS?]
 ### DJS2024: There will be a generalized atmospheric component with multiple
 ###          dycores, not multiple atmospheric components (one for each dycore).
-###          So, - rename the atmospheric component FV3 to UFSATM, then
-###              - if FV3 or MPAS, add_sudirectory(UFSATM)
+###          So, - rename the atmospheric component FV3 to UFSATM or ATM, then
+###              - if FV3 or MPAS, add_sudirectory(UFSATM or ATM)
 ###   
 ###############################################################################
 if(FV3)
   add_subdirectory(FV3)
 endif()
+if (MPAS)
+  add_subdirectory(FV3)
+endif()
 
 ###############################################################################
 ### AQM
diff --git a/FV3 b/FV3
index 587ea55925..b4f6463fa4 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 587ea55925d09bef2b4e8aed296b70ad8e97d2c8
+Subproject commit b4f6463fa403b39fd80c51378c3aa1e42e466f21
diff --git a/driver/UFSDriver.F90 b/driver/UFSDriver.F90
index 9ad721618d..c9fb8f2ca9 100644
--- a/driver/UFSDriver.F90
+++ b/driver/UFSDriver.F90
@@ -367,12 +367,12 @@ subroutine SetModelServices(driver, rc)
           end if
 #endif
 #ifdef FRONT_MPAS
-          if (trim(model) == "mpas") then
-            call NUOPC_DriverAddComp(driver, trim(prefix), MPAS_SS, &
-              info=info, petList=petList, comp=comp, rc=rc)
-            if (ChkErr(rc,__LINE__,u_FILE_u)) return
-            found_comp = .true.
-          end if
+!          if (trim(model) == "mpas") then
+!            call NUOPC_DriverAddComp(driver, trim(prefix), MPAS_SS, &
+!              info=info, petList=petList, comp=comp, rc=rc)
+!            if (ChkErr(rc,__LINE__,u_FILE_u)) return
+!            found_comp = .true.
+!          end if
 #endif
 #if defined FRONT_CDEPS_DATM
           if (trim(model) == "datm" ) then