diff --git a/forum/Makefile b/forum/Makefile
index 3b2adbd6c..8efe9159e 100644
--- a/forum/Makefile
+++ b/forum/Makefile
@@ -36,12 +36,12 @@ endif
 BUILD_DIR_FORUM_BUILD := $(BUILD_DIR_MODULE)/src
 INSTALL_INCLUDES_BUILD += $(BUILD_DIR_MODULE)/include/forum.inc
 
-$(BUILD_DIR_FORUM_BUILD): forum-1.0.4.tar.gz | $(BUILD_DIR_FORUM_BUILD)/. $(BUILD_DIR_MODULE)/include/.
+$(BUILD_DIR_FORUM_BUILD): forum-1.2.3.tar.gz | $(BUILD_DIR_FORUM_BUILD)/. $(BUILD_DIR_MODULE)/include/.
 	tar --strip-components=1 -xf $< -C $(BUILD_DIR_FORUM_BUILD)
 	cp $(BUILD_DIR_FORUM_BUILD)/src/include/forum.inc $(BUILD_DIR_MODULE)/include/forum.inc
 
 $(BUILD_DIR_FORUM_BUILD)/build-complete: $(BUILD_DIR_FORUM_BUILD)
-	$(MAKE) -C $(BUILD_DIR_FORUM_BUILD) SHARED=$(DYNAMIC) DEBUG=$(FORUM_DEBUG) OMP=$(WITH_OPENMP) FPE=no VERSION_CHECK=passed FPP="$(FPP)" LDFLAGS="$(LIB_DEP_ARGS)" FFLAGS="$(_FFLAGS) -std=f2018"
+	$(MAKE) -C $(BUILD_DIR_FORUM_BUILD) SHARED=$(DYNAMIC) DEBUG=$(FORUM_DEBUG) OMP=$(WITH_OPENMP) FPE=no VERSION_CHECK=passed FPP="$(FPP)"
 	touch $@
 
 $(OBJ_OUT): $(BUILD_DIR_FORUM_BUILD)/build-complete | $(BUILD_DIR_MODULE)/lib/.
diff --git a/forum/forum-1.0.4.tar.gz b/forum/forum-1.0.4.tar.gz
deleted file mode 100644
index 71a652ae5..000000000
--- a/forum/forum-1.0.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9db9523926ce3d390f722255b4c683307ced2933f497fbb66f2f2dfcbf70d8a
-size 32659
diff --git a/forum/forum-1.2.3.tar.gz b/forum/forum-1.2.3.tar.gz
new file mode 100644
index 000000000..4f4df30c1
--- /dev/null
+++ b/forum/forum-1.2.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9abf4c25e846c3e30b2880e0bb984bfd37ba7d6a7fc2400346ef149214b35622
+size 36655
diff --git a/gyre/Makefile b/gyre/Makefile
index fbec74fc8..cd2664935 100644
--- a/gyre/Makefile
+++ b/gyre/Makefile
@@ -8,7 +8,7 @@ ifeq ($(WITH_GYRE),yes)
 SRCS :=
 SRCS_CHECK := test/src/test_gyre.f90
 INTERNAL_DEPENDS_ON := forum const
-EXTERNAL_DEPENDS_ON := hdf5_fortran lapack95 lapack
+EXTERNAL_DEPENDS_ON := hdf5_fortran lapack95 lapack blas
 CHECK_RESULTS_GOLDEN := test/test_output
 CHECK_DIFF_PROG := ndiff -quiet -relerr 1.0e-6
 BINTYPE := lib
@@ -43,19 +43,14 @@ else
   GYRE_DEBUG = false
 endif
 
-ifeq ($(MESASDK_ROOT),)
-  FPP=./fypp_deps $(FLAGS_DEPS)
-else
-  FPP= PYTHONPATH=$(MESASDK_ROOT)/lib/python ./fypp_deps $(FLAGS_DEPS)
-endif
-
 BUILD_DIR_GYRE_BUILD := $(BUILD_DIR_MODULE)/src
 
-$(BUILD_DIR_GYRE_BUILD): gyre-8.1.tar.gz | $(BUILD_DIR_GYRE_BUILD)/. $(BUILD_DIR_MODULE)/include/.
+$(BUILD_DIR_GYRE_BUILD): gyre-9.1.tar.gz | $(BUILD_DIR_GYRE_BUILD)/. $(BUILD_DIR_MODULE)/include/.
 	tar --strip-components=1 -xf $< -C $(BUILD_DIR_GYRE_BUILD)
 
 $(BUILD_DIR_GYRE_BUILD)/build-complete: $(BUILD_DIR_GYRE_BUILD)
-	$(MAKE) -C $(BUILD_DIR_GYRE_BUILD) SHARED=$(DYNAMIC) DEBUG=$(GYRE_DEBUG) OMP=$(WITH_OPENMP) CRMATH=$(WITH_CRLIBM) VERSION_CHECK=passed FPP="$(FPP)" LDFLAGS="$(LIB_DEP_ARGS)" FFLAGS="$(_FFLAGS) -std=f2018" FRONTENDS=no TOOLS=no FORUM=no IFACES=yes
+	$(MAKE) -C $(BUILD_DIR_GYRE_BUILD) SHARED=$(DYNAMIC) DEBUG=$(GYRE_DEBUG) OMP=$(WITH_OPENMP) \
+            CRMATH=$(WITH_CRLIBM) FRONTENDS=no TOOLS=no EXTERNAL_FORUM=yes EXTERNAL_FORUM_PKG=mesa-forum IFACES=yes
 	touch $@
 
 
diff --git a/gyre/gyre-8.1.tar.gz b/gyre/gyre-8.1.tar.gz
deleted file mode 100644
index 1c3623161..000000000
--- a/gyre/gyre-8.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c82f440ed952401c9a308555cc950fb770abc4b62957895ba546964e732d54f5
-size 4807156
diff --git a/gyre/gyre-9.1.tar.gz b/gyre/gyre-9.1.tar.gz
new file mode 100644
index 000000000..8b4b32864
--- /dev/null
+++ b/gyre/gyre-9.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8705023f258141b646fa2289dc81ed313609e24c9edf62fb79e88ba7c8fc86ca
+size 4850501
diff --git a/make/setup-depends.mk b/make/setup-depends.mk
index e856312f3..37c6bf4f2 100644
--- a/make/setup-depends.mk
+++ b/make/setup-depends.mk
@@ -6,13 +6,10 @@ PKG_CONFIG_FLAGS =
 
 ifneq ($(MESASDK_ROOT),)
   ifeq ($(WITH_CRLIBM),yes)
-    PKG_CONFIG_FLAGS += --define-variable=MATH_SLOT=crmath
-    MESASDK_MATH_SLOT = crmath
+    PKG_CONFIG_FLAGS += --define-variable=math_slot=crmath
   else
-    PKG_CONFIG_FLAGS += --define-variable=MATH_SLOT=default
-    MESASDK_MATH_SLOT = default
+    PKG_CONFIG_FLAGS += --define-variable=math_slot=default
   endif
-  export MESASDK_MATH_SLOT
 endif
 
 PKG_CONFIG_PATH := $(shell BUILD_DIR=$(BUILD_DIR_) $(MAKE_DIR)/gen-pkgconfig-path $(SUBDIRS)):$(PKG_CONFIG_PATH)
diff --git a/mtx/Makefile b/mtx/Makefile
index b6bf23a07..ec98001e6 100644
--- a/mtx/Makefile
+++ b/mtx/Makefile
@@ -16,7 +16,7 @@ SRCS_CHECK := test/src/test_mtx.f90 \
               test/src/test_block_tridiagonal.f90
 # TODO: Also contains test dependencies sadly, I should fix this at some point
 INTERNAL_DEPENDS_ON := const utils math
-EXTERNAL_DEPENDS_ON := lapack
+EXTERNAL_DEPENDS_ON := lapack blas
 BINTYPE := lib
 
 # Testing