diff --git a/L/LAMMPS/build_tarballs.jl b/L/LAMMPS/build_tarballs.jl
index a1d6865b4bf..763fb4db61e 100644
--- a/L/LAMMPS/build_tarballs.jl
+++ b/L/LAMMPS/build_tarballs.jl
@@ -39,7 +39,7 @@ cmake -C ../cmake/presets/most.cmake -C ../cmake/presets/nolib.cmake ../cmake -D
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=ON \
     -DLAMMPS_EXCEPTIONS=ON \
-    -DPKG_MPI=ON \
+    -DBUILD_MPI=ON \
     -DPKG_EXTRA-FIX=ON \
     -DPKG_ML-SNAP=ON \
     -DPKG_ML-PACE=ON \
@@ -75,18 +75,19 @@ augment_platform_block = """
 # platforms are passed in on the command line
 # platforms = supported_platforms(; experimental=true)
 platforms = supported_platforms()
-platforms = expand_cxxstring_abis(platforms)
-
 platforms, platform_dependencies = MPI.augment_platforms(platforms)
 # Avoid platforms where the MPI implementation isn't supported
 # OpenMPI
-platforms = filter(p -> !(p["mpi"] == "openmpi" && arch(p) == "armv6l" && libc(p) == "glibc"), platforms)
+platforms = filter(p -> !(p["mpi"] == "openmpi" && nbits(p) == 32), platforms)
 # MPItrampoline
 platforms = filter(p -> !(p["mpi"] == "mpitrampoline" && libc(p) == "musl"), platforms)
 platforms = filter(p -> !(p["mpi"] == "mpitrampoline" && Sys.isfreebsd(p)), platforms)
 
 platforms = filter(p -> !(Sys.isfreebsd(p) || libc(p) == "musl"), platforms)
 
+platforms = expand_cxxstring_abis(platforms)
+# platforms = expand_gfortran_versions(platforms) # ABI dependent due to MPI
+
 # The products that we will ensure are always built
 products = [
     LibraryProduct("liblammps", :liblammps),
diff --git a/platforms/mpi.jl b/platforms/mpi.jl
index 487e8e37878..85ffa7dd1f1 100644
--- a/platforms/mpi.jl
+++ b/platforms/mpi.jl
@@ -80,7 +80,7 @@ function augment_platforms(platforms;
     end
     # NOTE: packages using this platform tag, must depend on MPIPreferences otherwise
     #       they will not be invalidated when the Preference changes.
-    push!(dependencies, Dependency(PackageSpec(name="MPIPreferences", uuid="3da0fdf6-3ccc-4f1b-acd9-58baa6c99267"); compat="0.1", top_level=true))
+    push!(dependencies, RuntimeDependency(PackageSpec(name="MPIPreferences", uuid="3da0fdf6-3ccc-4f1b-acd9-58baa6c99267"); compat="0.1", top_level=true))
     return all_platforms, dependencies
 end